diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e1737f7f..6b72d2916 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/windowsdesktop - 0b53e2db6ad599d05f86d1cfd0d1148058f06c06 + 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 - + https://github.com/dotnet/windowsdesktop - 0b53e2db6ad599d05f86d1cfd0d1148058f06c06 + 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 - + https://github.com/dotnet/windowsdesktop - 0b53e2db6ad599d05f86d1cfd0d1148058f06c06 + 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 - + https://github.com/dotnet/windowsdesktop - 0b53e2db6ad599d05f86d1cfd0d1148058f06c06 + 71e223a38bfa0a76bd1b69ab264ab3083e10eed8 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb - + https://github.com/dotnet/aspnetcore - 015ceab6aeec700fbfb71cdfe9ff8fb51831d555 + 42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb https://github.com/dotnet/test-templates @@ -102,58 +102,58 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 843587ba73cfa11af218e07be070cd9f52e2a4a1 + cedf095f532bfce7dc39ed10a1bf757e9b105595 - + https://github.com/dotnet/sdk - 843587ba73cfa11af218e07be070cd9f52e2a4a1 + cedf095f532bfce7dc39ed10a1bf757e9b105595 - + https://github.com/dotnet/sdk - 843587ba73cfa11af218e07be070cd9f52e2a4a1 + cedf095f532bfce7dc39ed10a1bf757e9b105595 - + https://github.com/dotnet/sdk - 843587ba73cfa11af218e07be070cd9f52e2a4a1 + cedf095f532bfce7dc39ed10a1bf757e9b105595 - + https://github.com/dotnet/winforms - 12830648052756e3ca3ddd9c637058915143cfb5 + 42a162cb55c1155f10fd3f9ff524610633653e88 - + https://github.com/dotnet/wpf - b2dbf9872367d2ef41f406b4786df0b02b75445d + 7228d1cadcdd6591c7869797df480b3d07f86277 - + https://github.com/dotnet/fsharp - 1bbbdb332e8142776ae722f8933464249001ced6 + 8c91d38f38ece75cac4feb009a11fb42d17fc790 - + https://github.com/dotnet/fsharp - 1bbbdb332e8142776ae722f8933464249001ced6 + 8c91d38f38ece75cac4feb009a11fb42d17fc790 - + https://github.com/microsoft/vstest - 8e6424700be04bf5e9b9e0146407aa2470b86518 + 9ded6180d38d3092df375a5a2cca83cc156f14ff - + https://github.com/dotnet/runtime - 9a7db5556f4ad892c611b2e174594db17fdec3af + 18e3bbf628eba8dd9e27a0e1da3ff168192e60c7 - + https://github.com/dotnet/roslyn - 2531dd287a40a66deaeb80b444ef6faa7fe0a999 + 2cfd4b21980e5f40ae367a122a00e2ed1a4c4a0b - + https://github.com/dotnet/msbuild - 83ce3529b2ab96cf987a856befdea1e93d2ad9fc + 59879b095e5d93d4d23ac02f3fddc45862345330 @@ -165,9 +165,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 31a4a877360713c4345ce48662e5baeeadfda898 + 81590b9b847acc7ab0e16c93628a0ccdbf4d9ee9 diff --git a/eng/Versions.props b/eng/Versions.props index c59263f17..ddb35d123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.4.23224.2 + 8.0.0-preview.5.23251.5 - 8.0.0-preview.5.23225.2 + 8.0.0-preview.5.23251.1 @@ -65,50 +65,50 @@ - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 - 8.0.0-preview.5.23226.1 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 + 8.0.0-preview.5.23252.16 0.2.0 - 8.0.100-preview.5.23227.7 - 8.0.100-preview.5.23227.7 - 8.0.100-preview.5.23227.7 + 8.0.100-preview.5.23252.38 + 8.0.100-preview.5.23252.38 + 8.0.100-preview.5.23252.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-2.23226.2 + 4.7.0-2.23251.6 - 8.0.0-preview.4.23225.14 + 8.0.0-preview.5.23252.2 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 - 8.0.0-preview.4.23225.14 + 8.0.0-preview.5.23252.2 + 8.0.0-preview.5.23252.2 + 8.0.0-preview.5.23252.2 + 8.0.0-preview.5.23252.2 + 8.0.0-preview.5.23252.2 + 8.0.0-preview.5.23252.2 2.1.0 - 8.0.0-preview.5.23225.4 - 8.0.0-preview.5.23225.4 - 8.0.0-preview.5.23225.4 - 8.0.0-preview.5.23225.4 + 8.0.0-preview.5.23252.1 + 8.0.0-preview.5.23252.1 + 8.0.0-preview.5.23252.1 + 8.0.0-preview.5.23252.1 @@ -222,7 +222,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23225.6 + 17.7.0-preview.23226.2 8.0.0-alpha.1.22557.12 @@ -235,7 +235,7 @@ 13.1.462-net8-p3 16.1.1250-net8-p3 - 8.0.0-preview.4.23219.1 + 8.0.0-preview.5.23225.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/emsdk/0001-Move-NoTargetFrameworkFiltering-property.patch b/src/SourceBuild/patches/emsdk/0001-Move-NoTargetFrameworkFiltering-property.patch deleted file mode 100644 index 065c36063..000000000 --- a/src/SourceBuild/patches/emsdk/0001-Move-NoTargetFrameworkFiltering-property.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 24 Apr 2023 14:00:42 +0000 -Subject: [PATCH] Move NoTargetFrameworkFiltering property - -Backport: https://github.com/dotnet/source-build/issues/3417 ---- - Directory.Build.props | 5 +++++ - eng/SourceBuild.props | 1 - - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 69862d8..defa3f0 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -2,6 +2,11 @@ - - - -+ -+ -+ true -+ -+ - - $(VersionPrefix) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 63164b2..c4009f3 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -3,7 +3,6 @@ - - emsdk - true -- true - - - diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch index acbd6003d..a96b23f38 100644 --- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch +++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch @@ -45,8 +45,8 @@ index 2d325ec6..e1bc7022 100644 6.6.0-preview.3.61 -- 4.5.0-3.22602.7 -+ 4.5.0-3.22602.7 +- 4.7.0-1.23226.15 ++ 4.7.0-1.23226.15 1.1.2-beta1.22216.1 diff --git a/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch index 1af0b6e93..a52956ea6 100644 --- a/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch +++ b/src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch @@ -45,9 +45,9 @@ index 7a90709c3..278d12786 100644 - + + - diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj index 7b7fbdd73..e591d60de 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj