From fe6e19ff88079acd50673b489b1e5aeab4cb1201 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Fri, 13 Sep 2024 00:28:34 +0200
Subject: [PATCH 1/3] Update arcade

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index bce954435c7..b66eed16d21 100644
--- a/global.json
+++ b/global.json
@@ -17,7 +17,7 @@
     "perl": "5.38.2.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24462.3",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

From f4d312dc7a57593d22a7c2924467fafc9f41a771 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vlza@microsoft.com>
Date: Fri, 13 Sep 2024 00:32:29 +0200
Subject: [PATCH 2/3] version xml

---
 eng/Version.Details.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 76c5d53d8d6..a6fe9dd9339 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -42,14 +42,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24459.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24462.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>65260b148c869ada772a5843863c54737cd2361e</Sha>
+      <Sha>91b9734abbad751d575c002b30778c88d978993c</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24459.6">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24462.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>65260b148c869ada772a5843863c54737cd2361e</Sha>
+      <Sha>91b9734abbad751d575c002b30778c88d978993c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23614.4">

From abe44a19286908655c3ddca8f5fbf45fd879f57d Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vlza@microsoft.com>
Date: Fri, 13 Sep 2024 00:33:04 +0200
Subject: [PATCH 3/3] remove workaround

---
 Directory.Build.targets | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 52109a82ee6..df0677f7673 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -51,30 +51,4 @@
       RemoveProperties="TargetFramework"
       StopOnFirstFailure="True" />
   </Target>
-
-  <!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12, future 17.11 patch or when arcade ships the the same workaround -->
-  <Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))">
-    <PrimeSystemTextJson804 />
-  </Target>
-  <UsingTask
-    TaskName="PrimeSystemTextJson804"
-    TaskFactory="RoslynCodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
-    <Task>
-      <Code Type="Fragment" Language="cs">
-<![CDATA[
-try
-{
-    System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll");
-}
-catch
-{
-    // Best effort: if something moves in the SDK don't break the build.
-}
-]]>
-      </Code>
-    </Task>
-  </UsingTask>
-  <!-- END workaround for https://github.com/dotnet/sdk/issues/43339 -->
-
 </Project>