From c29f7c5146920a7469112d3951427778ba7d85c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:05:57 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240214.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5752ca269a7..23b2af1cbea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 diff --git a/eng/Versions.props b/eng/Versions.props index ad2c0ec36b5..4364bfad678 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 7.0.0 - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080ed..81ea061512b 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,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=( 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=( 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=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/global.json b/global.json index 452ff8a55c1..505f93f3317 100644 --- a/global.json +++ b/global.json @@ -1,14 +1,14 @@ { "tools": { - "dotnet": "7.0.115" + "dotnet": "7.0.116" }, "sdk": { - "version": "7.0.115", + "version": "7.0.116", "allowPrerelease": true, "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.2" } }