Skip to content

Commit 6735c6f

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220915.7 (#13916)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22463.5 -> To Version 8.0.0-beta.22465.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a6c6db6 commit 6735c6f

File tree

4 files changed

+10
-44
lines changed

4 files changed

+10
-44
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22463.5">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22465.7">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>c670c5bf5cff7c5c2ca086fd41cc1ace90761576</Sha>
13+
<Sha>cbb2c87350567406c46690ff292e5f6397a5daba</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22463.5">
16+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22465.7">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>c670c5bf5cff7c5c2ca086fd41cc1ace90761576</Sha>
18+
<Sha>cbb2c87350567406c46690ff292e5f6397a5daba</Sha>
1919
</Dependency>
2020
</ToolsetDependencies>
2121
</Dependencies>

eng/common/init-tools-native.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ try {
9898
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
9999
exit 1
100100
}
101-
$ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
102-
if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
101+
$ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
102+
if ($ToolDirectories -eq $null) {
103103
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
104104
exit 1
105105
}
106+
$ToolDirectory = $ToolDirectories[0]
106107
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
107108
if (-not (Test-Path -Path "$BinPathFile")) {
108109
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."

eng/common/templates/job/job.yml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
141141
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
142142
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
143+
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
143144
continueOnError: true
144145

145146
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
@@ -183,24 +184,6 @@ jobs:
183184
displayName: Publish logs
184185
continueOnError: true
185186
condition: always()
186-
- ${{ if or(eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
187-
- ${{ if and(ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188-
- task: CopyFiles@2
189-
displayName: Gather Asset Manifests
190-
inputs:
191-
SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
192-
TargetFolder: '$(Build.ArtifactStagingDirectory)/AssetManifests'
193-
continueOnError: ${{ parameters.continueOnError }}
194-
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
195-
196-
- task: PublishBuildArtifacts@1
197-
displayName: Push Asset Manifests
198-
inputs:
199-
PathtoPublish: '$(Build.ArtifactStagingDirectory)/AssetManifests'
200-
PublishLocation: Container
201-
ArtifactName: AssetManifests
202-
continueOnError: ${{ parameters.continueOnError }}
203-
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
204187

205188
- ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
206189
- task: PublishBuildArtifacts@1
@@ -234,24 +217,6 @@ jobs:
234217
mergeTestResults: ${{ parameters.mergeTestResults }}
235218
continueOnError: true
236219
condition: always()
237-
238-
- ${{ if and(eq(parameters.enablePublishBuildAssets, true), ne(parameters.enablePublishUsingPipelines, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
239-
- task: CopyFiles@2
240-
displayName: Gather Asset Manifests
241-
inputs:
242-
SourceFolder: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/AssetManifest'
243-
TargetFolder: '$(Build.StagingDirectory)/AssetManifests'
244-
continueOnError: ${{ parameters.continueOnError }}
245-
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
246-
247-
- task: PublishBuildArtifacts@1
248-
displayName: Push Asset Manifests
249-
inputs:
250-
PathtoPublish: '$(Build.StagingDirectory)/AssetManifests'
251-
PublishLocation: Container
252-
ArtifactName: AssetManifests
253-
continueOnError: ${{ parameters.continueOnError }}
254-
condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true'))
255220

256221
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
257222
- template: /eng/common/templates/steps/generate-sbom.yml

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"perl": "5.32.1.1"
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22463.5",
22-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22463.5"
21+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22465.7",
22+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22465.7"
2323
}
2424
}

0 commit comments

Comments
 (0)