Skip to content

Commit 279a7ba

Browse files
dotnet-maestro[bot]ericstj
dotnet-maestro[bot]
and
ericstj
authored
[main] Update dependencies from dotnet/arcade (#7423)
* Update dependencies from https://github.com/dotnet/arcade build 20250314.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25164.6 * Update dependencies from https://github.com/dotnet/arcade build 20250321.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25171.1 * Update dependencies from https://github.com/dotnet/arcade build 20250328.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25178.2 * Update tests to use net48 * Ensure Compression is referenced on .NETFramework * Use win 11 test queue * Try Windows.Amd64.Server2025.Open * Update dependencies from https://github.com/dotnet/arcade build 20250406.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25206.1 * Move back to win10 - now has .NET 4.8 * Update dependencies from https://github.com/dotnet/arcade build 20250412.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25212.1 * Update dependencies from https://github.com/dotnet/arcade build 20250416.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25216.2 * Update dependencies from https://github.com/dotnet/arcade build 20250417.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25217.1 * Update dependencies from https://github.com/dotnet/arcade build 20250425.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25225.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent d070dcb commit 279a7ba

38 files changed

+211
-215
lines changed

‎.vsts-dotnet-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,19 @@ jobs:
183183

184184
- template: /build/ci/job-template.yml
185185
parameters:
186-
name: Windows_x64_NetFx461
186+
name: Windows_x64_NetFx48
187187
buildScript: build.cmd
188188
customMatrixes:
189189
Debug_Build:
190190
_configuration: Debug
191191
_config_short: DFX
192192
_includeBenchmarkData: false
193-
_targetFramework: net462
193+
_targetFramework: net48
194194
Release_Build:
195195
_configuration: Release
196196
_config_short: RFX
197197
_includeBenchmarkData: false
198-
_targetFramework: net462
198+
_targetFramework: net48
199199
innerLoop: true
200200
vsTestConfiguration: "/Framework:.NETCoreApp,Version=v4.0"
201201
pool:

‎build/.night-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@ jobs:
9292

9393
- template: /build/ci/job-template.yml
9494
parameters:
95-
name: Windows_x64_NetFx461
95+
name: Windows_x64_NetFx48
9696
buildScript: build.cmd
9797
customMatrixes:
9898
Debug_Build:
9999
_configuration: Debug
100100
_config_short: DFX
101101
_includeBenchmarkData: false
102-
_targetFramework: net462
102+
_targetFramework: net48
103103
Release_Build:
104104
_configuration: Release
105105
_config_short: RFX
106106
_includeBenchmarkData: false
107-
_targetFramework: net462
107+
_targetFramework: net48
108108
nightlyBuild: true
109109
pool:
110110
vmImage: windows-2019

‎build/.outer-loop-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ jobs:
8686

8787
- template: /build/ci/job-template.yml
8888
parameters:
89-
name: Windows_x64_NetFx461
89+
name: Windows_x64_NetFx48
9090
buildScript: build.cmd
9191
customMatrixes:
9292
Debug_Build:
9393
_configuration: Debug
9494
_config_short: DFX
9595
_includeBenchmarkData: false
96-
_targetFramework: net462
96+
_targetFramework: net48
9797
Release_Build:
9898
_configuration: Release
9999
_config_short: RFX
100100
_includeBenchmarkData: false
101-
_targetFramework: net462
101+
_targetFramework: net48
102102
pool:
103103
vmImage: windows-2019
104104

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25225.4">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
12+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25225.4">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
16+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25157.1">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25225.4">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
20+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25157.1">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25225.4">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
24+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25157.1">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.25225.4">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
33+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25157.1">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25225.4">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
37+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25157.1">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25225.4">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
41+
<Sha>5fb72aaffeff9c6f2ce46d3b226a84772fb72f55</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9292
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9393
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25157.1</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25225.4</MicrosoftDotNetXUnitExtensionsVersion>
9595
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9696
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
9797
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎eng/common/CIBuild.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

‎eng/common/build.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
7172
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7273
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7374
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
75+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
76+
Write-Host " -buildCheck Sets /check msbuild parameter"
7477
Write-Host ""
7578

7679
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
97100

98101
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
99102
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
103+
$check = if ($buildCheck) { '/check' } else { '' }
100104

101105
if ($projects) {
102106
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
113117
MSBuild $toolsetBuildProj `
114118
$bl `
115119
$platformArg `
120+
$check `
116121
/p:Configuration=$configuration `
117122
/p:RepoRoot=$RepoRoot `
118123
/p:Restore=$restore `
@@ -127,6 +132,7 @@ function Build {
127132
/p:PerformanceTest=$performanceTest `
128133
/p:Sign=$sign `
129134
/p:Publish=$publish `
135+
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
130136
@properties
131137
}
132138

‎eng/common/build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --buildCheck <value> Sets /check msbuild parameter"
4546
echo ""
4647
echo "Command line arguments not listed above are passed thru to msbuild."
4748
echo "Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
7677

7778
warn_as_error=true
7879
node_reuse=true
80+
build_check=false
7981
binary_log=false
8082
exclude_ci_binary_log=false
8183
pipelines_log=false
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
173175
node_reuse=$2
174176
shift
175177
;;
178+
-buildcheck)
179+
build_check=true
180+
;;
176181
-runtimesourcefeed)
177182
runtime_source_feed=$2
178183
shift
@@ -224,8 +229,14 @@ function Build {
224229
bl="/bl:\"$log_dir/Build.binlog\""
225230
fi
226231

232+
local check=""
233+
if [[ "$build_check" == true ]]; then
234+
check="/check"
235+
fi
236+
227237
MSBuild $_InitializeToolset \
228238
$bl \
239+
$check \
229240
/p:Configuration=$configuration \
230241
/p:RepoRoot="$repo_root" \
231242
/p:Restore=$restore \
@@ -239,6 +250,7 @@ function Build {
239250
/p:PerformanceTest=$performance_test \
240251
/p:Sign=$sign \
241252
/p:Publish=$publish \
253+
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
242254
$properties
243255

244256
ExitWithExitCode 0

‎eng/common/cibuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1515

16-
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@
16+
. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ jobs:
7373
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7474
- name: DOTNET_CLI_TELEMETRY_PROFILE
7575
value: '$(Build.Repository.Uri)'
76-
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
77-
- name: EnableRichCodeNavigation
78-
value: 'true'
7976
# Retry signature validation up to three times, waiting 2 seconds between attempts.
8077
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
8178
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
@@ -147,16 +144,6 @@ jobs:
147144
- ${{ each step in parameters.steps }}:
148145
- ${{ step }}
149146

150-
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
151-
- task: RichCodeNavIndexer@0
152-
displayName: RichCodeNav Upload
153-
inputs:
154-
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
155-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
156-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
157-
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
158-
continueOnError: true
159-
160147
- ${{ each step in parameters.componentGovernanceSteps }}:
161148
- ${{ step }}
162149

0 commit comments

Comments
 (0)