[main] Update dependencies from dotnet/arcade (dotnet#72614)

[main] Update dependencies from dotnet/arcade
sharwell · Mar 22, 2024 · d87f6d4 · d87f6d4
1 parent 67ef1ee
commit d87f6d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -110,14 +110,14 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24161.1">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24170.6">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
+ <Sha>8e3e00a76f467cc262dc14f6466ab884b2c4eb96</Sha>
  </Dependency>
  <!-- Intermediate is necessary for source build. -->
- <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24161.1">
+ <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24170.6">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
+ <Sha>8e3e00a76f467cc262dc14f6466ab884b2c4eb96</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
  <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
@@ -144,9 +144,9 @@
  <Uri>https://github.com/dotnet/roslyn</Uri>
  <Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24161.1">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24170.6">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
+ <Sha>8e3e00a76f467cc262dc14f6466ab884b2c4eb96</Sha>
  </Dependency>
  <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview.23468.1">
  <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
@@ -206,9 +206,11 @@ jobs:
  continueOnError: true
  condition: always()
  - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}:
- - publish: artifacts/log
- artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
- displayName: Publish logs
+ - task: 1ES.PublishPipelineArtifact@1
+ inputs:
+ targetPath: 'artifacts/log'
+ artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }}
+ displayName: 'Publish logs'
  continueOnError: true
  condition: always()
 
@@ -253,7 +255,9 @@ jobs:
  IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
 
  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
- - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration
- artifact: BuildConfiguration
- displayName: Publish build retry configuration
- continueOnError: true
+ - task: 1ES.PublishPipelineArtifact@1
+ inputs:
+ targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
+ artifactName: 'BuildConfiguration'
+ displayName: 'Publish build retry configuration'
+ continueOnError: true
diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml
@@ -94,14 +94,16 @@ jobs:
  inputs:
  targetType: inline
  script: |
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
- Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
+ New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
+ $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
+ Add-Content -Path $filePath -Value $(BARBuildId)
+ Add-Content -Path $filePath -Value "$(DefaultChannels)"
+ Add-Content -Path $filePath -Value $(IsStableBuild)
  
  - task: 1ES.PublishBuildArtifacts@1
  displayName: Publish ReleaseConfigs Artifact
  inputs:
- PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
+ PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
  PublishLocation: Container
  ArtifactName: ReleaseConfigs
 

diff --git a/global.json b/global.json
@@ -12,8 +12,8 @@
  "xcopy-msbuild": "17.8.1-2"
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24161.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24170.6",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24170.6",
  "Microsoft.Build.Traversal": "3.4.0"
  }
 }