diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d27d0f7d2..ef72fe70b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a27867a7347d595702e30cb25acb60b76f4614c3 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 - + https://github.com/dotnet/aspnetcore - f136052490cdf7f06dedc6868a246d27f6e43856 + 16907a1efa1b53ea0c91984f90d8cef314fb4420 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 08bca9607a6d666039a5a5e66c2179f43fe1a1b4 - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae - + https://github.com/dotnet/sdk - 3c9bbdac34172e57f23bb40d6f6ec27644ff89ff + 2d75db25fdfc18c7b7de9454d93962dc4e0ab4ae @@ -142,11 +142,11 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 7b651743dc951384f6c3d8455c88518022c7c3b9 + edb161ab06ddc69d27aee2c0e990a60221ebbe92 - + https://github.com/dotnet/roslyn 48b13597fee9df5ecfbd0b8c0758b3f46bc1d440 diff --git a/eng/Versions.props b/eng/Versions.props index fd9617897..71edac1b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,42 +65,42 @@ - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 - 8.0.0-preview.4.23171.1 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 + 8.0.0-preview.4.23171.7 0.2.0 - 8.0.100-preview.4.23171.18 - 8.0.100-preview.4.23171.18 - 8.0.100-preview.4.23171.18 + 8.0.100-preview.4.23171.39 + 8.0.100-preview.4.23171.39 + 8.0.100-preview.4.23171.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-2.23166.9 + 4.6.0-2.23171.5 - 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23171.4 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 - 8.0.0-preview.3.23170.14 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 + 8.0.0-preview.3.23171.4 2.1.0 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 9616506fa..56601bc3a 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -18,8 +18,8 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.0.1.0-8.0.100-5.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-14.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.1.23115.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 3d6c8c8ee..e59da05d1 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23080.2" + "dotnet": "8.0.100-preview.2.23157.25" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch b/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch new file mode 100644 index 000000000..6f944b67b --- /dev/null +++ b/src/SourceBuild/patches/runtime/0002-Revert-switch-to-self-hosted-NativeAOT-compiler.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Mon, 20 Mar 2023 15:35:53 -0500 +Subject: [PATCH] Revert switch to self-hosted NativeAOT compiler + +Backport: https://github.com/dotnet/runtime/issues/83695 +--- + src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +index db48433db73..982bbc78427 100644 +--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj ++++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj +@@ -12,6 +12,7 @@ + $(RuntimeBinDir)ilc-published/ + false + false ++ false + true + true + true