From dcc0e61aa13697615b319f0884f16e5b68e25491 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Fri, 12 Nov 2021 12:46:54 -0800
Subject: [PATCH 1/4] Update 6.0 implicit versions

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

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 96cf3c3e8..d4dec75d2 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -28,6 +28,7 @@
       <VersionFeature21>30</VersionFeature21>
       <VersionFeature31>21</VersionFeature31>
       <VersionFeature50>12</VersionFeature50>
+      <VersionFeature60>0</VersionFeature60>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">
@@ -40,13 +41,12 @@
       <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
       <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
 
-      <!-- TODO: Once .NET 6.0 has released, update these version numbers to 6.0.0 -->
-      <_NET60RuntimePackVersion>6.0.0-rc.2.21452.2</_NET60RuntimePackVersion>
-      <_NET60TargetingPackVersion>6.0.0-rc.2.21452.2</_NET60TargetingPackVersion>
-      <_WindowsDesktop60RuntimePackVersion>6.0.0-rc.2.21431.3</_WindowsDesktop60RuntimePackVersion>
-      <_WindowsDesktop60TargetingPackVersion>6.0.0-rc.2.21431.3</_WindowsDesktop60TargetingPackVersion>
-      <_AspNet60RuntimePackVersion>6.0.0-rc.2.21452.1</_AspNet60RuntimePackVersion>
-      <_AspNet60TargetingPackVersion>6.0.0-rc.2.21452.1</_AspNet60TargetingPackVersion>
+      <_NET60RuntimePackVersion>6.0.$(VersionFeature60)</_NET60RuntimePackVersion>
+      <_NET60TargetingPackVersion>6.0.0</_NET60TargetingPackVersion>
+      <_WindowsDesktop60RuntimePackVersion>6.0.$(VersionFeature60)</_WindowsDesktop60RuntimePackVersion>
+      <_WindowsDesktop60TargetingPackVersion>6.0.0</_WindowsDesktop60TargetingPackVersion>
+      <_AspNet60RuntimePackVersion>6.0.$(VersionFeature60)</_AspNet60RuntimePackVersion>
+      <_AspNet60TargetingPackVersion>6.0.0</_AspNet60TargetingPackVersion>
 
       <_NET50RuntimePackVersion>5.0.$(VersionFeature50)</_NET50RuntimePackVersion>
       <_NET50TargetingPackVersion>5.0.0</_NET50TargetingPackVersion>

From ffe5d72008f4fbaaef455e59c780507a7581baeb Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 12 Jan 2022 13:49:43 -0800
Subject: [PATCH 2/4] Update GenerateBundledVersions.targets

---
 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 1fc5a8a7c..058fe30a9 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -28,7 +28,7 @@
       <VersionFeature21>30</VersionFeature21>
       <VersionFeature31>22</VersionFeature31>
       <VersionFeature50>13</VersionFeature50>
-      <VersionFeature60>0</VersionFeature60>
+      <VersionFeature60>1</VersionFeature60>
   </PropertyGroup>
 
   <Target Name="GenerateBundledVersionsProps" DependsOnTargets="SetupBundledComponents">

From ae46ebfe5d82f87482735d854826fd6a0eff5704 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 13 Jan 2022 10:50:19 -0800
Subject: [PATCH 3/4] Update SdkTests.csproj

---
 test/SdkTests/SdkTests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index 0a0459230..9f1017d49 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -95,7 +95,7 @@
       <RuntimeVersionToInstall Include="3.0.0" />
       <RuntimeVersionToInstall Include="3.1.0" />
       <RuntimeVersionToInstall Include="5.0.0" />
-      <RuntimeVersionToInstall Include="6.0.0-rc.2.21452.2" />
+      <RuntimeVersionToInstall Include="6.0.0" />
     </ItemGroup>
     
   </Target>

From 0e9ba442710970aabef42bbd3a2da69e30f031d4 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 13 Jan 2022 11:03:14 -0800
Subject: [PATCH 4/4] Fix the DefaultRuntimeFrameworkVersion to be the .0
 version

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

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 058fe30a9..304e3e258 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -424,7 +424,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.NETCore.App"
-                              DefaultRuntimeFrameworkVersion="$(_NET60RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="6.0.0"
                               LatestRuntimeFrameworkVersion="$(_NET60RuntimePackVersion)"
                               TargetingPackName="Microsoft.NETCore.App.Ref"
                               TargetingPackVersion="$(_NET60TargetingPackVersion)"
@@ -458,7 +458,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="6.0.0"
                               LatestRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(_WindowsDesktop60TargetingPackVersion)"
@@ -470,7 +470,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="6.0.0"
                               LatestRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(_WindowsDesktop60TargetingPackVersion)"
@@ -483,7 +483,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
-                              DefaultRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="6.0.0"
                               LatestRuntimeFrameworkVersion="$(_WindowsDesktop60RuntimePackVersion)"
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(_WindowsDesktop60TargetingPackVersion)"
@@ -496,7 +496,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
                               TargetFramework="net6.0"
                               RuntimeFrameworkName="Microsoft.AspNetCore.App"
-                              DefaultRuntimeFrameworkVersion="$(_AspNet60RuntimePackVersion)"
+                              DefaultRuntimeFrameworkVersion="6.0.0"
                               LatestRuntimeFrameworkVersion="$(_AspNet60RuntimePackVersion)"
                               TargetingPackName="Microsoft.AspNetCore.App.Ref"
                               TargetingPackVersion="$(_AspNet60TargetingPackVersion)"