diff --git a/Directory.Packages.props b/Directory.Packages.props index 058ed700ca47..1ca3faaa72f6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -46,7 +46,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d87b15d7074a..ec907d1b9f13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,46 +43,46 @@ 317a798efb739d6d117c56105a7716e9556b46eb - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 @@ -91,14 +91,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 7619d65bf2534a42257d1d8488552e59790475f6 + e7ebd8aa0424ba4dc6ac03419954c3287d891faa - + https://github.com/dotnet/emsdk - 7619d65bf2534a42257d1d8488552e59790475f6 + e7ebd8aa0424ba4dc6ac03419954c3287d891faa @@ -254,29 +254,29 @@ d45df4b7119f16b31c3d0adcd3adbf3ec0842d02 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 https://github.com/dotnet/windowsdesktop @@ -558,85 +558,85 @@ - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 @@ -670,9 +670,9 @@ 37f732fbfa006386f89a16be417278ea4fee375e - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 https://github.com/dotnet/arcade-services @@ -711,10 +711,6 @@ 5fa9337a84a52e9bd185d04d156eccbdcf592f74 - - https://github.com/dotnet/runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d - https://github.com/microsoft/testfx b66a5e196c7e4ef91efdc62519ec1a0e280afcb8 @@ -723,9 +719,9 @@ https://github.com/microsoft/testfx b66a5e196c7e4ef91efdc62519ec1a0e280afcb8 - + https://github.com/dotnet/runtime - 659321ff5db13026f52aec70cf2a6692bd4be454 + 9559b2a8c2961fd72d2e687a2b3f8f148aa33eb5 diff --git a/eng/Versions.props b/eng/Versions.props index 41e92495f2ba..9129549ab7e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,6 @@ in that build mode analyzer assemblies always target the live compiler API. --> true true - 6.0.1 true 1.7.0-preview.25207.6 @@ -96,44 +95,44 @@ - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 8.0.0-rc.1.23414.4 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 2.1.0 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 - 10.0.0-preview.4.25174.9 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 + 10.0.0-preview.4.25207.7 8.0.0 @@ -310,7 +309,7 @@ 15.2.10322-net10-p1 18.2.10322-net10-p1 - 10.0.0-preview.3.25155.1 + 10.0.0-preview.4.25176.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion) 10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/emsdk/0001-main-Update-dependencies-from-dotnet-arcade-1143.patch b/src/SourceBuild/patches/emsdk/0001-main-Update-dependencies-from-dotnet-arcade-1143.patch deleted file mode 100644 index 17eb73628786..000000000000 --- a/src/SourceBuild/patches/emsdk/0001-main-Update-dependencies-from-dotnet-arcade-1143.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "dotnet-maestro[bot]" - <42748379+dotnet-maestro[bot]@users.noreply.github.com> -Date: Mon, 24 Mar 2025 11:40:11 +0000 -Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#1143) - -[main] Update dependencies from dotnet/arcade - - - - Remove duplicate .msi FileExtensionSignInfo - - Backport: https://github.com/dotnet/emsdk/pull/1143 ---- - eng/Signing.props | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/eng/Signing.props b/eng/Signing.props -index 4b41e98..47e1832 100644 ---- a/eng/Signing.props -+++ b/eng/Signing.props -@@ -1,7 +1,6 @@ - - - -- - - - diff --git a/src/SourceBuild/patches/msbuild/0001-Update-maintenance-packages-versions.patch b/src/SourceBuild/patches/msbuild/0001-Update-maintenance-packages-versions.patch new file mode 100644 index 000000000000..ca1178a3ef44 --- /dev/null +++ b/src/SourceBuild/patches/msbuild/0001-Update-maintenance-packages-versions.patch @@ -0,0 +1,41 @@ +From c5d7c9142c27805cb54eef5802becfb51c1e00d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= + <1175054+carlossanlop@users.noreply.github.com> +Date: Fri, 4 Apr 2025 11:51:01 -0700 +Subject: [PATCH] Update maintenance-packages versions + +Backport: https://github.com/dotnet/msbuild/pull/11684 +--- + eng/Versions.props | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 7a862bae10f..1473574e9df 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -30,8 +30,9 @@ + already consuming the newest version of these same dependencies. --> + + +- 4.6.0 +- 6.1.0 ++ 6.1.3 ++ 4.6.3 ++ 6.1.2 + + + +@@ -40,12 +41,12 @@ + When updating the version of System.Memory file a breaking change here: https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+ + and follow the guidelines written here (internal-link): https://dev.azure.com/devdiv/DevDiv/_wiki/wikis/DevDiv.wiki/1796/How-to-add-a-Known-Issue + --> ++ 6.0.1 + 4.5.5 + 6.0.0 + + + +- 6.0.1 + 0.2.104-beta + 5.0.0 + diff --git a/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch b/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch new file mode 100644 index 000000000000..0e76605df53e --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch @@ -0,0 +1,72 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= + <1175054+carlossanlop@users.noreply.github.com> +Date: Sat, 5 Apr 2025 01:36:10 -0700 +Subject: [PATCH] Update maintenance-packages versions (#78005) + +Backport: https://github.com/dotnet/roslyn/pull/78005 + +--------- + +Co-authored-by: dotnet-maestro[bot] +--- + eng/Directory.Packages.props | 6 ++---- + eng/Versions.props | 10 ++++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props +index 20ded129bd6..048a4bdd8d0 100644 +--- a/eng/Directory.Packages.props ++++ b/eng/Directory.Packages.props +@@ -197,18 +197,16 @@ + + + +- + ++ + + + + + ++ + + +- +- +- + + +- 6.1.2 ++ 6.1.3 + 4.6.1 + 4.9.0 +- 4.6.2 ++ 4.6.3 + 4.6.1 +- 6.1.1 +- 4.6.2 ++ 6.1.2 ++ 4.6.3 ++ 4.6.1 + + + 6.0.1 +@@ -41,6 +42,7 @@ + 4.5.0 + 6.0.0 + 4.5.4 ++ 4.5.0 + + -- -- -- -- -- -- - -