From b7920e35d10ecc3a1caac653862da201c0d2a519 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 19:51:21 +0000
Subject: [PATCH 1/3] [release/6.0.1xx] Update dependencies from dotnet/arcade
 (#20026)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  2 +-
 global.json             |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 35719daa970c..360f2b480297 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -197,19 +197,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24360.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24367.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
+      <Sha>3ea644036738781aff3b55f57a16bc99a6b82c4c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24360.7">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24367.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
+      <Sha>3ea644036738781aff3b55f57a16bc99a6b82c4c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24360.7">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24367.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
+      <Sha>3ea644036738781aff3b55f57a16bc99a6b82c4c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.24266.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0e6fe8dac2d2..3e2044ee6bdc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24367.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
diff --git a/global.json b/global.json
index 18b0acd2a4c5..49287840d85f 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
     "cmake": "3.16.4"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24360.7",
-    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24360.7"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24367.5",
+    "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24367.5"
   }
 }

From 4f31285ead4d1680fbce13dcefa924ffaee2d0cd Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 6 Aug 2024 11:23:26 -0700
Subject: [PATCH 2/3] Update branding to 6.0.134

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3e2044ee6bdc..612736663bd3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
     <VersionMajor>6</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>33</VersionFeature>
+    <VersionFeature>34</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

From d358f097e086edc87cc1fb2119886e2594ec08f0 Mon Sep 17 00:00:00 2001
From: Manodasan Wignarajah <mawign@microsoft.com>
Date: Fri, 9 Aug 2024 16:42:57 -0700
Subject: [PATCH 3/3] Update Windows SDK projection

---
 eng/ManualVersions.props | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
index 8ea5be208a97..2a808a31ede1 100644
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@@ -9,12 +9,12 @@
      Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.38</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.38</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.38</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.38</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.38</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.38</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.38</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
   </PropertyGroup>
 </Project>