From 1a55d1387cb4a3b18f2576adddd655930bde32ea Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 20 Jan 2021 22:40:12 -0800
Subject: [PATCH 1/4] WPF support for ARM64: WPF ARM64 public repo Packaging
 updates

Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
---
 .../Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj | 10 +++++-----
 .../Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj     |  4 ++--
 .../Microsoft.DotNet.Wpf.GitHub.csproj                 |  2 +-
 ...soft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj |  8 ++++----
 ...Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
index 61dcb4688a6..4055fcfd3db 100644
--- a/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Arcade.Wpf.Sdk/Microsoft.DotNet.Arcade.Wpf.Sdk.ArchNeutral.csproj
@@ -2,20 +2,20 @@
   <PropertyGroup>
     <ProjectGuid>{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3}</ProjectGuid>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>AnyCPU;x64;arm64</Platforms>
     <!-- We ignore this warning because we want to pack powershell scripts that won't be executed as part of installing this package. -->
     <NoWarn>$(NoWarn);NU5111</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- 
+    <!--
       PlatformIndependentPackage = true means that this package does
       not require the automatic generation of a runtime.json file using
       the Bait & Switch technique to reference RID specific packages
     -->
     <PlatformIndependentPackage>true</PlatformIndependentPackage>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>
@@ -32,13 +32,13 @@
     <PackagingContent Include="$(RepoRoot)eng\WpfArcadeSdk\tools\CodeAnalysis\*" SubFolder="root\tools\CodeAnalysis" />
   </ItemGroup>
 
-  <!-- 
+  <!--
     Pack $(WpfSharedDir) and $(WpfCommonDir) sources for use by dotnet-wpf-int
   -->
   <ItemGroup>
     <PackagingContent Include="$(WpfSharedDir)**\*" SubFolder="root\Src\Shared\%(RecursiveDir)" />
     <PackagingContent Include="$(WpfCommonDir)**\*" SubFolder="root\Src\Common\%(RecursiveDir)" />
-    
+
     <PackagingContent Include="$(WpfGraphicsDir)core\**\*.h*" SubFolder="root\Src\WpfGfx\core\%(RecursiveDir)" />
     <PackagingContent Include="$(WpfGraphicsDir)core\**\*.inl" SubFolder="root\Src\WpfGfx\core\%(RecursiveDir)" />
     <PackagingContent Include="$(WpfGraphicsDir)common\**\*.h*" SubFolder="root\Src\WpfGfx\common\%(RecursiveDir)" />
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
index 5af1f2df7f5..09fe6a9509c 100644
--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj
@@ -2,9 +2,9 @@
   <PropertyGroup>
     <ProjectGuid>9a7e395b-e859-40e2-809d-efb72cf3a2ee</ProjectGuid>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>AnyCPU;x64;arm64</Platforms>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>
diff --git a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
index 05bec6eafd6..b141ceb049c 100644
--- a/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
+++ b/packaging/Microsoft.DotNet.Wpf.GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>c847934a-828c-4ebb-a004-b0e97c8313f4</ProjectGuid>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>AnyCPU;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
index 743b67c04c6..66db36f5ea5 100644
--- a/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
+++ b/packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
@@ -2,18 +2,18 @@
   <PropertyGroup>
     <ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>AnyCPU;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- 
+    <!--
       PlatformIndependentPackage = true means that this package does
       not require the automatic generation of a runtime.json file using
       the Bait & Switch technique to reference RID specific packages
     -->
     <PlatformIndependentPackage>true</PlatformIndependentPackage>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />   
+    <PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
     <PackagingContent Include="content\**\*" SubFolder="root\%(RecursiveDir)" />
   </ItemGroup>
 </Project>
diff --git a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
index 12a2c2898c1..ea204d019b2 100644
--- a/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
+++ b/packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
@@ -2,18 +2,18 @@
   <PropertyGroup>
     <ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
+    <Platforms>AnyCPU;x64;arm64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- 
+    <!--
       PlatformIndependentPackage = true means that this package does
       not require the automatic generation of a runtime.json file using
       the Bait & Switch technique to reference RID specific packages
     -->
     <PlatformIndependentPackage>true</PlatformIndependentPackage>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>

From 3202993f489bff5ec82b9e56e7d612603b6606b7 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 20 Jan 2021 23:03:34 -0800
Subject: [PATCH 2/4] Enable arm64 builds on public WPF repo

Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
---
 Directory.Build.props |  1 +
 NuGet.config          |  1 -
 eng/copy-wpf.ps1      | 19 +++++++++----------
 eng/helixpublish.proj |  8 ++++----
 eng/pipeline.yml      |  9 +++++++++
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 5b7c2447a9c..fd10c974673 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <RepositoryName>wpf</RepositoryName>
+    <WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
   </PropertyGroup>
   <!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
   <PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">
diff --git a/NuGet.config b/NuGet.config
index 5af5f5b2ea0..a1109d88ffa 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,7 +9,6 @@
     <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
index 11d01eb6fca..cf1c40d7d50 100644
--- a/eng/copy-wpf.ps1
+++ b/eng/copy-wpf.ps1
@@ -37,10 +37,10 @@ Write-Host "Target architecture - configuration: " $arch $Config
 function CopyBinariesToLocation($location)
 {
     $locallyBuiltBinaryLocationBase = Join-Path $RepoRoot "artifacts\packaging"
-    
+
     Write-Host "Copy native binaries..."
-    CopyNativeBinariesToLocation $location $locallyBuiltBinaryLocationBase 
-    
+    CopyNativeBinariesToLocation $location $locallyBuiltBinaryLocationBase
+
     Write-Host "Copy managed binaries..."
     CopyManagedBinariesToLocation $location  $locallyBuiltBinaryLocationBase
 }
