Skip to content

Commit 222749b

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250815.2 (#1346)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25407.1 -> To Version 8.0.0-beta.25415.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 07101f5 commit 222749b

34 files changed

+111
-97
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,30 +215,30 @@
215215
<Uri>https://github.com/dotnet/llvm-project</Uri>
216216
<Sha>0a471ebbe6a4a9c095169dd531b825a4370f57f3</Sha>
217217
</Dependency>
218-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
218+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25415.2">
219219
<Uri>https://github.com/dotnet/arcade</Uri>
220-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
220+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
221221
<SourceBuild RepoName="arcade" ManagedOnly="true" />
222222
</Dependency>
223-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
223+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25415.2">
224224
<Uri>https://github.com/dotnet/arcade</Uri>
225-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
225+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
226226
</Dependency>
227-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25407.1">
227+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25415.2">
228228
<Uri>https://github.com/dotnet/arcade</Uri>
229-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
229+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
230230
</Dependency>
231-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25407.1">
231+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25415.2">
232232
<Uri>https://github.com/dotnet/arcade</Uri>
233-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
233+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
234234
</Dependency>
235-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25407.1">
235+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25415.2">
236236
<Uri>https://github.com/dotnet/arcade</Uri>
237-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
237+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
238238
</Dependency>
239-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25407.1">
239+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25415.2">
240240
<Uri>https://github.com/dotnet/arcade</Uri>
241-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
241+
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
242242
</Dependency>
243243
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
244244
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
4444
</PropertyGroup>
4545
<PropertyGroup>
46-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksPackagingVersion>
47-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksTemplatingVersion>
48-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
49-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
46+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25415.2</MicrosoftDotNetBuildTasksPackagingVersion>
47+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25415.2</MicrosoftDotNetBuildTasksTemplatingVersion>
48+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25415.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
49+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25415.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
5050
</PropertyGroup>
5151
<PropertyGroup>
5252
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parameters:
3838
# Sbom related params
3939
enableSbom: true
4040
PackageVersion: 7.0.0
41-
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
41+
BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
4242
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
4343

4444
jobs:
@@ -167,7 +167,7 @@ jobs:
167167
inputs:
168168
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
169169
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
170-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
170+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
171171
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
172172
continueOnError: true
173173

@@ -226,7 +226,7 @@ jobs:
226226
- task: 1ES.PublishBuildArtifacts@1
227227
displayName: Publish Logs
228228
inputs:
229-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
229+
PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)'
230230
PublishLocation: Container
231231
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
232232
continueOnError: true
@@ -238,7 +238,7 @@ jobs:
238238
inputs:
239239
testResultsFormat: 'xUnit'
240240
testResultsFiles: '*.xml'
241-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
241+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
242242
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
243243
mergeTestResults: ${{ parameters.mergeTestResults }}
244244
continueOnError: true
@@ -249,7 +249,7 @@ jobs:
249249
inputs:
250250
testResultsFormat: 'VSTest'
251251
testResultsFiles: '*.trx'
252-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
252+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
253253
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
254254
mergeTestResults: ${{ parameters.mergeTestResults }}
255255
continueOnError: true
@@ -265,7 +265,7 @@ jobs:
265265
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
266266
- task: 1ES.PublishPipelineArtifact@1
267267
inputs:
268-
targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
268+
targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration'
269269
artifactName: 'BuildConfiguration'
270270
displayName: 'Publish build retry configuration'
271271
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)'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- script: ${{ parameters.sourceIndexBuildCommand }}
6060
displayName: Build Repository
6161

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

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

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

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ parameters:
4040

4141
enableSourceIndex: false
4242
sourceIndexParams: {}
43+
repositoryAlias: self
4344

4445
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4546
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -95,3 +96,4 @@ jobs:
9596
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
9697
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
9798
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
99+
repositoryAlias: ${{ parameters.repositoryAlias }}

0 commit comments

Comments
 (0)