Skip to content

Commit eda26e9

Browse files
[release/dev17.14] Update dependencies from dotnet/arcade (#11893)
This pull request updates the following dependencies [marker]: <> (Begin:074b8eaa-a147-41e7-b2cc-e8194286bcc4) ## From https://github.com/dotnet/arcade - **Subscription**: [074b8eaa-a147-41e7-b2cc-e8194286bcc4](https://maestro.dot.net/subscriptions?search=074b8eaa-a147-41e7-b2cc-e8194286bcc4) - **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.25161.4 to 9.0.0-beta.25415.3][7] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk [7]: dotnet/arcade@f33d9e6...d87d66c [DependencyUpdate]: <> (End) [marker]: <> (End:074b8eaa-a147-41e7-b2cc-e8194286bcc4)
2 parents 3372435 + 0f73fbb commit eda26e9

26 files changed

+86
-59
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@
9696
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
9797
<Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25161.4">
99+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
100100
<Uri>https://github.com/dotnet/arcade</Uri>
101-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
101+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
102102
</Dependency>
103103
<!-- Intermediate is necessary for source build. -->
104-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25161.4">
104+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25415.3">
105105
<Uri>https://github.com/dotnet/arcade</Uri>
106-
<Sha>f33d9e642f0e68a61312164cd9e0baf4e142a999</Sha>
106+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
107107
<SourceBuild RepoName="arcade" ManagedOnly="true" />
108108
</Dependency>
109109
<!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
5151
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
5252
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.617601</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
53-
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25161.4</MicrosoftSourceBuildIntermediatearcadePackageVersion>
53+
<MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.25415.3</MicrosoftSourceBuildIntermediatearcadePackageVersion>
5454
<MicrosoftNetCompilersToolsetPackageVersion>4.14.0-3.25176.5</MicrosoftNetCompilersToolsetPackageVersion>
5555
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.14.0-3.25176.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
5656
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.14.0-3.25176.5</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>

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-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []
@@ -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

0 commit comments

Comments
 (0)