From 284c65ce9dbfe63f9ac6ae79b9cdf624f695a0cd Mon Sep 17 00:00:00 2001
From: Manodasan Wignarajah <mawign@microsoft.com>
Date: Thu, 17 Jun 2021 21:36:20 -0700
Subject: [PATCH 1/3] Update Windows SDK projection (#10913)

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

diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
index de3923ade..5826e1bd4 100644
--- a/eng/ManualVersions.props
+++ b/eng/ManualVersions.props
@@ -9,9 +9,9 @@
      Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.17</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.17</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.17</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.18</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.18</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.18</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
     <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.18</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
   </PropertyGroup>
 </Project>

From 281097689b9d08e7ab85257e511c89b87166c1c9 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 6 Jul 2021 11:32:54 -0700
Subject: [PATCH 2/3] Stabilize final branding before release

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 0f2334894..3b0477786 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,11 +10,11 @@
     <VersionSDKMinor>4</VersionSDKMinor>
     <VersionFeature>00</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
   </PropertyGroup>
   <PropertyGroup>

From 4ed27616e47c56eae7bc84b9c5035f2a7198cec3 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 6 Jul 2021 11:35:05 -0700
Subject: [PATCH 3/3] Update GenerateBundledVersions.targets

---
 src/redist/targets/GenerateBundledVersions.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 1ffa5daac..657c88fc2 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -24,8 +24,8 @@
   </Target>
 
   <PropertyGroup>
-      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 26))</VersionFeature21>
-      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
+      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 29))</VersionFeature21>
+      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 18))</VersionFeature31>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">