Skip to content

Commit d0196df

Browse files
dotnet-maestro[bot]ViktorHoferT-Gro
authored
[main] Update dependencies from dotnet/arcade (#18614)
* Update dependencies from https://github.com/dotnet/arcade build 20250521.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25271.1 -> To Version 10.0.0-beta.25271.2 * Remove obsolete infra * PR builds - without publish --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> Co-authored-by: Tomas Grosup <Tomas.Grosup@gmail.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
1 parent 58696a6 commit d0196df

Some content is hidden

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

50 files changed

+1603
-492
lines changed

azure-pipelines-PR.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ stages:
230230
- checkout: self
231231
clean: true
232232

233-
- script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:FSharpLangVersion=preview
233+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release /p:FSharpLangVersion=preview
234234
env:
235235
DOTNET_DbgEnableMiniDump: 1
236236
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -270,7 +270,7 @@ stages:
270270
- checkout: self
271271
clean: true
272272

273-
- script: eng\CIBuild.cmd -compressallmetadata -buildnorealsig -testCoreclr -configuration Release
273+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -buildnorealsig -testCoreclr -configuration Release
274274
env:
275275
DOTNET_DbgEnableMiniDump: 1
276276
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -322,7 +322,7 @@ stages:
322322
- checkout: self
323323
clean: true
324324

325-
- script: eng\CIBuild.cmd -compressallmetadata -buildnorealsig -testDesktop -configuration Release -testBatch $(System.JobPositionInPhase)
325+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -buildnorealsig -testDesktop -configuration Release -testBatch $(System.JobPositionInPhase)
326326
env:
327327
DOTNET_DbgEnableMiniDump: 1
328328
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -372,7 +372,7 @@ stages:
372372
- checkout: self
373373
clean: true
374374

375-
- script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation+
375+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation+
376376
env:
377377
DOTNET_DbgEnableMiniDump: 1
378378
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -408,7 +408,7 @@ stages:
408408
- checkout: self
409409
clean: true
410410

411-
- script: eng\CIBuild.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation-
411+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release /p:AdditionalFscCmdFlags=--strict-indentation-
412412
env:
413413
DOTNET_DbgEnableMiniDump: 1
414414
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -482,7 +482,7 @@ stages:
482482
displayName: Setup VS Hive
483483
condition: eq(variables.setupVsHive, 'true')
484484

485-
- script: eng\CIBuild.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
485+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
486486
env:
487487
DOTNET_DbgEnableMiniDump: 1
488488
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
@@ -560,7 +560,7 @@ stages:
560560
- checkout: self
561561
clean: true
562562

563-
- script: eng\CIBuild.cmd -compressallmetadata -configuration Release -testDesktop -testBatch $(System.JobPositionInPhase)
563+
- script: eng\CIBuildNoPublish.cmd -compressallmetadata -configuration Release -testDesktop -testBatch $(System.JobPositionInPhase)
564564
env:
565565
DOTNET_DbgEnableMiniDump: 1
566566
DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.

eng/CIBuildNoPublish.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\Build.ps1" -ci -restore -build -bootstrap -pack -sign -binaryLog %*

eng/DotNetBuild.props

Lines changed: 0 additions & 40 deletions
This file was deleted.

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
</Dependency>
3636
</ProductDependencies>
3737
<ToolsetDependencies>
38-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
38+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25271.2">
3939
<Uri>https://github.com/dotnet/arcade</Uri>
40-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
40+
<Sha>12d3a9f5d6138e22270694574e73e4c58a815795</Sha>
4141
</Dependency>
4242
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25256.1">
4343
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

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: 7 additions & 1 deletion
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 `
@@ -122,11 +127,12 @@ function Build {
122127
/p:Deploy=$deploy `
123128
/p:Test=$test `
124129
/p:Pack=$pack `
125-
/p:DotNetBuildRepo=$productBuild `
130+
/p:DotNetBuild=$productBuild `
126131
/p:IntegrationTest=$integrationTest `
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: 15 additions & 4 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
@@ -127,14 +129,14 @@ while [[ $# > 0 ]]; do
127129
-pack)
128130
pack=true
129131
;;
130-
-sourcebuild|-sb)
132+
-sourcebuild|-source-build|-sb)
131133
build=true
132134
source_build=true
133135
product_build=true
134136
restore=true
135137
pack=true
136138
;;
137-
-productBuild|-pb)
139+
-productbuild|-product-build|-pb)
138140
build=true
139141
product_build=true
140142
restore=true
@@ -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,14 +229,19 @@ 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 \
232243
/p:Build=$build \
233-
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_build \
244+
/p:DotNetBuild=$product_build \
235245
/p:DotNetBuildSourceOnly=$source_build \
236246
/p:Rebuild=$rebuild \
237247
/p:Test=$test \
@@ -240,6 +250,7 @@ function Build {
240250
/p:PerformanceTest=$performance_test \
241251
/p:Sign=$sign \
242252
/p:Publish=$publish \
253+
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
243254
$properties
244255

245256
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: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enableMicrobuildForMacAndLinux: false
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
25-
enablePublishUsingPipelines: false
2626
enableBuildRetry: false
2727
mergeTestResults: false
2828
testRunTitle: ''
@@ -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
@@ -127,18 +124,11 @@ jobs:
127124
- ${{ preStep }}
128125

129126
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
130-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
131-
- task: MicroBuildSigningPlugin@4
132-
displayName: Install MicroBuild plugin
133-
inputs:
134-
signType: $(_SignType)
135-
zipSources: false
136-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137-
env:
138-
TeamName: $(_TeamName)
139-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
127+
- template: /eng/common/core-templates/steps/install-microbuild.yml
128+
parameters:
129+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
130+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
140131
continueOnError: ${{ parameters.continueOnError }}
141-
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
142132

143133
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
144134
- task: NuGetAuthenticate@1
@@ -154,27 +144,15 @@ jobs:
154144
- ${{ each step in parameters.steps }}:
155145
- ${{ step }}
156146

157-
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
158-
- task: RichCodeNavIndexer@0
159-
displayName: RichCodeNav Upload
160-
inputs:
161-
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
162-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
163-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
164-
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
165-
continueOnError: true
166-
167147
- ${{ each step in parameters.componentGovernanceSteps }}:
168148
- ${{ step }}
169149

170-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
171-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
172-
- task: MicroBuildCleanup@1
173-
displayName: Execute Microbuild cleanup tasks
174-
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
150+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
151+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
152+
parameters:
153+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
154+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
175155
continueOnError: ${{ parameters.continueOnError }}
176-
env:
177-
TeamName: $(_TeamName)
178156

179157
# Publish test results
180158
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

0 commit comments

Comments
 (0)