diff --git a/NuGet.config b/NuGet.config index 93f5df6c1..90806051e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,6 @@ - - - - - @@ -21,17 +16,8 @@ - - - - - - - - - @@ -56,17 +42,8 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b0b7e8a..a9cf6de78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/arcade - 099bbb071e187ba4e1603004597624e6acae6394 + 7c5e5a782c67460b123c8e41d484ebcca8002c93 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ff347c7ab..1ac5855a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23164.3 + 7.0.0-beta.23211.2 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 41a26d802..f13b74080 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=( 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=( 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 da60f35de..550a365a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.104", + "dotnet": "7.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" } }