diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 754244d1a13688..14b63eb524bdd4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,46 +6,46 @@ This file should be imported by eng/Versions.props - 5.9.0-1.26326.122 - 5.9.0-1.26326.122 - 5.9.0-1.26326.122 - 5.9.0-1.26326.122 - 11.0.100-preview.6.26326.122 - 11.0.100-preview.6.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 0.11.5-preview.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 - 11.0.0-beta.26326.122 + 5.9.0-1.26330.107 + 5.9.0-1.26330.107 + 5.9.0-1.26330.107 + 5.9.0-1.26330.107 + 11.0.100-preview.6.26330.107 + 11.0.100-preview.6.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 0.11.5-preview.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 + 11.0.0-beta.26330.107 3.2.2-beta.26257.113 - 2.9.3-beta.26326.122 - 11.0.0-beta.26326.122 - 5.9.0-1.26326.122 - 11.0.0-preview.6.26326.122 - 11.0.100-preview.6.26326.122 - 11.0.0-preview.6.26326.122 - 11.0.0-preview.6.26326.122 - 7.9.0-rc.32722 - 7.9.0-rc.32722 - 7.9.0-rc.32722 - 7.9.0-rc.32722 - 11.0.0-preview.6.26326.122 - 3.0.0-preview.6.26326.122 - 11.0.0-preview.6.26326.122 - 11.0.0-preview.6.26326.122 - 11.0.0-preview.6.26326.122 + 2.9.3-beta.26330.107 + 11.0.0-beta.26330.107 + 5.9.0-1.26330.107 + 11.0.0-preview.6.26330.107 + 11.0.100-preview.6.26330.107 + 11.0.0-preview.6.26330.107 + 11.0.0-preview.6.26330.107 + 7.9.0-rc.33107 + 7.9.0-rc.33107 + 7.9.0-rc.33107 + 7.9.0-rc.33107 + 11.0.0-preview.6.26330.107 + 3.0.0-preview.6.26330.107 + 11.0.0-preview.6.26330.107 + 11.0.0-preview.6.26330.107 + 11.0.0-preview.6.26330.107 11.0.0-alpha.0.26180.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96e7c12ded176e..89c8d630d9f489 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project d3d4d65a3d02d42e361de4cf35431cc768fb01b0 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://github.com/dotnet/dotnet 0eae08ed2f094f44e0151e4815e7cdd1a334fcdf - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project d3d4d65a3d02d42e361de4cf35431cc768fb01b0 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness a0534aec8f776d258392f0266cbdb9cc97e1dd98 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -327,33 +327,33 @@ https://github.com/dotnet/runtime-assets 741cd9b2bf5a322b38c37367bc26c4e97ab16abe - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 - + https://github.com/dotnet/dotnet - 1bff05b756db35ded2fbb17fb8f2934ac81e1b74 + 2b7c5aa2fa085a9ed3e3bd9cb6c218540400cb38 https://github.com/dotnet/node diff --git a/global.json b/global.json index 926a122dfbfe07..d7f47ca62fff79 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.5.26227.104", + "version": "11.0.100-preview.5.26302.115", "allowPrerelease": true, "rollForward": "major", "paths": [ @@ -10,14 +10,14 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.sh (Unix) or eng\\common\\dotnet.cmd (Windows) to install it." }, "tools": { - "dotnet": "11.0.100-preview.5.26227.104" + "dotnet": "11.0.100-preview.5.26302.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26326.122", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26326.122", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26326.122", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26330.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26330.107", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26330.107", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26326.122" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.6.26330.107" } } diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index d2a2348e06f96a..b71def00903dd2 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -616,6 +616,13 @@ endif() ###################################### set(LLVM_LIBS) if(LLVM_PREFIX) + set(MONO_LLVM_ENABLED 1) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 21.0) + message(WARNING "Mono llvm support requires clang 21+, found ${CMAKE_CXX_COMPILER_VERSION}. Skipping building Mono llvm support.") + set(MONO_LLVM_ENABLED 0) + endif() +endif() +if(MONO_LLVM_ENABLED) if(TARGET_ARCH STREQUAL "x86_64") set(llvm_codegen_libs "x86codegen") elseif(TARGET_ARCH STREQUAL "x86")