diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d1136934..15743f2cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 42db79719e2f4242c06197c39793ad183c7b3bad - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff - + https://github.com/dotnet/aspnetcore - c2488eead6ead7208f543d0a57104b5d167b93f9 + 3863fdbb7747db80c829f22a7369d8efd295c9ff https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 98b55256c6cdfc0ed98c52d7d39127fa55971330 - + https://github.com/dotnet/sdk - 77f5be14af1b1d0e440e297d82b091ca854e3988 + 9d31222d665cd38a3b9ede679b1858785771e32f - + https://github.com/dotnet/sdk - 77f5be14af1b1d0e440e297d82b091ca854e3988 + 9d31222d665cd38a3b9ede679b1858785771e32f - + https://github.com/dotnet/sdk - 77f5be14af1b1d0e440e297d82b091ca854e3988 + 9d31222d665cd38a3b9ede679b1858785771e32f - + https://github.com/dotnet/sdk - 77f5be14af1b1d0e440e297d82b091ca854e3988 + 9d31222d665cd38a3b9ede679b1858785771e32f @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 644cb9355a14e39f8beb694ddc56daf46b2bcaec - + https://github.com/dotnet/fsharp - 5173fe8ebce324afd5f9197beb8787b97be7660b + b265c68604681242d3a83db3f0f7b1bb97db4b93 - + https://github.com/dotnet/fsharp - 5173fe8ebce324afd5f9197beb8787b97be7660b + b265c68604681242d3a83db3f0f7b1bb97db4b93 @@ -142,18 +142,18 @@ 1fe03b9451e6605b0846fc544cc0effd2b39a85c - + https://github.com/dotnet/runtime - 2bf8f1aa83e192a307d5846424880cd61bec1a4f + 20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a - + https://github.com/dotnet/roslyn - a08e9e1f8fb99e332fd3254a4268466e590ce57a + 826e1770eedb6d8d44a054c9e3ea6569e7ec5970 - + https://github.com/dotnet/msbuild - 9604d20e7b556ca53a519a82680d131c2aa71bc6 + 53a92930247b9bd023a24b57f778dfe9a969b693 diff --git a/eng/Versions.props b/eng/Versions.props index c5207f7fd..d22115020 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,42 +68,42 @@ - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 - 8.0.0-preview.6.23302.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 + 8.0.0-preview.6.23307.1 0.2.0 - 8.0.100-preview.6.23305.4 - 8.0.100-preview.6.23305.4 - 8.0.100-preview.6.23305.4 + 8.0.100-preview.6.23307.9 + 8.0.100-preview.6.23307.9 + 8.0.100-preview.6.23307.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23303.1 + 4.7.0-3.23306.1 - 8.0.0-preview.6.23304.2 + 8.0.0-preview.6.23306.10 - 8.0.0-preview.6.23304.2 - 8.0.0-preview.6.23304.2 - 8.0.0-preview.6.23304.2 - 8.0.0-preview.6.23304.2 - 8.0.0-preview.6.23304.2 - 8.0.0-preview.6.23304.2 + 8.0.0-preview.6.23306.10 + 8.0.0-preview.6.23306.10 + 8.0.0-preview.6.23306.10 + 8.0.0-preview.6.23306.10 + 8.0.0-preview.6.23306.10 + 8.0.0-preview.6.23306.10 2.1.0 diff --git a/src/SourceBuild/patches/razor/0001-During-source-build-target-net8.0-only.patch b/src/SourceBuild/patches/razor/0001-During-source-build-target-net8.0-only.patch deleted file mode 100644 index 890458614..000000000 --- a/src/SourceBuild/patches/razor/0001-During-source-build-target-net8.0-only.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Tue, 30 May 2023 21:33:38 +0000 -Subject: [PATCH] During source build, target net8.0 only - -Backport: https://github.com/dotnet/razor/pull/8779 ---- - eng/SourceBuildPrebuiltBaseline.xml | 6 ------ - eng/Versions.props | 1 + - 2 files changed, 1 insertions(+), 6 deletions(-) - -diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml -index 90c84d161..347c42641 100644 ---- a/eng/SourceBuildPrebuiltBaseline.xml -+++ b/eng/SourceBuildPrebuiltBaseline.xml -@@ -1,11 +1,5 @@ -  - - -- -- -- -- - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 9d8d748ec..96d62879c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -27,6 +27,7 @@ - net472 - net8.0 - $(DefaultNetCoreTargetFramework);net7.0 -+ $(DefaultNetCoreTargetFramework) - net8.0-windows;net7.0-windows - -