Skip to content

Commit 187cf00

Browse files
dotnet-maestro[bot]michaelgsharpericstjasp2286
authored
[release/4.0] Update dependencies from dotnet/arcade (#7470)
* Update dependencies from https://github.com/dotnet/arcade build 20250516.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25266.2 * update cmake mac (#7443) * update cmake mac * cmake specific version * remove specific version * cmake policy version minimum * Update build/ci/job-template.yml * Try adding -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to libomp.rb * Update job-template.yml * Update cmake_minimum_required --------- Co-authored-by: Eric StJohn <ericstj@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20250521.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25271.1 * Update dependencies from https://github.com/dotnet/arcade build 20250602.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25302.2 * Update dependencies from https://github.com/dotnet/arcade build 20250625.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25325.4 * Update dependencies from https://github.com/dotnet/arcade build 20250716.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25366.1 * Update dependencies from https://github.com/dotnet/arcade build 20250730.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25380.1 * Update dependencies from https://github.com/dotnet/arcade build 20250807.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25407.2 * Update dependencies from https://github.com/dotnet/arcade build 20250815.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25415.3 * Update dependencies from https://github.com/dotnet/arcade build 20250828.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25428.3 * Update dependencies from https://github.com/dotnet/arcade build 20250910.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25460.1 * Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25462.4 * Update dependencies from https://github.com/dotnet/arcade build 20250915.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25465.2 * Update dependencies from https://github.com/dotnet/arcade build 20250923.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25473.2 * Update dependencies from https://github.com/dotnet/arcade build 20250925.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25475.3 * Update dependencies from https://github.com/dotnet/arcade build 20251003.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25503.3 * Update dependencies from https://github.com/dotnet/arcade build 20251015.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25515.2 * macOS x64 CI: fix dependency install and OpenMP runtime copy (use Homebrew libomp, adjust Helix payload) (#7510) * CI(macOS x64): use Homebrew libomp + copy only libomp.dylib; remove custom formula path * Fix indenting and make M1 and x64 consistent * Simplify helix.proj --------- Co-authored-by: Eric StJohn <ericstj@microsoft.com> * Update Windows image, fix mac build (#7515) * Fix new compilation errors with latest SDK * Fix additional breaks introduced with new SDK * Update Helix ubuntu arm32 container (#7410) * Update Helix ubuntu arm32 container * Switch to debian-12-helix-arm32v7 * Revert back to ubuntu-24.04-helix-arm32v7 * Update helixQueue to use Ubuntu 22.04 on ARM32 * Add linux-arm baseline for Summarize.txt --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: Alexey Sokolov <asp2286@gmail.com>
1 parent 7b6eccf commit 187cf00

Some content is hidden

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

46 files changed

+4100
-109
lines changed

‎.vsts-dotnet-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
pool:
7171
name: NetCore-Public
7272
demands: ImageOverride -equals build.Ubuntu.2204.amd64.open
73-
helixQueue: Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
73+
helixQueue: Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm32v7
7474

7575
- template: /build/ci/job-template.yml
7676
parameters:

‎Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
<StrongNameKeyId>Open</StrongNameKeyId>
2626

2727
<!-- temporarily suppress NETSDK 1206 until we can update OnnxRuntime to fix https://github.com/dotnet/machinelearning/issues/6916 -->
28-
<NoWarn>$(NoWarn);NETSDK1206;NU5104</NoWarn>
28+
<!-- suppress NETSDK1138, we need to keep net6.0 in servicing -->
29+
<NoWarn>$(NoWarn);NETSDK1206;NU5104;NETSDK1138</NoWarn>
2930
</PropertyGroup>
3031

3132
<PropertyGroup>

‎build/ci/job-template.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,12 @@ jobs:
6666

6767
steps:
6868
# Extra MacOS step required to install OS-specific dependencies
69-
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}:
70-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
69+
- ${{ if contains(parameters.pool.vmImage, 'macOS') }}:
70+
- script: |
71+
brew update
72+
brew install libomp
73+
brew link libomp --force
7174
displayName: Install MacOS build dependencies
72-
# Extra Apple MacOS step required to install OS-specific dependencies
73-
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:
74-
- script: brew update && brew install -f --overwrite python@3.13 && brew install libomp && brew link libomp --force
75-
displayName: Install MacOS ARM build dependencies
7675
- ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}:
7776
- bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH"
7877
displayName: Set LD_LIBRARY_PATH for Ubuntu and CentOS to locate Native shared library in current running path

‎build/libomp.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class Libomp < Formula
1717
depends_on "cmake" => :build
1818

1919
def install
20-
system "cmake", ".", *std_cmake_args
20+
system "cmake", ".", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5", *std_cmake_args
2121
system "make", "install"
22-
system "cmake", ".", "-DLIBOMP_ENABLE_SHARED=OFF", *std_cmake_args
22+
system "cmake", ".", "-DLIBOMP_ENABLE_SHARED=OFF", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5", *std_cmake_args
2323
system "make", "install"
2424
end
2525

‎build/vsts-ci.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variables:
2828
- name: LinuxImage
2929
value: 1es-ubuntu-2204
3030
- name: WindowsImage
31-
value: 1es-windows-2019
31+
value: 1es-windows-2022
3232
- name: MacImage
3333
value: macOS-13
3434
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -142,7 +142,10 @@ extends:
142142
PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
143143
ArtifactName: pkgassets
144144
steps:
145-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
145+
- script: |
146+
brew update
147+
brew install libomp
148+
brew link libomp --force
146149
displayName: Install build dependencies
147150
# Only build native assets to avoid conflicts.
148151
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
@@ -161,12 +164,10 @@ extends:
161164
PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
162165
ArtifactName: pkgassets
163166
steps:
164-
# Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
165-
- script: |
166-
rm -rf /usr/local/bin/2to3
167-
displayName: MacOS Homebrew bug Workaround
168-
continueOnError: true
169-
- script: brew update && brew install -f --overwrite python@3.13 && brew install libomp && brew link libomp --force
167+
- script: |
168+
brew update
169+
brew install libomp
170+
brew link libomp --force
170171
displayName: Install build dependencies
171172
# Only build native assets to avoid conflicts.
172173
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
12+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25111.5">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25515.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
16+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25111.5">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25515.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
20+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
24+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.25111.5">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.25515.2">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
33+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25111.5">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25515.2">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
37+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25111.5">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25515.2">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
41+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
9292
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9393
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25515.2</MicrosoftDotNetXUnitExtensionsVersion>
9595
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9696
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
9797
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎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

0 commit comments

Comments
 (0)