diff --git a/Directory.Build.props b/Directory.Build.props index 5cca472ca43607..628d38af7c63cb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -85,8 +85,7 @@ 11.0 net$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) - - $(NetCoreAppToolCurrent) + 11.0 net$(AspNetCoreAppCurrentVersion) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5f45ca4b1e4340..8324e64b32c6fd 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25625.2 19.1.0-alpha.1.25625.2 - 5.4.0-2.26065.101 - 5.4.0-2.26065.101 - 5.4.0-2.26065.101 - 11.0.100-alpha.1.26065.101 - 11.0.100-alpha.1.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 0.11.5-alpha.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 11.0.0-beta.26065.101 - 2.9.3-beta.26065.101 - 2.9.3-beta.26065.101 - 11.0.0-beta.26065.101 - 5.4.0-2.26065.101 - 11.0.0-alpha.1.26065.101 - 11.0.100-alpha.1.26065.101 - 11.0.0-alpha.1.26065.101 - 11.0.0-alpha.1.26065.101 - 7.3.0-preview.1.6601 - 7.3.0-preview.1.6601 - 7.3.0-preview.1.6601 - 7.3.0-preview.1.6601 - 11.0.0-alpha.1.26065.101 - 3.0.0-alpha.1.26065.101 - 11.0.0-alpha.1.26065.101 - 11.0.0-alpha.1.26065.101 - 11.0.0-alpha.1.26065.101 + 5.4.0-2.26069.103 + 5.4.0-2.26069.103 + 5.4.0-2.26069.103 + 11.0.100-preview.1.26069.103 + 11.0.100-preview.1.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 0.11.5-preview.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 11.0.0-beta.26069.103 + 2.9.3-beta.26069.103 + 2.9.3-beta.26069.103 + 11.0.0-beta.26069.103 + 5.4.0-2.26069.103 + 11.0.0-preview.1.26069.103 + 11.0.100-preview.1.26069.103 + 11.0.0-preview.1.26069.103 + 11.0.0-preview.1.26069.103 + 7.3.0-preview.1.7003 + 7.3.0-preview.1.7003 + 7.3.0-preview.1.7003 + 7.3.0-preview.1.7003 + 11.0.0-preview.1.26069.103 + 3.0.0-preview.1.26069.103 + 11.0.0-preview.1.26069.103 + 11.0.0-preview.1.26069.103 + 11.0.0-preview.1.26069.103 11.0.0-beta.26071.1 11.0.0-beta.26071.1 @@ -110,14 +110,14 @@ This file should be imported by eng/Versions.props 11.0.0-alpha.0.25625.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 - 11.0.0-alpha.1.25628.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 + 11.0.0-alpha.1.26061.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d800f92f59ff5b..584e600e9dd3d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 90a3b767fd10543cbaed7308406e0059dec0ffb7 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 90a3b767fd10543cbaed7308406e0059dec0ffb7 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 31e0b8e08f57890f7b7004b93361d69cd4b21079 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 2497df9ce6db7a2b4082cb45b203983f977c6d5b - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,53 +365,53 @@ - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/dotnet - bac69806be267e5c3fbd02ea60d69f6bdc0356ae + adf42f5dcec99a409a6f63355f5b52147bfaf043 - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf - + https://github.com/dotnet/node - 0f3a9cd731b411ea93b239ef3cfff3ca5624ef1d + 7a708d1adab0930c09ef65586d354aafb2ab27cf https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index afe55bd258e1c7..8540a2fe47fdc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ 8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11)) 7.0.20 6.0.36 - alpha + preview 1 false diff --git a/global.json b/global.json index 81228fc7673725..c6b5ccd859954c 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "11.0.100-alpha.1.26060.102", + "version": "11.0.100-alpha.1.26064.118", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "11.0.100-alpha.1.26060.102" + "dotnet": "11.0.100-alpha.1.26064.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26065.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26065.101", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26065.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26069.103", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26069.103", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26069.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.26065.101" + "Microsoft.NET.Sdk.IL": "11.0.0-preview.1.26069.103" } } diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index d52f28048faa83..069d3b7278e143 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -253,13 +253,13 @@ <_MachLinkerArg Include="-Wl,-dead_strip" /> - + - <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '[1-9]\d*')) + <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '(?<=Xcode\s)[1-9]\d*')) diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index 4d58c7e4c012dd..a72b49134ecebf 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets @@ -284,13 +284,13 @@ The .NET Foundation licenses this file to you under the MIT license. - + - <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '[1-9]\d*')) + <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '(?<=Xcode\s)[1-9]\d*')) diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj index 239e3f83618a1b..d07363514d8914 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler_publish.csproj @@ -10,6 +10,9 @@ false true true + + + false diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj index f5f2fe11f65886..ef721045174a58 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj @@ -10,6 +10,9 @@ false true true + + + false diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs index 4495a7851d859d..84f4f2663be448 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs @@ -297,7 +297,7 @@ void AssertFile(string suffix) } [Theory] - [InlineData(false)] + // [InlineData(false)] https://github.com/dotnet/runtime/issues/123477 [InlineData(true)] public async Task LibraryModeBuild(bool useWasmSdk) { diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLibrary/LazyLibrary.csproj b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLibrary/LazyLibrary.csproj index 0e42ce3d859a52..c9ed06860681b0 100644 --- a/src/mono/wasm/testassets/WasmBasicTestApp/LazyLibrary/LazyLibrary.csproj +++ b/src/mono/wasm/testassets/WasmBasicTestApp/LazyLibrary/LazyLibrary.csproj @@ -4,5 +4,6 @@ browser-wasm Library true + true diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt index 2bc2b9be6056dc..99f7b1b2d207f6 100644 --- a/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt +++ b/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt @@ -89,7 +89,7 @@ endif() add_custom_command( OUTPUT pal_swiftbindings.o - COMMAND xcrun swiftc -emit-object -static -parse-as-library -enable-library-evolution ${SWIFT_COMPILER_ERRORS_FLAG} -g ${SWIFT_OPTIMIZATION_FLAG} -runtime-compatibility-version none ${SWIFT_SDK_FLAG} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o + COMMAND xcrun swiftc -emit-object -static -parse-as-library -enable-library-evolution ${SWIFT_COMPILER_ERRORS_FLAG} -gline-tables-only ${SWIFT_OPTIMIZATION_FLAG} -runtime-compatibility-version none ${SWIFT_SDK_FLAG} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift COMMENT "Compiling Swift file pal_swiftbindings.swift" ) diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets index 83b3dacde69272..66b63c87268486 100644 --- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets +++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets @@ -620,13 +620,13 @@ Copyright (c) .NET Foundation. All rights reserved. <_MachLinkerArg Include="-Wl,-dead_strip" /> - + - <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '[1-9]\d*')) + <_XcodeVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XcodeVersionString), '(?<=Xcode\s)[1-9]\d*')) diff --git a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj index 4d5a2881ac1823..771bca77a22514 100644 --- a/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj +++ b/src/tests/Common/XUnitLogChecker/XUnitLogChecker.csproj @@ -9,6 +9,9 @@ true true false + + + false