Skip to content

Commit 033eead

Browse files
nagilsonnagilson
authored
[automated] Merge branch 'release/9.0.2xx' => 'main' (#44540)
2 parents eee748e + df734b4 commit 033eead

File tree

131 files changed

+2282
-1289
lines changed

Some content is hidden

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

131 files changed

+2282
-1289
lines changed

‎.vsts-ci.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,19 @@ extends:
291291
publishArgument: $(_publishArgument)
292292
officialBuildProperties: $(_officialBuildProperties)
293293
runTests: false
294+
### ARM64 TESTBUILD ###
295+
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
296+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
297+
parameters:
298+
pool:
299+
name: Azure Pipelines
300+
vmImage: macOS-latest
301+
os: macOS
302+
helixTargetQueue: osx.13.arm64
303+
macOSJobParameterSets:
304+
- categoryName: TestBuild
305+
buildArchitecture: arm64
306+
runtimeIdentifier: osx-arm64
294307

295308
############### SOURCE BUILD ###############
296309
- template: /eng/common/templates-official/job/source-build.yml@self

‎.vsts-pr.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ stages:
6363
vmImage: macOS-latest
6464
os: macOS
6565
helixTargetQueue: osx.13.amd64.open
66+
### ARM64 ###
67+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
68+
parameters:
69+
pool:
70+
name: Azure Pipelines
71+
vmImage: macOS-latest
72+
os: macOS
73+
helixTargetQueue: osx.13.arm64.open
74+
macOSJobParameterSets:
75+
- categoryName: TestBuild
76+
buildArchitecture: arm64
77+
runtimeIdentifier: osx-arm64
6678

6779
############### SOURCE BUILD ###############
6880
- template: /eng/common/templates/job/source-build.yml@self

‎eng/ManualVersions.props‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.45</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.45</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.45</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.45</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.45</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.45</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.45</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.43</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.43</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.43</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.43</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.43</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.43</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.43</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727

2828
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3838
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3939

40+
<!-- Transitive dependencies from MSBuild -->
41+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
42+
4043
<!-- Transitive dependencies from roslyn -->
4144
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
4245
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />

‎eng/Versions.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
1515
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1616
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
17-
<WorkloadsFeatureBand>8.0.100</WorkloadsFeatureBand>
1817
<!-- Enable to remove prerelease label. -->
1918
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2019
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -193,15 +192,18 @@
193192
194193
Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older
195194
than the very latest, based on what we want the SDK to support. So use a version that matches the version
196-
in minimumMSBuildVersion. In these cases, we don't want to use MicrosoftBuildVersion and other
195+
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
196+
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
197+
In these cases, we don't want to use MicrosoftBuildVersion and other
197198
associated properties that are updated by the VMR infrastructure. So, we read this version
198199
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
199200
then use that in Directory.Packages.props.
200201
201202
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
202203
<MicrosoftBuildVersion>17.13.0-preview-24604-04</MicrosoftBuildVersion>
203204
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24604-04</MicrosoftBuildLocalizationVersion>
204-
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
205+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
206+
<MinimumVSVersion>17.12</MinimumVSVersion>
205207
</PropertyGroup>
206208
<PropertyGroup>
207209
<!-- Dependencies from https://github.com/dotnet/templating -->

‎eng/common/core-templates/steps/get-delegation-sas.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ steps:
3131
# Calculate the expiration of the SAS token and convert to UTC
3232
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3333
34-
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
34+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
35+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
36+
$sas = ""
37+
do {
38+
$sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
39+
if ($LASTEXITCODE -ne 0) {
40+
Write-Error "Failed to generate SAS token."
41+
exit 1
42+
}
43+
} while($sas.IndexOf('/') -ne -1)
3544
3645
if ($LASTEXITCODE -ne 0) {
3746
Write-Error "Failed to generate SAS token."

‎sdk.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,6 +1150,7 @@ Global
11501150
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5
11511151
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5
11521152
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*SharedItemsImports = 5
1153+
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5
11531154
src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{94c8526e-dcc2-442f-9868-3dd0ba2688be}*SharedItemsImports = 13
11541155
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13
11551156
src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5

0 commit comments

Comments
 (0)