Skip to content

Commit d298515

Browse files
phil-allen-msftphil-allen-msft
authored
[main] Update dependencies from dotnet/arcade (#11878)
This pull request updates the following dependencies [marker]: <> (Begin:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) ## From https://github.com/dotnet/arcade - **Subscription**: [2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d](https://maestro.dot.net/subscriptions?search=2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) - **Build**: [20250815.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2772919) - **Date Produced**: August 15, 2025 6:43:15 PM UTC - **Commit**: [d87d66c43d0660e5c8e84e667c5c8a8140bce888](dotnet/arcade@d87d66c) - **Branch**: [release/9.0](https://github.com/dotnet/arcade/tree/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.0-beta.25255.5 to 9.0.0-beta.25415.3][9] - Microsoft.DotNet.Arcade.Sdk [9]: dotnet/arcade@1cfa39f...d87d66c [DependencyUpdate]: <> (End) [marker]: <> (End:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d)
2 parents f2270a5 + 675e77a commit d298515

23 files changed

+74
-50
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>
91-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
91+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
9292
<Uri>https://github.com/dotnet/arcade</Uri>
93-
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
93+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
9494
</Dependency>
9595
<!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages
9696
to be retrieved from live source-build and their content consumed by packages produced by razor.

‎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: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
microbuildUseESRP: true
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -134,6 +135,11 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+
${{ if eq(parameters.microbuildUseESRP, true) }}:
139+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
140+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
141+
${{ else }}:
142+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137143
env:
138144
TeamName: $(_TeamName)
139145
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
@@ -160,7 +166,7 @@ jobs:
160166
inputs:
161167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
162168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
163-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
164170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
165171
continueOnError: true
166172

@@ -183,7 +189,7 @@ jobs:
183189
inputs:
184190
testResultsFormat: 'xUnit'
185191
testResultsFiles: '*.xml'
186-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
187193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
188194
mergeTestResults: ${{ parameters.mergeTestResults }}
189195
continueOnError: true
@@ -194,7 +200,7 @@ jobs:
194200
inputs:
195201
testResultsFormat: 'VSTest'
196202
testResultsFiles: '*.trx'
197-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
198204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
199205
mergeTestResults: ${{ parameters.mergeTestResults }}
200206
continueOnError: true
@@ -238,7 +244,7 @@ jobs:
238244
- task: CopyFiles@2
239245
displayName: Gather buildconfiguration for build retry
240246
inputs:
241-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
242248
Contents: '**'
243249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
244250
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ parameters:
3232

3333
is1ESPipeline: ''
3434

35+
repositoryAlias: self
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -72,7 +74,7 @@ jobs:
7274
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7375

7476
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
75-
- checkout: self
77+
- checkout: ${{ parameters.repositoryAlias }}
7678
fetchDepth: 3
7779
clean: true
7880

@@ -93,7 +95,7 @@ jobs:
9395
azureSubscription: "Darc: Maestro Production"
9496
scriptType: ps
9597
scriptLocation: scriptPath
96-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
98+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
9799
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
98100
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
99101
/p:MaestroApiEndpoint=https://maestro.dot.net
@@ -113,7 +115,7 @@ jobs:
113115
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114116
Add-Content -Path $filePath -Value $(IsStableBuild)
115117
116-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
118+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
117119
if (Test-Path -Path $symbolExclusionfile)
118120
{
119121
Write-Host "SymbolExclusionFile exists"
@@ -142,7 +144,7 @@ jobs:
142144
azureSubscription: "Darc: Maestro Production"
143145
scriptType: ps
144146
scriptLocation: scriptPath
145-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
147+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
146148
arguments: >
147149
-BuildId $(BARBuildId)
148150
-PublishingInfraVersion 3

‎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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
repositoryAlias: self
4647

4748
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4849
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -117,3 +118,4 @@ jobs:
117118
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118119
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
119120
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
121+
repositoryAlias: ${{ parameters.repositoryAlias }}

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -144,7 +149,7 @@ stages:
144149
- task: PowerShell@2
145150
displayName: Validate
146151
inputs:
147-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1
152+
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1
148153
arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/
149154

150155
- job:
@@ -201,7 +206,7 @@ stages:
201206
filePath: eng\common\sdk-task.ps1
202207
arguments: -task SigningValidation -restore -msbuildEngine vs
203208
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
204-
/p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
209+
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
205210
${{ parameters.signingValidationAdditionalParameters }}
206211

207212
- template: /eng/common/core-templates/steps/publish-logs.yml
@@ -251,7 +256,7 @@ stages:
251256
- task: PowerShell@2
252257
displayName: Validate
253258
inputs:
254-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1
259+
filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1
255260
arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/
256261
-ExtractPath $(Agent.BuildDirectory)/Extract/
257262
-GHRepoName $(Build.Repository.Name)
@@ -306,11 +311,12 @@ stages:
306311
azureSubscription: "Darc: Maestro Production"
307312
scriptType: ps
308313
scriptLocation: scriptPath
309-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
314+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
310315
arguments: >
311316
-BuildId $(BARBuildId)
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

0 commit comments

Comments
 (0)