From 69022825a3415d4e79ba81906d272de76127f29e Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 12 Nov 2021 13:47:22 -0800
Subject: [PATCH 1/4] 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 96cf3c3e8..c2faa27f6 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -199,8 +199,8 @@
 
       <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
       <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
-      <WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
-      <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids);win-arm64" />
+      <WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids);win-arm64" />
+      <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
     </ItemGroup>
 
     <!--

From 34c193506e7be1d923241c7ca380b13d84a97498 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 12 Nov 2021 16:37:43 -0800
Subject: [PATCH 2/4] Update the WD publish tests to target downlevel as well

---
 test/EndToEnd/ProjectBuildTests.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 6cc30060f..cdc39d3e6 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -96,13 +96,15 @@ namespace EndToEnd.Tests
                 .Should().Pass().And.HaveStdOutContaining("Hello, World!");
         }
 
-        [WindowsOnlyFact]
-        public void ItCanPublishArm64Winforms()
+        [WindowsOnlyTheory]
+        [InlineData("net5.0")]
+        [InlineData("net6.0")]
+        public void ItCanPublishArm64Winforms(string TargetFramework)
         {
             DirectoryInfo directory = TestAssets.CreateTestDirectory();
             string projectDirectory = directory.FullName;
 
-            string newArgs = "winforms --no-restore";
+            string newArgs = $"winforms -f {TargetFramework} --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(projectDirectory)
                 .Execute(newArgs)
@@ -122,13 +124,15 @@ namespace EndToEnd.Tests
             selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
         }
 
-        [WindowsOnlyFact]
-        public void ItCanPublishArm64Wpf()
+        [WindowsOnlyTheory]
+        [InlineData("net5.0")]
+        [InlineData("net6.0")]
+        public void ItCanPublishArm64Wpf(string TargetFramework)
         {
             DirectoryInfo directory = TestAssets.CreateTestDirectory();
             string projectDirectory = directory.FullName;
 
-            string newArgs = "wpf --no-restore";
+            string newArgs = $"wpf -f {TargetFramework} --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(projectDirectory)
                 .Execute(newArgs)

From 08f2244ae070daceea963ae39e0902b0ec923e60 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Fri, 19 Nov 2021 13:34:59 -0800
Subject: [PATCH 3/4] Update the test to target current and 5.0

---
 test/EndToEnd/ProjectBuildTests.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index cdc39d3e6..78b94734c 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -98,13 +98,18 @@ namespace EndToEnd.Tests
 
         [WindowsOnlyTheory]
         [InlineData("net5.0")]
-        [InlineData("net6.0")]
+        [InlineData("current")]
         public void ItCanPublishArm64Winforms(string TargetFramework)
         {
             DirectoryInfo directory = TestAssets.CreateTestDirectory();
             string projectDirectory = directory.FullName;
+            string TargetFrameworkParameter = "";
 
-            string newArgs = $"winforms -f {TargetFramework} --no-restore";
+            if (TargetFramework != "current")
+            {
+                TargetFrameworkParameter = $"-f {TargetFramework}"
+            }
+            string newArgs = $"winforms {TargetFrameworkParameter} --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(projectDirectory)
                 .Execute(newArgs)
@@ -126,13 +131,19 @@ namespace EndToEnd.Tests
 
         [WindowsOnlyTheory]
         [InlineData("net5.0")]
-        [InlineData("net6.0")]
+        [InlineData("current")]
         public void ItCanPublishArm64Wpf(string TargetFramework)
         {
             DirectoryInfo directory = TestAssets.CreateTestDirectory();
             string projectDirectory = directory.FullName;
+            string TargetFrameworkParameter = "";
 
-            string newArgs = $"wpf -f {TargetFramework} --no-restore";
+            if (TargetFramework != "current")
+            {
+                TargetFrameworkParameter = $"-f {TargetFramework}"
+            }
+
+            string newArgs = $"wpf {TargetFrameworkParameter} --no-restore";
             new NewCommandShim()
                 .WithWorkingDirectory(projectDirectory)
                 .Execute(newArgs)

From 1d075c8fec274e5dc9e9ed36e53d86f4a7249b5a Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Mon, 22 Nov 2021 13:05:25 -0800
Subject: [PATCH 4/4] Fix typo

---
 test/EndToEnd/ProjectBuildTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 78b94734c..4413f2973 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -107,7 +107,7 @@ namespace EndToEnd.Tests
 
             if (TargetFramework != "current")
             {
-                TargetFrameworkParameter = $"-f {TargetFramework}"
+                TargetFrameworkParameter = $"-f {TargetFramework}";
             }
             string newArgs = $"winforms {TargetFrameworkParameter} --no-restore";
             new NewCommandShim()
@@ -140,7 +140,7 @@ namespace EndToEnd.Tests
 
             if (TargetFramework != "current")
             {
-                TargetFrameworkParameter = $"-f {TargetFramework}"
+                TargetFrameworkParameter = $"-f {TargetFramework}";
             }
 
             string newArgs = $"wpf {TargetFrameworkParameter} --no-restore";