diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 38b384ea45449..c2fdf6447acfb 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21426.1", + "version": "1.0.0-prerelease.21427.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35dc3c315fc9a..a79de59c34628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu 5c8d6612b9a8f0a0279df07286c35d3dbe62b2e3 - + https://github.com/dotnet/msquic - 5a2fcca17678a0c3a84f94a927db69e759fd955d + 2966c909aa6637767f09395a5fd7a45c6e07b7e7 https://github.com/dotnet/emsdk @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 870d4582f5fe1a8a7ca9a14cc1de0fc88ee4d4f6 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 https://github.com/microsoft/vstest @@ -158,73 +158,73 @@ https://github.com/dotnet/llvm-project d3d2c8a945299ff90b998de4b3cdf863be0f043e - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be https://github.com/mono/linker 38544e820223e60d0abe2801b2856cd124679522 - + https://github.com/dotnet/xharness - d78f6e0d1ed604c4409b6fdfc692dd08b27460a9 + 2e03d2d1081b606ad3c5f79709297a9c5627854d - + https://github.com/dotnet/xharness - d78f6e0d1ed604c4409b6fdfc692dd08b27460a9 + 2e03d2d1081b606ad3c5f79709297a9c5627854d - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://github.com/dotnet/hotreload-utils - 296d9b615300fe236c54721e5a50cacd843eeaf3 + 9072cbb58b1efe912c1b112265fcab18fa2a43df https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index a3bb8274ad658..23362c945810b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,29 +53,29 @@ 1.0.0-rc.1.21426.17 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 2.5.1-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 2.5.1-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 6.0.0-preview.1.102 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 3.1.0 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 5.0.0 4.3.0 @@ -109,11 +109,11 @@ 5.0.0 5.0.0 4.8.1 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 4.5.4 4.5.0 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 7.0.0-beta.21423.2 7.0.0-beta.21423.2 @@ -127,10 +127,10 @@ 7.0.0-beta.21423.2 7.0.0-beta.21423.2 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -154,9 +154,9 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21426.1 - 1.0.0-prerelease.21426.1 - 1.0.2-alpha.0.21425.1 + 1.0.0-prerelease.21427.1 + 1.0.0-prerelease.21427.1 + 1.0.2-alpha.0.21427.1 2.4.1 2.4.2 1.3.0 @@ -173,7 +173,7 @@ 7.0.0-alpha.1.21423.1 - 6.0.0-preview.7.21425.1 + 6.0.0-preview.7.21426.1 11.1.0-alpha.1.21423.1 11.1.0-alpha.1.21423.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index d8f61472abb77..fc11001aa76c8 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -44,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(triple "x86_64-unknown-freebsd12") + set(triple "x86_64-unknown-freebsd11") elseif (ILLUMOS) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(TOOLCHAIN "x86_64-illumos") @@ -90,9 +90,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) set(CMAKE_ASM_COMPILER_TARGET ${triple}) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") set(CMAKE_SYSROOT "${CROSS_ROOTFS}") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh index 861d1931e55e3..aed19d07d506f 100644 --- a/eng/common/native/find-native-compiler.sh +++ b/eng/common/native/find-native-compiler.sh @@ -55,7 +55,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=( 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=( 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8669679348024..37dceb1bab0a9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -103,7 +103,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index bcb0e2427c644..4b7128dcf66e6 100644 --- a/global.json +++ b/global.json @@ -12,12 +12,12 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21425.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21425.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21427.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21422.3" + "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21430.3" } }