Skip to content

Commit e90cc74

Browse files
DonnaChen888DonnaChen888
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#52013)
2 parents 1ba1e73 + 96cfc3d commit e90cc74

File tree

11 files changed

+192
-26
lines changed

11 files changed

+192
-26
lines changed

‎Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,20 @@
6565
<!-- <TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments> -->
6666
</PropertyGroup>
6767

68+
<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51465 -->
69+
<PropertyGroup>
70+
<NuGetAudit>false</NuGetAudit>
71+
</PropertyGroup>
72+
6873
<PropertyGroup>
6974
<ImplicitUsings>enable</ImplicitUsings>
7075
</PropertyGroup>
7176

77+
<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51466 -->
78+
<PropertyGroup>
79+
<NuGetAudit>false</NuGetAudit>
80+
</PropertyGroup>
81+
7282
<!-- Global usings -->
7383
<!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
7484
<ItemGroup>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25562.4">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25577.5">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
560+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25562.4">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25577.5">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
564+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25562.4">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25577.5">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
568+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25562.4">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25577.5">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
572+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25562.4">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25577.5">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
576+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25562.4">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25577.5">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
580+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25562.4">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25577.5">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>6e2d8e204cebac7d3989c1996f96e5a9ed63fa80</Sha>
585+
<Sha>0890ca08513391dafe556fb326c73c6c5c6cb329</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.11">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25562.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25562.4</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25562.4</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25562.4</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25577.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25577.5</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25577.5</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25577.5</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
demands: ImageOverride -equals build.ubuntu.2004.amd64
6666
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6767
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
68-
image: 1es-mariner-2
68+
image: 1es-azurelinux-3
6969
os: linux
7070
${{ else }}:
7171
pool:

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
# in the default public locations.
4242
internalRuntimeDownloadArgs=
4343
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
44-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
44+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4545
fi
4646
4747
buildConfig=Release

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot,
295295
if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" }
296296
if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" }
297297
$runtimePath = $runtimePath + "\" + $version
298-
298+
299299
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"
300300

301301
if (Test-Path $runtimePath) {
@@ -968,4 +968,4 @@ function Enable-Nuget-EnhancedRetry() {
968968
Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000'
969969
Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true'
970970
}
971-
}
971+
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/content/eng/pipelines/templates/jobs/sdk-diff-tests.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,19 @@ jobs:
106106
107107
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
108108
109+
source ./eng/common/tools.sh
110+
InitializeDotNetCli true
111+
109112
echo "##vso[task.setvariable variable=Platform]$platform"
110113
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
111114
echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name"
112115
echo "##vso[task.setvariable variable=SourceBuiltArtifactsPath]$(Pipeline.Workspace)/Artifacts/$artifacts_path"
116+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
113117
displayName: Prepare Tests
114118
workingDirectory: $(Build.SourcesDirectory)
115119
116120
- script: >
117-
.dotnet/dotnet test
121+
$(DotNetPath)/dotnet test
118122
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
119123
--filter "Category=SdkContent"
120124
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
@@ -168,6 +172,7 @@ jobs:
168172
- ${{ if and(eq(parameters.publishTestResultsPr, 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))) }}:
169173
- template: ../steps/create-baseline-update-pr.yml
170174
parameters:
175+
dotnetPath: $(DotNetPath)
171176
pipeline: sdk
172177
repo: dotnet/sdk
173178
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets

‎src/SourceBuild/content/eng/pipelines/templates/steps/create-baseline-update-pr.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
parameters:
2+
- name: dotnetPath
3+
type: string
4+
default: '$(Build.SourcesDirectory)/.dotnet'
5+
26
# The pipeline that is being run
37
# Used to determine the correct baseline update tool to run
48
# Currently only supports "sdk" and "license"
@@ -31,7 +35,7 @@ steps:
3135
3236
branchName=$(echo "$(Build.SourceBranch)" | sed 's/refs\/heads\///g')
3337
34-
.dotnet/dotnet run \
38+
${{ parameters.dotnetPath }}/dotnet run \
3539
--project eng/tools/CreateBaselineUpdatePR/ \
3640
--property:RestoreSources="$restoreSources" \
3741
"${{ parameters.pipeline }}" \

‎src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ jobs:
159159
- script: |
160160
source ./eng/common/tools.sh
161161
InitializeDotNetCli true
162+
echo "##vso[task.setvariable variable=DotNetPath]$_InitializeDotNetCli"
162163
displayName: Install .NET SDK
163164
workingDirectory: $(Build.SourcesDirectory)
164165
@@ -176,6 +177,7 @@ jobs:
176177
177178
- template: templates/steps/create-baseline-update-pr.yml
178179
parameters:
180+
dotnetPath: $(DotNetPath)
179181
pipeline: license
180182
repo: dotnet/sdk
181183
originalFilesDirectory: src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests

0 commit comments

Comments
 (0)