From faff70f02ec611bfbac02eef0dae7a3152f2f42a Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 16 Dec 2020 11:01:44 -0800
Subject: [PATCH 1/5] Automatically calculate the implicit version number based
 on the current version.  This will need to be updated any time 2.1 or 3.1
 don't ship.

---
 .../targets/GenerateBundledVersions.targets   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 4218878f2..48a93c24f 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -23,6 +23,11 @@
 
   </Target>
 
+  <PropertyGroup>
+      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 22))</VersionFeature21>
+      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 09))</VersionFeature31>
+  </PropertyGroup>
+
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
     <PropertyGroup>
       <BundledVersionsPropsFileName>Microsoft.NETCoreSdk.BundledVersions.props</BundledVersionsPropsFileName>
@@ -37,20 +42,20 @@
       <_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion>
       <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
       
-      <_NETCoreApp31RuntimePackVersion>3.1.14</_NETCoreApp31RuntimePackVersion>
+      <_NETCoreApp31RuntimePackVersion>3.1.$(VersionFeature31)</_NETCoreApp31RuntimePackVersion>
       <_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
       
       <_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion>
       <_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
       
-      <_WindowsDesktop31RuntimePackVersion>3.1.14</_WindowsDesktop31RuntimePackVersion>
+      <_WindowsDesktop31RuntimePackVersion>3.1.$(VersionFeature31)</_WindowsDesktop31RuntimePackVersion>
       <_WindowsDesktop31TargetingPackVersion>3.1.0</_WindowsDesktop31TargetingPackVersion>
       
       <_AspNet30RuntimePackVersion>3.0.3</_AspNet30RuntimePackVersion>
       <_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
       
-      <_AspNet31RuntimePackVersion>3.1.14</_AspNet31RuntimePackVersion>
-      <_AspNet31TargetingPackVersion>3.1.10</_AspNet31TargetingPackVersion>
+      <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31)</_AspNet31RuntimePackVersion>
+      <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31)</_AspNet31TargetingPackVersion>
 
       <!-- Use only major and minor in target framework version -->
       <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
@@ -154,7 +159,7 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
-                               LatestVersion="2.1.27" />
+                               LatestVersion="2.1.$(VersionFeature21)" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
@@ -162,11 +167,11 @@
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.27"/>
+                               LatestVersion="2.1.$(VersionFeature21)"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.27"/>
+                               LatestVersion="2.1.$(VersionFeature21)"/>
 
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.2"

From 0c03d8cce05bc4acb10c388abc495436ebda8417 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 12 May 2021 12:54:12 -0700
Subject: [PATCH 2/5] Update implicit versions

---
 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 48a93c24f..af831e675 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -24,8 +24,8 @@
   </Target>
 
   <PropertyGroup>
-      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 22))</VersionFeature21>
-      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 09))</VersionFeature31>
+      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 27))</VersionFeature21>
+      <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">

From 04e9b5bab69bee5bbc5ee7e569be4f189b2947b4 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 12 May 2021 12:59:57 -0700
Subject: [PATCH 3/5] Update branding for servicing

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 65abbb31f..634256b7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
     <VersionSDKMinor>3</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. -->

From 0f2fd7baa74cd1483cb9fed7ba14c7e5e5f4fcfa Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 12 May 2021 14:53:43 -0700
Subject: [PATCH 4/5] Bump implicit version to 2.1.28

---
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index af831e675..f94a68460 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -24,7 +24,7 @@
   </Target>
 
   <PropertyGroup>
-      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 27))</VersionFeature21>
+      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 28))</VersionFeature21>
       <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
   </PropertyGroup>
 

From a93abbb3e9bfe911db205e1d54909498af73eca3 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 12 May 2021 15:11:40 -0700
Subject: [PATCH 5/5] Keep aspnet targeting pack version 3.1.10

---
 src/redist/targets/GenerateBundledVersions.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index f94a68460..c55b4c2cc 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -55,7 +55,7 @@
       <_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
       
       <_AspNet31RuntimePackVersion>3.1.$(VersionFeature31)</_AspNet31RuntimePackVersion>
-      <_AspNet31TargetingPackVersion>3.1.$(VersionFeature31)</_AspNet31TargetingPackVersion>
+      <_AspNet31TargetingPackVersion>3.1.10</_AspNet31TargetingPackVersion>
 
       <!-- Use only major and minor in target framework version -->
       <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>