Skip to content

Commit 898e997

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Merge pull request #63304 from dotnet/darc-release/9.0-325b9375-24e0-4f02-b83a-f58ab0137299
[release/9.0] Update dependencies from dotnet/arcade
1 parent d168ab0 commit 898e997

23 files changed

+81
-61
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -388,31 +388,31 @@
388388
<Uri>https://github.com/dotnet/winforms</Uri>
389389
<Sha>9b822fd70005bf5632d12fe76811b97b3dd044e4</Sha>
390390
</Dependency>
391-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
391+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25428.3">
392392
<Uri>https://github.com/dotnet/arcade</Uri>
393-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
393+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
394394
</Dependency>
395395
<!-- Intermediate is necessary for source build. -->
396-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25407.2">
396+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25428.3">
397397
<Uri>https://github.com/dotnet/arcade</Uri>
398-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
398+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
399399
<SourceBuild RepoName="arcade" ManagedOnly="true" />
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25407.2">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25428.3">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
403+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25407.2">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25428.3">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
407+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25428.3">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
411+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25407.2">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25428.3">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
415+
<Sha>5fe939db0a156be6f10e17c105b1842c0c8c8bdc</Sha>
416416
</Dependency>
417417
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.9.0-preview.1.25409.1">
418418
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@
166166
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
167167
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
168168
<!-- Packages from dotnet/arcade -->
169-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25407.2</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25407.2</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25407.2</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25407.2</MicrosoftSourceBuildIntermediatearcadeVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25428.3</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25428.3</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.25428.3</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24575.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
inputs:
167167
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
168168
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
169-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
169+
richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin
170170
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
171171
continueOnError: true
172172

@@ -189,7 +189,7 @@ jobs:
189189
inputs:
190190
testResultsFormat: 'xUnit'
191191
testResultsFiles: '*.xml'
192-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
192+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
193193
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
194194
mergeTestResults: ${{ parameters.mergeTestResults }}
195195
continueOnError: true
@@ -200,7 +200,7 @@ jobs:
200200
inputs:
201201
testResultsFormat: 'VSTest'
202202
testResultsFiles: '*.trx'
203-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
203+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
204204
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
205205
mergeTestResults: ${{ parameters.mergeTestResults }}
206206
continueOnError: true
@@ -244,7 +244,7 @@ jobs:
244244
- task: CopyFiles@2
245245
displayName: Gather buildconfiguration for build retry
246246
inputs:
247-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
247+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
248248
Contents: '**'
249249
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
250250
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ parameters:
3333
# container and pool.
3434
platform: {}
3535

36+
# Optional list of directories to ignore for component governance scans.
37+
componentGovernanceIgnoreDirectories: []
38+
3639
is1ESPipeline: ''
3740

3841
# If set to true and running on a non-public project,
@@ -93,3 +96,4 @@ jobs:
9396
parameters:
9497
is1ESPipeline: ${{ parameters.is1ESPipeline }}
9598
platform: ${{ parameters.platform }}
99+
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

‎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

0 commit comments

Comments
 (0)