diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 082775e02891..7c224d9d62aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop e7f7d8614a816eebf1a5447a3b5e1ca77b38f6d5 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 - + https://github.com/dotnet/aspnetcore - dce793fda55ebc9b32eb69ff01023a618ed06942 + 465b7a3db7a3772f6b3da1c0e749e54820fdfc97 https://github.com/dotnet/test-templates @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 5a41781eb69eb4721e736a99262dbd32b6bb55d4 - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + 15dd3db4531d5180fda8a864f3087791cb240ede - + https://github.com/dotnet/sdk - 14ef05cb4b32d24cb062017f9ac1ebf6110257e6 + 15dd3db4531d5180fda8a864f3087791cb240ede @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 599cce2fff315dd2c6d712436e890837cdc3ff3e - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/dotnet/fsharp - 15e94b3cb730ed90d454141e0d4c10a28d9efe1d + 5b37dd5fea143baefbef2bd83836188af0815a30 @@ -142,18 +142,18 @@ 2d656fe2133f89248825419fb8ffac5505486906 - + https://github.com/dotnet/runtime - 958b1e046cbfff5c0bc647f531b4fcf9eb197a6c + 50c1214f049424a7ba0080626b7f07e675b34f8b https://github.com/dotnet/roslyn 542fea0c2a93aacb3e8c52c2ce43e975d29832f3 - + https://github.com/dotnet/msbuild - 413571dea9ebb0023f26e5c0f5cd514d30b61465 + 171676d8179a0032a2890c3d0ad6f9e245ca1f5c diff --git a/eng/Versions.props b/eng/Versions.props index d5998438a48a..36632c98ce53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,22 +65,22 @@ - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 - 8.0.0-preview.4.23205.4 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 + 8.0.0-preview.4.23207.3 0.2.0 - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 - 8.0.100-preview.4.23206.6 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 + 8.0.100-preview.4.23207.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23207.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 - 8.0.0-preview.4.23181.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 + 8.0.0-preview.4.23207.2 2.1.0 @@ -218,7 +218,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230323-05 + 17.7.0-preview.23205.10 8.0.0-alpha.1.22557.12 diff --git a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch b/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch deleted file mode 100644 index f5e666d768f9..000000000000 --- a/src/SourceBuild/patches/runtime/0001-Fix-for-item-based-msbuild-pattern.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 1 Mar 2023 00:08:32 +0000 -Subject: [PATCH] Fix for item-based msbuild pattern - -Backport: https://github.com/dotnet/runtime/issues/82795 ---- - src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -index 251336540b5..72a3537a5ce 100644 ---- a/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -+++ b/src/tasks/Crossgen2Tasks/Microsoft.NET.CrossGen.targets -@@ -346,7 +346,13 @@ Copyright (c) .NET Foundation. All rights reserved. - _CreateR2RImages; - _CreateR2RSymbols"> - -- -+ -+ <_R2RCrossgenTelemetry Include="PublishReadyToRunUseCrossgen2" Value="$(PublishReadyToRunUseCrossgen2)" /> -+ <_R2RCrossgenTelemetry Include="Crossgen2PackVersion" Value="%(ResolvedCrossgen2Pack.NuGetPackageVersion)" /> -+ <_R2RCrossgenTelemetry Include="CompileListCount" Value="@(_ReadyToRunCompileList->Count())" /> -+ <_R2RCrossgenTelemetry Include="FailedCount" Value="@(_ReadyToRunCompilationFailures->Count())" /> -+ -+ - - -