Skip to content

Commit b0a9adb

Browse files
authored
[release/dev17.14] Update dependencies from dotnet/arcade (#79937)
This pull request updates the following dependencies [marker]: <> (Begin:99763fa0-6697-43ea-9668-a6c18f9b82f7) ## From https://github.com/dotnet/arcade - **Subscription**: [99763fa0-6697-43ea-9668-a6c18f9b82f7](https://maestro.dot.net/subscriptions?search=99763fa0-6697-43ea-9668-a6c18f9b82f7) - **Build**: [20250912.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2792240) ([283021](https://maestro.dot.net/channel/5175/github:dotnet:arcade/build/283021)) - **Date Produced**: September 12, 2025 8:57:13 PM UTC - **Commit**: [e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92](dotnet/arcade@e0fa670) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.0-beta.25407.2 to 9.0.0-beta.25462.4][4] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.XliffTasks [4]: dotnet/arcade@e298236...e0fa670 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs in root:** - Updates sdk.version to 9.0.110 - Updates tools.dotnet to 9.0.110 [marker]: <> (End:99763fa0-6697-43ea-9668-a6c18f9b82f7)
2 parents abf2d47 + d0f8118 commit b0a9adb

23 files changed

+88
-56
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,19 @@
127127
</Dependency>
128128
</ProductDependencies>
129129
<ToolsetDependencies>
130-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
130+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
131131
<Uri>https://github.com/dotnet/arcade</Uri>
132-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
132+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
133133
</Dependency>
134134
<!-- Intermediate is necessary for source build. -->
135-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25407.2">
135+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25462.4">
136136
<Uri>https://github.com/dotnet/arcade</Uri>
137-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
137+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
138138
<SourceBuild RepoName="arcade" ManagedOnly="true" />
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25407.2">
140+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25462.4">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
142+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
143143
</Dependency>
144144
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
145145
<Uri>https://github.com/dotnet/symreader</Uri>
@@ -155,9 +155,9 @@
155155
<Uri>https://github.com/dotnet/roslyn</Uri>
156156
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
158+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
160+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
161161
</Dependency>
162162
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
163163
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

eng/common/SetupNugetSources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#

eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
inputs:
167167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
168168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
169-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
170170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
171171
continueOnError: true
172172

@@ -189,7 +189,7 @@ jobs:
189189
inputs:
190190
testResultsFormat: 'xUnit'
191191
testResultsFiles: '*.xml'
192-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
193193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
194194
mergeTestResults: ${{ parameters.mergeTestResults }}
195195
continueOnError: true
@@ -200,7 +200,7 @@ jobs:
200200
inputs:
201201
testResultsFormat: 'VSTest'
202202
testResultsFiles: '*.trx'
203-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
204204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
205205
mergeTestResults: ${{ parameters.mergeTestResults }}
206206
continueOnError: true
@@ -244,7 +244,7 @@ jobs:
244244
- task: CopyFiles@2
245245
displayName: Gather buildconfiguration for build retry
246246
inputs:
247-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
248248
Contents: '**'
249249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
250250
continueOnError: true

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6969
- task: Powershell@2
7070
inputs:
71-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -115,7 +115,7 @@ jobs:
115115
is1ESPipeline: ${{ parameters.is1ESPipeline }}
116116
args:
117117
displayName: Publish LocProject.json
118-
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
118+
pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
119119
publishLocation: Container
120120
artifactName: Loc
121121
condition: ${{ parameters.condition }}

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ parameters:
3232

3333
is1ESPipeline: ''
3434

35+
repositoryAlias: self
36+
37+
officialBuildId: ''
38+
3539
jobs:
3640
- job: Asset_Registry_Publish
3741

@@ -54,6 +58,11 @@ jobs:
5458
value: false
5559
# unconditional - needed for logs publishing (redactor tool version)
5660
- template: /eng/common/core-templates/post-build/common-variables.yml
61+
- name: OfficialBuildId
62+
${{ if ne(parameters.officialBuildId, '') }}:
63+
value: ${{ parameters.officialBuildId }}
64+
${{ else }}:
65+
value: $(Build.BuildNumber)
5766

5867
pool:
5968
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -72,7 +81,7 @@ jobs:
7281
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7382

7483
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
75-
- checkout: self
84+
- checkout: ${{ parameters.repositoryAlias }}
7685
fetchDepth: 3
7786
clean: true
7887

@@ -93,12 +102,12 @@ jobs:
93102
azureSubscription: "Darc: Maestro Production"
94103
scriptType: ps
95104
scriptLocation: scriptPath
96-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
105+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
97106
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98107
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
99108
/p:MaestroApiEndpoint=https://maestro.dot.net
100109
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
101-
/p:OfficialBuildId=$(Build.BuildNumber)
110+
/p:OfficialBuildId=$(OfficialBuildId)
102111
condition: ${{ parameters.condition }}
103112
continueOnError: ${{ parameters.continueOnError }}
104113

@@ -113,7 +122,7 @@ jobs:
113122
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114123
Add-Content -Path $filePath -Value $(IsStableBuild)
115124
116-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
125+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
117126
if (Test-Path -Path $symbolExclusionfile)
118127
{
119128
Write-Host "SymbolExclusionFile exists"
@@ -142,7 +151,7 @@ jobs:
142151
azureSubscription: "Darc: Maestro Production"
143152
scriptType: ps
144153
scriptLocation: scriptPath
145-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
154+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
146155
arguments: >
147156
-BuildId $(BARBuildId)
148157
-PublishingInfraVersion 3

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
- script: ${{ parameters.sourceIndexBuildCommand }}
6767
displayName: Build Repository
6868

69-
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
69+
- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
7070
displayName: Process Binlog into indexable sln
7171

7272
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: DefaultGuardianVersion
2626
value: 0.109.0
2727
- name: GuardianPackagesConfigFile
28-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
28+
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
2929
- name: GuardianVersion
3030
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
3131

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
repositoryAlias: self
47+
officialBuildId: ''
4648

4749
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4850
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -117,3 +119,5 @@ jobs:
117119
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118120
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
119121
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
122+
repositoryAlias: ${{ parameters.repositoryAlias }}
123+
officialBuildId: ${{ parameters.officialBuildId }}

0 commit comments

Comments
 (0)