From e44eb502e47d80c8d90d8339b9f2c28546bf41a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Feb 2024 17:29:14 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20240214.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24059.5 -> To Version 7.0.0-beta.24114.4 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 6 +++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99d9d34a8..3fddfa878 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 592f18792..351bf8ed3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + c9bbc4b7606b46f6121a2758d2555dfc6322ed88 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 024ad8546..a1ed9ad1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080..81ea06151 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 fd9164f9a..5d42d1e74 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.115", + "dotnet": "7.0.116", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24114.4" } }