From a3fc14fd2efd2c25c9007dec201695cb76079450 Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Date: Thu, 10 Sep 2020 02:50:04 -0700
Subject: [PATCH] Revert "Add arm64 as a possible WinForms arch (#7457)"

This reverts commit f1564ea07f85999c3712ac8cbce5d7569a1632a7, reversing
changes made to 0adcdc972aa1933c811978e3a75e0755077c6565.
---
 .../targets/GenerateBundledVersions.targets   |  5 +-
 src/redist/targets/GenerateLayout.targets     |  2 +-
 test/EndToEnd/ProjectBuildTests.cs            | 46 -------------------
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 031cce670..c7d7f1feb 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -113,9 +113,6 @@
       <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
       <WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
       <WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
-      <!-- TODO: remove this once WPF is available on ARM64 and replace usage
-            of this group for WindowsDesktopRuntimePackRids. -->
-      <WindowsDesktopRuntimePackWinformsRids Include="@(WindowsDesktopRuntimePackRids);win-arm64" />
     </ItemGroup>
 
     <!--
@@ -264,7 +261,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
                               TargetingPackVersion="$(MicrosoftWindowsDesktopAppRefPackageVersion)"
                               RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
-                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackWinformsRids, '%3B')"
+                              RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
                               IsWindowsOnly="true"
                               Profile="WindowsForms"
                               />
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index ed6f08ec6..fed7ac960 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -283,7 +283,7 @@
 
     <PropertyGroup>
       <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
-      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT'">true</IncludeWpfAndWinForms>
+      <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' AND '$(Architecture)' != 'arm64' ">true</IncludeWpfAndWinForms>
       <IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
     </PropertyGroup>
 
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 97293638a..11c64c7f7 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
 using Microsoft.DotNet.TestFramework;
@@ -83,51 +82,6 @@ namespace EndToEnd.Tests
                 .Should().Pass().And.HaveStdOutContaining("Hello World!");
         }
 
-        [WindowsOnlyFact]
-        public void ItCanPublishArm64Winforms()
-        {
-            DirectoryInfo directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            string newArgs = "winforms --no-restore";
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(newArgs)
-                .Should().Pass();
-
-            string publishArgs="-r win-arm64";
-            new PublishCommand()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(publishArgs)
-                .Should().Pass();
-            
-            var selfContainedPublishDir = new DirectoryInfo(projectDirectory)
-                .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault()
-                .Sub("win-arm64").Sub("publish");
-
-            selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly);
-            selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly);
-        }
-        
-        [WindowsOnlyFact]
-        public void ItCantPublishArm64Wpf()
-        {
-            DirectoryInfo directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
-
-            string newArgs = "wpf --no-restore";
-            new NewCommandShim()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(newArgs)
-                .Should().Pass();
-
-            string publishArgs="-r win-arm64";
-            new PublishCommand()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute(publishArgs)
-                .Should().Fail();
-        }
-
         [Theory]
         [InlineData("console")]
         [InlineData("classlib")]