Update dependencies from https://github.com/dotnet/arcade build 20240…

…528.1 (#2516)

[main] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -3,17 +3,17 @@
  <ProductDependencies>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24278.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
+ <Sha>0c4e52c37a29b75f64646220e0cc237177ce23a2</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24278.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
+ <Sha>0c4e52c37a29b75f64646220e0cc237177ce23a2</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24278.1">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
+ <Sha>0c4e52c37a29b75f64646220e0cc237177ce23a2</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -15,6 +15,6 @@
  <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
  <SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
  <MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
- <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
+ <MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24278.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
  </PropertyGroup>
 </Project>

eng/common/core-templates/job/job.yml

@@ -200,29 +200,28 @@ jobs:
  publishArtifacts: false
 
  # Publish test results
- - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}:
- - ${{ if eq(parameters.testResultsFormat, 'xunit') }}:
- - task: PublishTestResults@2
- displayName: Publish XUnit Test Results
- inputs:
- testResultsFormat: 'xUnit'
- testResultsFiles: '*.xml'
- searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
- testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
- mergeTestResults: ${{ parameters.mergeTestResults }}
- continueOnError: true
- condition: always()
- - ${{ if eq(parameters.testResultsFormat, 'vstest') }}:
- - task: PublishTestResults@2
- displayName: Publish TRX Test Results
- inputs:
- testResultsFormat: 'VSTest'
- testResultsFiles: '*.trx'
- searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
- testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
- mergeTestResults: ${{ parameters.mergeTestResults }}
- continueOnError: true
- condition: always()
+ - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:
+ - task: PublishTestResults@2
+ displayName: Publish XUnit Test Results
+ inputs:
+ testResultsFormat: 'xUnit'
+ testResultsFiles: '*.xml'
+ searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+ testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
+ mergeTestResults: ${{ parameters.mergeTestResults }}
+ continueOnError: true
+ condition: always()
+ - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}:
+ - task: PublishTestResults@2
+ displayName: Publish TRX Test Results
+ inputs:
+ testResultsFormat: 'VSTest'
+ testResultsFiles: '*.trx'
+ searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
+ testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
+ mergeTestResults: ${{ parameters.mergeTestResults }}
+ continueOnError: true
+ condition: always()
 
  # gather artifacts
  - ${{ if ne(parameters.artifacts.publish, '') }}:
@@ -246,6 +245,8 @@ jobs:
  SourceFolder: 'artifacts/log'
  Contents: '**'
  TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log'
+ continueOnError: true
+ condition: always()
 
  - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
  - task: CopyFiles@2
@@ -254,13 +255,16 @@ jobs:
  SourceFolder: 'artifacts/log/$(_BuildConfig)'
  Contents: '**'
  TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
+ continueOnError: true
+ condition: always()
  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
  - task: CopyFiles@2
  displayName: Gather buildconfiguration for build retry
  inputs:
  SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
  Contents: '**'
  TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
-
+ continueOnError: true
+ condition: always()
  - ${{ each step in parameters.artifactPublishSteps }}:
  - ${{ step }}

eng/common/core-templates/steps/source-build.yml

@@ -123,6 +123,7 @@ steps:
  artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt)
  continueOnError: true
  condition: succeededOrFailed()
+ sbomEnabled: false # we don't need SBOM for logs
 
 # Manually inject component detection so that we can ignore the source build upstream cache, which contains
 # a nupkg cache of input packages (a local feed).

eng/common/cross/tizen-fetch.sh

@@ -7,7 +7,7 @@ fi
 
 Log()
 {
- if [ $VERBOSE -ge $1 ]; then
+ if [ $VERBOSE -ge 1 ]; then
  echo ${@:2}
  fi
 }

eng/common/dotnet-install.sh

@@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then
  dotnetRoot="$dotnetRoot/$architecture"
 fi
 
-InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
+InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || {
  local exit_code=$?
  Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2
  ExitWithExitCode $exit_code

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

@@ -23,6 +23,7 @@ jobs:
  displayName: 'Publish logs'
  continueOnError: true
  condition: always()
+ sbomEnabled: false # we don't need SBOM for logs
 
  - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}:
  - output: buildArtifacts
@@ -32,13 +33,15 @@ jobs:
  ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
  continueOnError: true
  condition: always()
+ sbomEnabled: false # we don't need SBOM for logs
 
  - ${{ if eq(parameters.enableBuildRetry, 'true') }}:
  - output: pipelineArtifact
  targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration'
  artifactName: 'BuildConfiguration'
  displayName: 'Publish build retry configuration'
- continueOnError: true 
+ continueOnError: true
+ sbomEnabled: false # we don't need SBOM for BuildConfiguration
 
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
  - output: pipelineArtifact

eng/common/templates-official/steps/publish-pipeline-artifacts.yml

@@ -23,4 +23,6 @@ steps:
  ${{ if parameters.args.artifactName }}:
  artifactName: ${{ parameters.args.artifactName }}
  ${{ if parameters.args.properties }}:
- properties: ${{ parameters.args.properties }}
+ properties: ${{ parameters.args.properties }}
+ ${{ if parameters.args.sbomEnabled }}:
+ sbomEnabled: ${{ parameters.args.sbomEnabled }}

eng/common/templates/job/job.yml

@@ -37,6 +37,7 @@ jobs:
  displayName: 'Publish logs'
  continueOnError: true
  condition: always()
+ sbomEnabled: false # we don't need SBOM for logs
 
  - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}:
  - template: /eng/common/core-templates/steps/publish-build-artifacts.yml
@@ -59,3 +60,4 @@ jobs:
  artifactName: 'BuildConfiguration'
  displayName: 'Publish build retry configuration'
  continueOnError: true
+ sbomEnabled: false # we don't need SBOM for BuildConfiguration

eng/common/tools.sh

@@ -438,7 +438,7 @@ function StopProcesses {
 }
 
 function MSBuild {
- local args=$@
+ local args=( "$@" )
  if [[ "$pipelines_log" == true ]]; then
  InitializeBuildTool
  InitializeToolset
@@ -473,7 +473,7 @@ function MSBuild {
  args+=( "-logger:$selectedPath" )
  fi
 
- MSBuild-Core ${args[@]}
+ MSBuild-Core "${args[@]}"
 }
 
 function MSBuild-Core {

global.json

@@ -1,9 +1,9 @@
 {
  "sdk": {
- "version": "9.0.100-preview.3.24204.13"
+ "version": "9.0.100-preview.4.24267.66"
  },
  "tools": {
- "dotnet": "9.0.100-preview.3.24204.13",
+ "dotnet": "9.0.100-preview.4.24267.66",
  "runtimes": {
  "dotnet": [
  "6.0.30",
@@ -18,7 +18,7 @@
  }
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24278.1",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24278.1"
  }
 }