Skip to content

Commit a9438ff

Browse files
[main] Update dependencies from dotnet/arcade (#580)
* Update dependencies from https://github.com/dotnet/arcade build 20250206.4 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25106.4 * Update dependencies from https://github.com/dotnet/arcade build 20250213.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25113.2 * Update dependencies from https://github.com/dotnet/arcade build 20250220.6 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25120.6 * Update dependencies from https://github.com/dotnet/arcade build 20250225.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25125.2 * Update dependencies from https://github.com/dotnet/arcade build 20250226.4 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25126.4 * Update dependencies from https://github.com/dotnet/arcade build 20250307.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25157.1 * Update dependencies from https://github.com/dotnet/arcade build 20250314.6 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25164.6 * Update dependencies from https://github.com/dotnet/arcade build 20250321.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25171.1 * Update dependencies from https://github.com/dotnet/arcade build 20250328.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25065.2 -> To Version 10.0.0-beta.25178.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Taylor Southwick <tasou@microsoft.com>
1 parent d9fc022 commit a9438ff

Some content is hidden

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

41 files changed

+1024
-357
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25178.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
8+
<Sha>7d1967403f5b12406763c666f41e3358bb542ced</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

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 & 1 deletion
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,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 \
233244
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_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 & 19 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: ''
@@ -127,18 +127,11 @@ jobs:
127127
- ${{ preStep }}
128128

129129
- ${{ 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)'
130+
- template: /eng/common/core-templates/steps/install-microbuild.yml
131+
parameters:
132+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
133+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
140134
continueOnError: ${{ parameters.continueOnError }}
141-
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
142135

143136
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
144137
- task: NuGetAuthenticate@1
@@ -167,14 +160,12 @@ jobs:
167160
- ${{ each step in parameters.componentGovernanceSteps }}:
168161
- ${{ step }}
169162

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'))
163+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
164+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
165+
parameters:
166+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
167+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
175168
continueOnError: ${{ parameters.continueOnError }}
176-
env:
177-
TeamName: $(_TeamName)
178169

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

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ parameters:
2020
# if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects.
2121
runAsPublic: false
2222

23-
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
24-
publishUsingPipelines: false
25-
2623
# Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing
2724
publishAssetsImmediately: false
2825

@@ -76,12 +73,11 @@ jobs:
7673
fetchDepth: 3
7774
clean: true
7875

79-
- task: DownloadBuildArtifacts@0
80-
displayName: Download artifact
76+
- task: DownloadPipelineArtifact@2
77+
displayName: Download Asset Manifests
8178
inputs:
8279
artifactName: AssetManifests
83-
downloadPath: '$(Build.StagingDirectory)/Download'
84-
checkDownloadedFiles: true
80+
targetPath: '$(Build.StagingDirectory)/AssetManifests'
8581
condition: ${{ parameters.condition }}
8682
continueOnError: ${{ parameters.continueOnError }}
8783

@@ -95,9 +91,8 @@ jobs:
9591
scriptLocation: scriptPath
9692
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9793
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98-
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
94+
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
9995
/p:MaestroApiEndpoint=https://maestro.dot.net
100-
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
10196
/p:OfficialBuildId=$(Build.BuildNumber)
10297
condition: ${{ parameters.condition }}
10398
continueOnError: ${{ parameters.continueOnError }}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ parameters:
1212
# The name of the job. This is included in the job ID.
1313
# targetRID: ''
1414
# The name of the target RID to use, instead of the one auto-detected by Arcade.
15-
# nonPortable: false
15+
# portableBuild: false
1616
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
17-
# linux-x64), and compiling against distro-provided packages rather than portable ones.
17+
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
18+
# default is portable mode.
1819
# skipPublishValidation: false
1920
# Disables publishing validation. By default, a check is performed to ensure no packages are
2021
# published by source-build.
Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
5-
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
63
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
74
preSteps: []
85
binlogPath: artifacts/log/Debug/Build.binlog
@@ -16,12 +13,6 @@ jobs:
1613
dependsOn: ${{ parameters.dependsOn }}
1714
condition: ${{ parameters.condition }}
1815
variables:
19-
- name: SourceIndexUploadPackageVersion
20-
value: ${{ parameters.sourceIndexUploadPackageVersion }}
21-
- name: SourceIndexProcessBinlogPackageVersion
22-
value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }}
23-
- name: SourceIndexPackageSource
24-
value: ${{ parameters.sourceIndexPackageSource }}
2516
- name: BinlogPath
2617
value: ${{ parameters.binlogPath }}
2718
- template: /eng/common/core-templates/variables/pool-providers.yml
@@ -34,48 +25,20 @@ jobs:
3425
pool:
3526
${{ if eq(variables['System.TeamProject'], 'public') }}:
3627
name: $(DncEngPublicBuildPool)
37-
image: 1es-windows-2022-open
38-
os: windows
28+
image: windows.vs2022.amd64.open
3929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
4030
name: $(DncEngInternalBuildPool)
41-
image: 1es-windows-2022
42-
os: windows
31+
image: windows.vs2022.amd64
4332

4433
steps:
4534
- ${{ if eq(parameters.is1ESPipeline, '') }}:
4635
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
4736

4837
- ${{ each preStep in parameters.preSteps }}:
4938
- ${{ preStep }}
50-
51-
- task: UseDotNet@2
52-
displayName: Use .NET 8 SDK
53-
inputs:
54-
packageType: sdk
55-
version: 8.0.x
56-
installationPath: $(Agent.TempDirectory)/dotnet
57-
workingDirectory: $(Agent.TempDirectory)
58-
59-
- script: |
60-
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
61-
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools
62-
displayName: Download Tools
63-
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
64-
workingDirectory: $(Agent.TempDirectory)
65-
6639
- script: ${{ parameters.sourceIndexBuildCommand }}
6740
displayName: Build Repository
6841

69-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
70-
displayName: Process Binlog into indexable sln
71-
72-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
73-
- task: AzureCLI@2
74-
displayName: Log in to Azure and upload stage1 artifacts to source index
75-
inputs:
76-
azureSubscription: 'SourceDotNet Stage1 Publish'
77-
addSpnToEnvironment: true
78-
scriptType: 'ps'
79-
scriptLocation: 'inlineScript'
80-
inlineScript: |
81-
$(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
42+
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
43+
parameters:
44+
binLogPath: ${{ parameters.binLogPath }}

eng/common/core-templates/jobs/codeql-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
enablePublishBuildArtifacts: false
1616
enablePublishTestResults: false
1717
enablePublishBuildAssets: false
18-
enablePublishUsingPipelines: false
1918
enableTelemetry: true
2019

2120
variables:

0 commit comments

Comments
 (0)