From 13330d5ded0b2b2bcd6459d6a410aa6220b11040 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 02:29:49 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#45605)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 eng/Version.Details.xml                       | 28 +++++++++----------
 eng/Versions.props                            |  8 +++---
 global.json                                   |  4 +--
 .../0002-Upgrade-System.Memory-to-4.6.0.patch | 24 ----------------
 4 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ac31f2598932..6c924d864ef2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -559,34 +559,34 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24620.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24620.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>88a10ba00ed798ee289d786db9f6339acd682a99</Sha>
+      <Sha>ddb0b75f326734f82e94a85d7dee9b299ecdf7fc</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24620.10">
diff --git a/eng/Versions.props b/eng/Versions.props
index b6aa0fc1d7ab..c67ccccfb788 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -262,10 +262,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24620.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetSignToolVersion>10.0.0-beta.24620.1</MicrosoftDotNetSignToolVersion>
-    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24620.1</MicrosoftDotNetXliffTasksVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24620.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24620.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetSignToolVersion>10.0.0-beta.24620.3</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24620.3</MicrosoftDotNetXliffTasksVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24620.3</MicrosoftDotNetXUnitExtensionsVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sourcelink -->
diff --git a/global.json b/global.json
index 2942219ccec9..90dcd1249dd6 100644
--- a/global.json
+++ b/global.json
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24620.1",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24620.1",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24620.3",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24620.3",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }
diff --git a/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch b/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch
deleted file mode 100644
index c6b884dcacdc..000000000000
--- a/src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From da982568108371f51afb30cc8c32eab01653bd62 Mon Sep 17 00:00:00 2001
-From: Matt Thalman <mthalman@microsoft.com>
-Date: Fri, 20 Dec 2024 12:40:34 -0600
-Subject: [PATCH] Upgrade System.Memory to 4.6.0
-
-Backport: https://github.com/dotnet/arcade/pull/15353
----
- eng/Versions.props | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/eng/Versions.props b/eng/Versions.props
-index a00db9a77..ad3e2a9f9 100644
---- a/eng/Versions.props
-+++ b/eng/Versions.props
-@@ -18,7 +18,8 @@
-     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
-     <!-- corefx -->
-     <MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
--    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
-+    <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">4.6.0</SystemMemoryVersion>
-+    <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">4.5.5</SystemMemoryVersion>
-     <SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
-     <!-- deployment-tools -->
-     <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>