diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20d16d7ea46a..38898a0c8e2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,46 +43,46 @@ 2cbd93ac6b6f9f6b206f5d1bbc4973e36b1824da - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 @@ -91,14 +91,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - e7ebd8aa0424ba4dc6ac03419954c3287d891faa + 7619d65bf2534a42257d1d8488552e59790475f6 - + https://github.com/dotnet/emsdk - e7ebd8aa0424ba4dc6ac03419954c3287d891faa + 7619d65bf2534a42257d1d8488552e59790475f6 @@ -254,29 +254,29 @@ 782a46231902762286f6958631437d635bfdd249 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 https://github.com/dotnet/windowsdesktop @@ -558,85 +558,85 @@ - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 @@ -670,9 +670,9 @@ 7d1967403f5b12406763c666f41e3358bb542ced - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 https://github.com/dotnet/arcade-services @@ -723,9 +723,9 @@ https://github.com/microsoft/testfx 2712009db11c6b24c0b691b4dc9937657e8a9af4 - + https://github.com/dotnet/runtime - 65f01395f6af3131b9480e91671c8c96062bca11 + 659321ff5db13026f52aec70cf2a6692bd4be454 diff --git a/eng/Versions.props b/eng/Versions.props index ac29b4308c23..6b4d9cc3d388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -96,44 +96,44 @@ - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 + 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 8.0.0-rc.1.23414.4 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 + 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 2.1.0 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 - 10.0.0-preview.4.25178.6 + 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 8.0.0 @@ -310,7 +310,7 @@ 15.2.10322-net10-p1 18.2.10322-net10-p1 - 10.0.0-preview.4.25176.1 + 10.0.0-preview.3.25155.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 new file mode 100644 index 000000000000..17eb73628786 --- /dev/null +++ b/src/SourceBuild/patches/emsdk/0001-main-Update-dependencies-from-dotnet-arcade-1143.patch @@ -0,0 +1,28 @@ +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/runtime/0001-Remove-duplicate-msi.patch b/src/SourceBuild/patches/runtime/0001-Remove-duplicate-msi.patch new file mode 100644 index 000000000000..488dfff9b497 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-Remove-duplicate-msi.patch @@ -0,0 +1,24 @@ +From 16440d517a611da20179e62aedaf5d269851d7a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= +Date: Mon, 24 Mar 2025 17:23:00 +0100 +Subject: [PATCH] Remove duplicate .msi FileExtensionSignInfo + +Backport: https://github.com/dotnet/runtime/pull/113592 + +--- + eng/Signing.props | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/eng/Signing.props b/eng/Signing.props +index 0623aaa1c18cc1..d06028e5d5e24b 100644 +--- a/eng/Signing.props ++++ b/eng/Signing.props +@@ -56,8 +56,6 @@ + + + +- +- + + +