Skip to content

Commit 3cc1c7d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0] Update dependencies from dotnet/arcade (#13866)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 6493136 commit 3cc1c7d

39 files changed

+151
-99
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-574100b-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-4/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-574100b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-3/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-574100b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-2/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-574100b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-1/nuget/v3/index.json" />
812
<!-- End: Package sources from dotnet-runtime -->
913
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1014
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,6 +27,10 @@
2327
<clear />
2428
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2529
<!-- Begin: Package sources from dotnet-runtime -->
30+
<add key="darc-int-dotnet-runtime-574100b-1" value="true" />
31+
<add key="darc-int-dotnet-runtime-574100b-2" value="true" />
32+
<add key="darc-int-dotnet-runtime-574100b-3" value="true" />
33+
<add key="darc-int-dotnet-runtime-574100b-4" value="true" />
2634
<add key="darc-int-dotnet-runtime-574100b" value="true" />
2735
<!-- End: Package sources from dotnet-runtime -->
2836
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
184+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25407.1">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25461.1">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
188+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25407.1">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25461.1">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
192+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25461.1">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
196+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25407.1">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25461.1">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
200+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25407.1">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25461.1">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
204+
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25407.1</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25461.1</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34+
# Optional list of directories to ignore for component governance scans.
35+
cgIgnoreDirectories: []
36+
3437
# If set to true and running on a non-public project,
3538
# Internal blob storage locations will be enabled.
3639
# This is not enabled by default because many repositories do not need internal sources
@@ -73,3 +76,4 @@ jobs:
7376
- template: /eng/common/templates-official/steps/source-build.yml
7477
parameters:
7578
platform: ${{ parameters.platform }}
79+
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}

‎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')) }}:

0 commit comments

Comments
 (0)