Skip to content

Commit 03c5271

Browse files
dotnet-maestro[bot]akoeplinger
dotnet-maestro[bot]
and
akoeplinger
authored
[release/8.0-staging] Update dependencies from dotnet/arcade (#118540)
* Update dependencies from https://github.com/dotnet/arcade build 20250807.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25407.1 * Bump MicrosoftDotnetSdkInternalVersion * Update dependencies from https://github.com/dotnet/arcade build 20250911.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25461.1 Microsoft.DotNet.XUnitConsoleRunner From Version 2.5.1-beta.25310.3 -> To Version 2.5.1-beta.25461.1 * Bump MicrosoftDotnetSdkInternalVersion --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent f1f3459 commit 03c5271

39 files changed

+191
-137
lines changed

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
116+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25461.1">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
126+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25310.3">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25461.1">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
130+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25310.3">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25461.1">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
134+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25310.3">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25461.1">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
138+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25310.3">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25461.1">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
142+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25310.3">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25461.1">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
146+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25310.3">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25461.1">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
150+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25310.3">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25461.1">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
154+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25310.3">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25461.1">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
158+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25310.3">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25461.1">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
162+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25310.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25461.1">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
166+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25310.3">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25461.1">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
170+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25310.3">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25461.1">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
174+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25310.3">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25461.1">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
178+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25310.3">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25461.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
182+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25310.3">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25461.1">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
186+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25414.3">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25310.3">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25461.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
339+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25310.3</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25310.3</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25310.3</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25310.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25310.3</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25310.3</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25310.3</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25461.1</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25461.1</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25461.1</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25461.1</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25461.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25461.1</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25461.1</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25461.1</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -269,7 +269,7 @@
269269
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
272-
<MicrosoftDotnetSdkInternalVersion>8.0.117</MicrosoftDotnetSdkInternalVersion>
272+
<MicrosoftDotnetSdkInternalVersion>8.0.120</MicrosoftDotnetSdkInternalVersion>
273273
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
274274
</PropertyGroup>
275275
<PropertyGroup>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# displayName: Setup Private Feeds Credentials
1818
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1919
# inputs:
20-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
21-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
20+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
21+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
2222
# env:
2323
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
2424

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# - task: Bash@3
1919
# displayName: Setup Private Feeds Credentials
2020
# inputs:
21-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
22-
# arguments: $(Build.SourcesDirectory)/NuGet.config $Token
21+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
22+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token
2323
# condition: ne(variables['Agent.OS'], 'Windows_NT')
2424
# env:
2525
# Token: $(dn-bot-dnceng-artifact-feeds-rw)

‎eng/common/templates-official/job/job.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ parameters:
2121
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222
artifacts: ''
2323
enableMicrobuild: false
24+
microbuildUseESRP: true
2425
enablePublishBuildArtifacts: false
2526
enablePublishBuildAssets: false
2627
enablePublishTestResults: false
@@ -37,7 +38,7 @@ parameters:
3738
# Sbom related params
3839
enableSbom: true
3940
PackageVersion: 7.0.0
40-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
4142
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4243

4344
jobs:
@@ -135,6 +136,11 @@ jobs:
135136
signType: $(_SignType)
136137
zipSources: false
137138
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
139+
${{ if eq(parameters.microbuildUseESRP, true) }}:
140+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
141+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+
${{ else }}:
143+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138144
env:
139145
TeamName: $(_TeamName)
140146
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
@@ -161,7 +167,7 @@ jobs:
161167
inputs:
162168
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
163169
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
164-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
170+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
165171
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
166172
continueOnError: true
167173

@@ -220,7 +226,7 @@ jobs:
220226
- task: 1ES.PublishBuildArtifacts@1
221227
displayName: Publish Logs
222228
inputs:
223-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
229+
PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)'
224230
PublishLocation: Container
225231
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
226232
continueOnError: true
@@ -232,7 +238,7 @@ jobs:
232238
inputs:
233239
testResultsFormat: 'xUnit'
234240
testResultsFiles: '*.xml'
235-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
241+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
236242
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
237243
mergeTestResults: ${{ parameters.mergeTestResults }}
238244
continueOnError: true
@@ -243,7 +249,7 @@ jobs:
243249
inputs:
244250
testResultsFormat: 'VSTest'
245251
testResultsFiles: '*.trx'
246-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
252+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
247253
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
248254
mergeTestResults: ${{ parameters.mergeTestResults }}
249255
continueOnError: true
@@ -259,7 +265,7 @@ jobs:
259265
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
260266
- task: 1ES.PublishPipelineArtifact@1
261267
inputs:
262-
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
268+
targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
263269
artifactName: 'BuildConfiguration'
264270
displayName: 'Publish build retry configuration'
265271
continueOnError: true

‎eng/common/templates-official/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
@@ -63,7 +63,7 @@ jobs:
6363
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6464
- task: Powershell@2
6565
inputs:
66-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
66+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
6767
arguments: $(_GenerateLocProjectArguments)
6868
displayName: Generate LocProject.json
6969
condition: ${{ parameters.condition }}
@@ -106,7 +106,7 @@ jobs:
106106
- task: 1ES.PublishBuildArtifacts@1
107107
displayName: Publish LocProject.json
108108
inputs:
109-
PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/'
109+
PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/'
110110
PublishLocation: Container
111111
ArtifactName: Loc
112112
condition: ${{ parameters.condition }}

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ parameters:
3030

3131
signingValidationAdditionalParameters: ''
3232

33+
repositoryAlias: self
34+
3335
jobs:
3436
- job: Asset_Registry_Publish
3537

@@ -65,6 +67,9 @@ jobs:
6567
os: windows
6668
steps:
6769
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
70+
- checkout: ${{ parameters.repositoryAlias }}
71+
fetchDepth: 3
72+
clean: true
6873
- task: DownloadBuildArtifacts@0
6974
displayName: Download artifact
7075
inputs:
@@ -82,7 +87,7 @@ jobs:
8287
azureSubscription: "Darc: Maestro Production"
8388
scriptType: ps
8489
scriptLocation: scriptPath
85-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
90+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
8691
arguments: >
8792
-task PublishBuildAssets -restore -msbuildEngine dotnet
8893
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
@@ -115,7 +120,7 @@ jobs:
115120
inputs:
116121
targetType: inline
117122
script: |
118-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
123+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
119124
if(Test-Path -Path $symbolExclusionfile)
120125
{
121126
Write-Host "SymbolExclusionFile exists"
@@ -130,7 +135,7 @@ jobs:
130135
displayName: Publish SymbolPublishingExclusionsFile Artifact
131136
condition: eq(variables['SymbolExclusionFile'], 'true')
132137
inputs:
133-
PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
138+
PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt'
134139
PublishLocation: Container
135140
ArtifactName: ReleaseConfigs
136141

@@ -146,7 +151,7 @@ jobs:
146151
azureSubscription: "Darc: Maestro Production"
147152
scriptType: ps
148153
scriptLocation: scriptPath
149-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
154+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
150155
arguments: -BuildId $(BARBuildId)
151156
-PublishingInfraVersion 3
152157
-AzdoToken '$(System.AccessToken)'

0 commit comments

Comments
 (0)