Skip to content

Commit 04f35db

Browse files
brunolins16brunolins16
committed
Merge remote-tracking branch 'upstream/main' into brunolins16/json/aot/feature-switch
2 parents afd597e + 83d6c56 commit 04f35db

File tree

261 files changed

+3213
-2172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+3213
-2172
lines changed

‎.github/fabricbot.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,6 +3481,45 @@
34813481
}
34823482
]
34833483
}
3484+
},
3485+
{
3486+
"taskType": "trigger",
3487+
"capabilityId": "IssueResponder",
3488+
"subCapability": "IssuesOnlyResponder",
3489+
"version": "1.0",
3490+
"config": {
3491+
"conditions": {
3492+
"operator": "and",
3493+
"operands": [
3494+
{
3495+
"name": "labelAdded",
3496+
"parameters": {
3497+
"label": "Needs: Repro"
3498+
}
3499+
}
3500+
]
3501+
},
3502+
"eventType": "issue",
3503+
"eventNames": [
3504+
"issues",
3505+
"project_card"
3506+
],
3507+
"taskName": "[Needs: Repro] Request a minimal repro project",
3508+
"actions": [
3509+
{
3510+
"name": "addReply",
3511+
"parameters": {
3512+
"comment": "Thank you for filing this issue. In order for us to investigate this issue, please provide [a minimalistic repro project](https://github.com/dotnet/aspnetcore/blob/main/docs/repro.md) that illustrates the problem."
3513+
}
3514+
},
3515+
{
3516+
"name": "addLabel",
3517+
"parameters": {
3518+
"label": "Needs: Author Feedback"
3519+
}
3520+
}
3521+
]
3522+
}
34843523
}
34853524
],
34863525
"userGroups": []

‎eng/Version.Details.xml

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎eng/common/cross/build-rootfs.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ __UbuntuPackages+=" symlinks"
4848
__UbuntuPackages+=" libicu-dev"
4949
__UbuntuPackages+=" liblttng-ust-dev"
5050
__UbuntuPackages+=" libunwind8-dev"
51+
__UbuntuPackages+=" libnuma-dev"
5152

5253
__AlpinePackages+=" gettext-dev"
5354
__AlpinePackages+=" icu-dev"
5455
__AlpinePackages+=" libunwind-dev"
5556
__AlpinePackages+=" lttng-ust-dev"
5657
__AlpinePackages+=" compiler-rt-static"
58+
__AlpinePackages+=" numactl-dev"
5759

5860
# runtime libraries' dependencies
5961
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -147,17 +149,17 @@ while :; do
147149
__BuildArch=ppc64le
148150
__UbuntuArch=ppc64el
149151
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
150-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
151-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
152-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
152+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
153+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
154+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
153155
unset __LLDB_Package
154156
;;
155157
riscv64)
156158
__BuildArch=riscv64
157159
__UbuntuArch=riscv64
158160
__UbuntuRepo="http://deb.debian.org/debian-ports"
159161
__CodeName=sid
160-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
162+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
161163
unset __LLDB_Package
162164

163165
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
@@ -168,9 +170,9 @@ while :; do
168170
__BuildArch=s390x
169171
__UbuntuArch=s390x
170172
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
171-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
172-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
173-
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
173+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
174+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
175+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
174176
unset __LLDB_Package
175177
;;
176178
x64)
@@ -310,6 +312,8 @@ done
310312

311313
if [[ "$__BuildArch" == "armel" ]]; then
312314
__LLDB_Package="lldb-3.5-dev"
315+
elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then
316+
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
313317
fi
314318

315319
__UbuntuPackages+=" ${__LLDB_Package:-}"

‎eng/common/generate-locproject.ps1

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object {
3434
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
3535

3636
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
37+
if (-not $wxlFiles) {
38+
$wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
39+
if ($wxlEnFiles) {
40+
$wxlFiles = @()
41+
$wxlEnFiles | ForEach-Object {
42+
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
43+
$wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
44+
}
45+
}
46+
}
47+
48+
$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files
49+
$macosHtmlFiles = @()
50+
if ($macosHtmlEnFiles) {
51+
$macosHtmlEnFiles | ForEach-Object {
52+
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
53+
$macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
54+
}
55+
}
3756

3857
$xlfFiles = @()
3958

@@ -99,8 +118,7 @@ $locJson = @{
99118
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
100119
$continue = $true
101120
foreach ($exclusion in $exclusions.Exclusions) {
102-
if ($_.FullName.Contains($exclusion))
103-
{
121+
if ($_.FullName.Contains($exclusion)) {
104122
$continue = $false
105123
}
106124
}
@@ -115,6 +133,29 @@ $locJson = @{
115133
}
116134
}
117135
)
136+
},
137+
@{
138+
LanguageSet = $LanguageSet
139+
CloneLanguageSet = "VS_macOS_CloneLanguages"
140+
LocItems = @(
141+
$macosHtmlFiles | ForEach-Object {
142+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
143+
$continue = $true
144+
foreach ($exclusion in $exclusions.Exclusions) {
145+
if ($_.FullName.Contains($exclusion)) {
146+
$continue = $false
147+
}
148+
}
149+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
150+
if ($continue) {
151+
return @{
152+
SourceFile = $sourceFile
153+
CopyOption = "LangIDOnPath"
154+
OutputPath = $outputPath
155+
}
156+
}
157+
}
158+
)
118159
}
119160
)
120161
}

