From 6cffd1bfb0e36b384be9441bf8c90ebeaa58070a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Mar 2024 20:57:02 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24159.1 -> To Version 9.0.0-beta.24165.3 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 6 ++-- eng/common/templates-official/job/job.yml | 18 +++++++----- .../job/publish-build-assets.yml | 10 ++++--- global.json | 4 +-- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acf2ba620..4bffe7611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,33 +7,33 @@ - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 - + https://github.com/dotnet/arcade - f4538b1f8ff5ceb197aea509f3f61872b217b09e + 812d978c303174dc1aa305d7359e79053d7d4971 diff --git a/eng/Versions.props b/eng/Versions.props index 28e177993..790fb517e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,7 +79,7 @@ 8.0.1 5.10.2 1.1.2-beta1.23431.1 - 9.0.0-beta.24159.1 + 9.0.0-beta.24165.3 2.1.0 3.0.1 0.0.6-test diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f5c1ec7ea..afdeb7a4d 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do @@ -125,8 +125,8 @@ if [ -z "$CC" ]; then exit 1 fi -# Only lld version >= 9 can be considered stable. lld doesn't support s390x. -if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then +# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. +if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 1df020124..dfc3c0cf0 100644 --- 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 \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 5f5413556..d72e4ea6d 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -98,14 +98,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 index 893d9c079..82ecb63c8 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24159.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24159.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24165.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" }