@@ -58,7 +58,7 @@ function CopyNativeBinariesToLocation($location, $localBinLocation)
 }
 function CopyManagedBinariesToLocation($location, $localBinLocation)
 {
-    # Layout of where the managed binaries looks something like this: 
+    # Layout of where the managed binaries looks something like this:
     # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\net5.0
     # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net5.0
 
@@ -121,11 +121,11 @@ elseif($testhost)
     }
     else
     {
-        $location = Resolve-Path (Join-Path $destination "shared\Microsoft.WindowsDesktop.App\$version")        
+        $location = Resolve-Path (Join-Path $destination "shared\Microsoft.WindowsDesktop.App\$version")
     }
 
     Write-Host "Copying binaries to dotnet installation at $location"
-    
+
     if(![System.IO.Directory]::Exists($location))
     {
         Write-Host "Location unavailable: " $location -ForegroundColor Red
@@ -146,7 +146,7 @@ elseif($testhost)
         Write-Host "** Setting $dotnetVariableToSet to $destination **"
         Set-Item -Path $dotnetVariableToSet -Value $destination
 
-        Write-Host "** Setting env:DOTNET_MULTILEVEL_LOOKUP to 0 **"    
+        Write-Host "** Setting env:DOTNET_MULTILEVEL_LOOKUP to 0 **"
         $env:DOTNET_MULTILEVEL_LOOKUP=0
     }
 }
@@ -159,9 +159,8 @@ else
         Write-Host "App publishing directory unavailable: " $location -ForegroundColor Red
         return
     }
-    
+
     Write-Host "App publishing directory: " $location
     Write-Host "Copying binaries to app publishing directory..."
-    CopyBinariesToLocation $location  
+    CopyBinariesToLocation $location
 }
-
diff --git a/eng/helixpublish.proj b/eng/helixpublish.proj
index 9fc63bbb47a..0b5ec2397ab 100644
--- a/eng/helixpublish.proj
+++ b/eng/helixpublish.proj
@@ -7,7 +7,7 @@
     <!--
     Ideally we could use $(MicrosoftNetCoreAppVersion) for DotNetCliVersion and 'runtime' for DotNetCliPackageType.
     However, we need a full install on the Helix machine that includes the WindowsDesktop SDK since QV is dependent on it.
-    Once we move it into the open we can put these back to how they should be. See https://github.com/dotnet/wpf/issues/816 
+    Once we move it into the open we can put these back to how they should be. See https://github.com/dotnet/wpf/issues/816
     for any more details.
 
     Right now, we set it to match global.json.tools.dotnet set by pre-build.ps1. Both of these can be removed once the above
@@ -29,11 +29,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" /> 
+    <HelixCorrelationPayload Include="$(ArtifactsDir)\test\$(Configuration)\$(Platform)" />
     <HelixWorkItem Include="@(DRT)">
       <Timeout>00:20:00</Timeout>
       <Command>call %HELIX_CORRELATION_PAYLOAD%\runtests.cmd /Area=%(Area) -ci</Command>
     </HelixWorkItem>
-   
+
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 64e9a08ba16..2f14e5f6b7f 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -134,6 +134,15 @@ jobs:
           Build_Release_x64:
             _BuildConfig: Release
             _Platform: x64
+          ${{ if eq(parameters.runAsPublic, 'true') }}:
+            Build_Debug_arm64:
+              _BuildConfig: Debug
+              # override some variables for debug
+              # _SignType has to be real for package publishing to succeed - do not override to test.
+              _Platform: arm64
+          Build_Release_arm64:
+            _BuildConfig: Release
+            _Platform: arm64
       steps:
       - checkout: self
         clean: true

From a489064f833e37c29c6ef077e69090dcf85a7f2a Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Thu, 21 Jan 2021 13:25:46 -0800
Subject: [PATCH 3/4] Fix NuGet.config feeds

Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index a1109d88ffa..5af5f5b2ea0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,7 @@
     <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

From fc62413352ef9b066a6712c18339c7850cadb091 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Thu, 21 Jan 2021 20:40:23 -0800
Subject: [PATCH 4/4] Update APICompat targets to work with ARM64

Co-authored-by: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Co-authored-by: Marcpems <marcpe@microsoft.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juhoyosa@microsoft.com>
Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
---
 eng/WpfArcadeSdk/tools/ApiCompat.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/ApiCompat.targets b/eng/WpfArcadeSdk/tools/ApiCompat.targets
index c7143d1ab21..af60363d07f 100644
--- a/eng/WpfArcadeSdk/tools/ApiCompat.targets
+++ b/eng/WpfArcadeSdk/tools/ApiCompat.targets
@@ -61,7 +61,7 @@
       <!-- Work backwards to find the output for a hand-crafted ref assembly. -->
       <ResolvedImplementationAssembly Remove="@(ResolvedImplementationAssembly)" />
       <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Platform)\$(Configuration)\**\$(AssemblyName).dll"
-                                     Condition="'$(WpfRuntimeIdentifier)'=='win-x64'"/>
+                                     Condition="'$(WpfRuntimeIdentifier)'=='win-x64' or '$(WpfRuntimeIdentifier)'=='win-arm64'"/>
       <ResolvedImplementationAssembly Include="$(BaseOutputPath)..\$(AssemblyName)-ref\$(Configuration)\**\$(AssemblyName).dll"
                                       Condition="'$(WpfRuntimeIdentifier)'=='win-x86'"/>
       <!-- If building a single project, Platform is used in win-x86.  Below handles this case. -->