‎eng/common/templates/job/job.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,16 @@ jobs:
8888
- ${{ if ne(variable.group, '') }}:
8989
- group: ${{ variable.group }}
9090

91+
# handle template variable syntax
92+
# example:
93+
# - template: path/to/template.yml
94+
# parameters:
95+
# [key]: [value]
96+
- ${{ if ne(variable.template, '') }}:
97+
- template: ${{ variable.template }}
98+
${{ if ne(variable.parameters, '') }}:
99+
parameters: ${{ variable.parameters }}
100+
91101
# handle key-value variable syntax.
92102
# example:
93103
# - [key]: [value]

‎eng/common/templates/variables/pool-providers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# First, import the template in an arcade-ified repo to pick up the variables, e.g.:
1717
#
1818
# variables:
19-
# - template: eng/common/templates/variables/pool-providers.yml
19+
# - template: /eng/common/templates/variables/pool-providers.yml
2020
#
2121
# ... then anywhere specifying the pool provider use the runtime variables,
2222
# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.:
@@ -45,4 +45,4 @@ variables:
4545
- name: DncEngPublicBuildPool
4646
value: NetCore-Svc-Public
4747
- name: DncEngInternalBuildPool
48-
value: NetCore1ESPool-Svc-Internal
48+
value: NetCore1ESPool-Svc-Internal

‎eng/scripts/mark-shipped.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ $ErrorActionPreference = "Stop"
66

77
function MarkShipped([string]$dir) {
88
$shippedFilePath = Join-Path $dir "PublicAPI.Shipped.txt"
9-
$shipped = Get-Content $shippedFilePath
10-
if ($null -eq $shipped) {
11-
$shipped = @()
12-
}
9+
$shipped = @()
10+
$shipped += Get-Content $shippedFilePath
1311

1412
$unshippedFilePath = Join-Path $dir "PublicAPI.Unshipped.txt"
1513
$unshipped = Get-Content $unshippedFilePath

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-alpha.1.23059.8"
3+
"version": "8.0.100-alpha.1.23061.8"
44
},
55
"tools": {
6-
"dotnet": "8.0.100-alpha.1.23059.8",
6+
"dotnet": "8.0.100-alpha.1.23061.8",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23058.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23058.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23063.7",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23063.7"
3232
}
3333
}

‎src/Caching/SqlServer/src/PublicAPI.Shipped.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#nullable enable
2+
Microsoft.Extensions.Caching.SqlServer.SqlServerCache
23
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Get(string! key) -> byte[]?
34
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]?>!
45
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Refresh(string! key) -> void
@@ -8,20 +9,19 @@ Microsoft.Extensions.Caching.SqlServer.SqlServerCache.RemoveAsync(string! key, S
89
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
910
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
1011
Microsoft.Extensions.Caching.SqlServer.SqlServerCache.SqlServerCache(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions!>! options) -> void
12+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions
1113
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ConnectionString.get -> string?
1214
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ConnectionString.set -> void
15+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.get -> System.TimeSpan
16+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.set -> void
17+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.get -> System.TimeSpan?
18+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.set -> void
1319
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SchemaName.get -> string?
1420
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SchemaName.set -> void
21+
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SqlServerCacheOptions() -> void
1522
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SystemClock.get -> Microsoft.Extensions.Internal.ISystemClock!
1623
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SystemClock.set -> void
1724
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.TableName.get -> string?
1825
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.TableName.set -> void
19-
static Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions.AddDistributedSqlServerCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
20-
Microsoft.Extensions.Caching.SqlServer.SqlServerCache
21-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions
22-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.get -> System.TimeSpan
23-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.DefaultSlidingExpiration.set -> void
24-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.get -> System.TimeSpan?
25-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.ExpiredItemsDeletionInterval.set -> void
26-
Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions.SqlServerCacheOptions() -> void
2726
Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions
27+
static Microsoft.Extensions.DependencyInjection.SqlServerCachingServicesExtensions.AddDistributedSqlServerCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.SqlServer.SqlServerCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!

‎src/Caching/StackExchangeRedis/src/PublicAPI.Shipped.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#nullable enable
2+
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
3+
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
24
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Get(string! key) -> byte[]?
35
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.GetAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]?>!
46
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RedisCache(Microsoft.Extensions.Options.IOptions<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! optionsAccessor) -> void
@@ -8,6 +10,7 @@ Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Remove(string! key) -
810
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.RemoveAsync(string! key, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
911
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Set(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options) -> void
1012
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.SetAsync(string! key, byte[]! value, Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions! options, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
13+
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
1114
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.get -> string?
1215
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.Configuration.set -> void
1316
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ConfigurationOptions.get -> StackExchange.Redis.ConfigurationOptions?
@@ -18,9 +21,6 @@ Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.g
1821
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.InstanceName.set -> void
1922
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.get -> System.Func<StackExchange.Redis.Profiling.ProfilingSession!>?
2023
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.ProfilingSession.set -> void
21-
static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
22-
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache
23-
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCache.Dispose() -> void
24-
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions
2524
Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions.RedisCacheOptions() -> void
2625
Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions
26+
static Microsoft.Extensions.DependencyInjection.StackExchangeRedisCacheServiceCollectionExtensions.AddStackExchangeRedisCache(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.Extensions.Caching.StackExchangeRedis.RedisCacheOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!

0 commit comments

Comments
 (0)