From 3f2c50cf75b59d985c143b9a80339e36aefa09ee Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Tue, 18 May 2021 13:51:50 -0700
Subject: [PATCH 1/3] Update branding for 5.0.3xx 5.0.3xx

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 3ebfcb0a7..3c1a2bc78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,7 @@
     <VersionMajor>5</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>3</VersionSDKMinor>
-    <VersionFeature>00</VersionFeature>
+    <VersionFeature>01</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

From 7f2f577a62890fbeb49a375771b6b7545b86ffd3 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 19 May 2021 12:08:33 -0700
Subject: [PATCH 2/3] Downgrade implicit version because of no planned release
 for 2.1 in June.

---
 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 c55b4c2cc..5a2fb8170 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -24,7 +24,7 @@
   </Target>
 
   <PropertyGroup>
-      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 28))</VersionFeature21>
+      <VersionFeature21>$([MSBuild]::Add($(VersionFeature), 27))</VersionFeature21>
       <VersionFeature31>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature31>
   </PropertyGroup>
 

From 56797e67edd64ef5a00f48b090ccfc23ca944910 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 10 Dec 2020 13:51:19 -0800
Subject: [PATCH 3/3] Update implicit versions

Disable and fix tests do not work with non-existent
LastRuntimeFrameworkVersion
---
 ...venWeWantToRequireWindowsForDesktopApps.cs | 20 ++++++++++++++-
 test/SdkTests/TestConfig.xml                  | 25 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
index f6d55f644..235e8a4cf 100644
--- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
+++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Xml.Linq;
 using EndToEnd;
 using FluentAssertions;
 using Microsoft.DotNet.Tools.Test.Utilities;
@@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd
             testProjectCreator.AdditionalProperties["OutputType"] = "exe";
             testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid;
 
-            var testInstance = testProjectCreator.Create();
+            // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed
+            static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project)
+            {
+                XNamespace ns = project.Root.Name.Namespace;
+                var target = XElement.Parse(@"  <ItemGroup>
+    <KnownFrameworkReference Update=""@(KnownFrameworkReference)"">
+      <LatestRuntimeFrameworkVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</LatestRuntimeFrameworkVersion>
+    </KnownFrameworkReference>
+
+    <KnownAppHostPack Update=""@(KnownAppHostPack)"">
+      <AppHostPackVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</AppHostPackVersion>
+    </KnownAppHostPack>
+  </ItemGroup>");
+                target.Name = ns + target.Name.LocalName;
+                project.Root.Add(target);
+            }
+            TestFramework.TestAssetInstance testInstance 
+                = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion);
 
             new PublishCommand()
                     .WithWorkingDirectory(testInstance.Root.FullName)
diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml
index 794dd1478..b652d18ae 100644
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@@ -141,5 +141,30 @@
             Skip="true"
             Issue=""
             Reason="Need all .NET core runtime"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_infers_WinExe_output_type"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
   </SkippedTests>
 </Tests>