From 639ae990c47adc5d2656f498faabbc0cb5b54869 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 09:09:36 -0700 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#19656) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- .../steps/publish-pipeline-artifacts.yml | 2 +- .../steps/publish-pipeline-artifacts.yml | 2 +- global.json | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0983bf03a..db6370bef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,17 +238,17 @@ - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 https://github.com/dotnet/arcade-services @@ -258,14 +258,14 @@ https://github.com/dotnet/arcade-services 22f983b0e99191ed08c6434d554fc1eab040a2ba - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 diff --git a/eng/Versions.props b/eng/Versions.props index bbfa406a8..a8d38745c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24229.1 + 9.0.0-beta.24253.1 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index afdeb7a4d..ccd3a1726 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then 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="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 + elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do _major="${version%%.*}" diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index 15d74a9d9..d71eb0c74 100644 --- a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -23,4 +23,4 @@ steps: ${{ if parameters.args.artifactName }}: artifactName: ${{ parameters.args.artifactName }} ${{ if parameters.args.properties }}: - properties: ${{ properties.args.properties }} \ No newline at end of file + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml index 815c86038..5dd698b21 100644 --- a/eng/common/templates/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -31,4 +31,4 @@ steps: ${{ if parameters.args.parallelCount }}: parallelCount: ${{ parameters.args.parallelCount }} ${{ if parameters.args.properties }}: - properties: ${{ properties.args.properties }} \ No newline at end of file + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/global.json b/global.json index 39f10d56e..b98db7f3f 100644 --- a/global.json +++ b/global.json @@ -11,8 +11,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24229.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24253.1", "Microsoft.Build.NoTargets": "3.7.0" } }