diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4e9bf50bac04a..df8e99bf84d91 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "7.0.0-prerelease.24054.3", + "version": "7.0.0-prerelease.24073.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 113b1d12e2146..e2c67185fa1df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://github.com/dotnet/runtime-assets @@ -246,21 +246,21 @@ https://github.com/dotnet/linker 53b3303c57b3fe659500fb362a0eef12991c1197 - + https://github.com/dotnet/xharness - d4bda077bfbe30e25c4569591e8c5c6221e24cc0 + 068c593390bc20675e70d0dff8e99fc473715cf1 - + https://github.com/dotnet/xharness - d4bda077bfbe30e25c4569591e8c5c6221e24cc0 + 068c593390bc20675e70d0dff8e99fc473715cf1 - + https://github.com/dotnet/xharness - d4bda077bfbe30e25c4569591e8c5c6221e24cc0 + 068c593390bc20675e70d0dff8e99fc473715cf1 - + https://github.com/dotnet/arcade - 02d5538bac1bacfd6fb310d92ab8914de08f3358 + 5fd1dbf1679abc625e9e74614d9d7a28d151d675 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1de6998e7ce5f..7282e4e1409e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 2.5.1-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 - 7.0.0-beta.24059.5 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 2.5.1-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 + 7.0.0-beta.24114.2 6.0.0-preview.1.102 @@ -154,9 +154,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 7.0.0-prerelease.24054.3 - 7.0.0-prerelease.24054.3 - 7.0.0-prerelease.24054.3 + 7.0.0-prerelease.24073.2 + 7.0.0-prerelease.24073.2 + 7.0.0-prerelease.24073.2 7.0.0-alpha.0.24060.2 2.4.2 1.0.0 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f13b74080edf9..81ea061512be4 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 223f57447ef3e..12d0ae65c734c 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "7.0.115", + "version": "7.0.116", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "7.0.115" + "dotnet": "7.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5", - "Microsoft.DotNet.SharedFramework.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", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24114.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"