From 882475d33d0f0f9bb14f2bee65bb24c63e18e666 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:35:03 -0800
Subject: [PATCH 1/3] Update WPF Arcade SDK to support 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/Sdk/Sdk.props                |   3 +-
 .../tools/AddDrtsToPayload.targets            |   2 +-
 .../tools/InjectModuleInitializer.targets     |   5 +
 eng/WpfArcadeSdk/tools/Packaging.props        |   4 +-
 eng/WpfArcadeSdk/tools/Packaging.targets      | 238 +++++++++---------
 eng/WpfArcadeSdk/tools/Redist.targets         |   2 +-
 eng/WpfArcadeSdk/tools/SdkReferences.targets  |  49 ++--
 eng/WpfArcadeSdk/tools/Wpf.Cpp.props          |   5 +-
 eng/WpfArcadeSdk/tools/Wpf.Cpp.targets        | 146 +++++------
 9 files changed, 241 insertions(+), 213 deletions(-)

diff --git a/eng/WpfArcadeSdk/Sdk/Sdk.props b/eng/WpfArcadeSdk/Sdk/Sdk.props
index a4fa29e585b..e500f12e20f 100644
--- a/eng/WpfArcadeSdk/Sdk/Sdk.props
+++ b/eng/WpfArcadeSdk/Sdk/Sdk.props
@@ -22,8 +22,9 @@
     Properly calculates the RuntimeIdentifier based on the Platform type. We don't want to affect the build by actually setting RuntimeIdentifier.
     Those that are interested in setting the RuntimeIdentifier or having a property that mirrors it can use this one here.
     -->
-    <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</WpfRuntimeIdentifier>
+    <WpfRuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('x64'))">win-$(Platform)</WpfRuntimeIdentifier>
     <WpfRuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</WpfRuntimeIdentifier>
+    <WpfRuntimeIdentifier Condition="'$(Platform)'=='ARM64'">win-arm64</WpfRuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>
diff --git a/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
index 60c1044a63f..3ddd3d66669 100644
--- a/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
+++ b/eng/WpfArcadeSdk/tools/AddDrtsToPayload.targets
@@ -8,7 +8,7 @@
   -->
   <PropertyGroup>
     <!-- AnyCPU/x86 builds don't produce an output folder in artifacts. This only exists for x64 builds. -->
-    <PlatformFolder Condition="'$(Platform)'=='x64'">x64</PlatformFolder>
+    <PlatformFolder Condition="'$(Platform)'!='AnyCPU' AND '$(Platform)'!='x86'">$(Platform)</PlatformFolder>
 
     <!-- For the test payload, we default to x86 for AnyCPU platform. --> 
     <PayloadBaseLocation>$(RepoRoot)artifacts\test\$(Configuration)\$(Platform)\</PayloadBaseLocation>
diff --git a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
index 3cd0b5ecc4c..c80e2749bd0 100644
--- a/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
+++ b/eng/WpfArcadeSdk/tools/InjectModuleInitializer.targets
@@ -22,7 +22,12 @@
         <ILDAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
         <ILAsmPath>$(Pkgruntime_win-x64_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
         <CoreCLRPath>$(Pkgruntime_win-x64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
+      </PropertyGroup>
 
+      <PropertyGroup Condition="'$(WpfRuntimeIdentifier)'=='win-arm64'">
+        <ILDAsmPath>$(Pkgruntime_win-arm64_Microsoft_NETCore_ILDAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILDAsmPath>
+        <ILAsmPath>$(Pkgruntime_win-arm64_Microsoft_NETCore_ILAsm)\runtimes\$(WpfRuntimeIdentifier)\native\</ILAsmPath>
+        <CoreCLRPath>$(Pkgruntime_win-arm64_Microsoft_NETCore_Runtime_CoreCLR)\runtimes\$(WpfRuntimeIdentifier)\native\</CoreCLRPath>
       </PropertyGroup>
 
       <PropertyGroup>
diff --git a/eng/WpfArcadeSdk/tools/Packaging.props b/eng/WpfArcadeSdk/tools/Packaging.props
index 329eda0c4c5..ad1383c18db 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.props
+++ b/eng/WpfArcadeSdk/tools/Packaging.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and $(Platform.EndsWith('64'))">$(ArtifactsDir)packaging\$(Configuration)\$(Platform)\</ArtifactsPackagingDir>
-    <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and !$(Platform.EndsWith('64'))">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>
+    <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and $(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\$(Platform)\</ArtifactsPackagingDir>
+    <ArtifactsPackagingDir Condition="'$(ArtifactsPackagingDir)'=='' and !$(Platform.EndsWith('x64'))">$(ArtifactsDir)packaging\$(Configuration)\</ArtifactsPackagingDir>
 
     <!-- We like using RID prefix when generating nuget package names -->
     <PackageRuntimeIdentifierPrefix Condition="'$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32'">runtime.win-$(Platform)</PackageRuntimeIdentifierPrefix>
diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
index e1ca54cb289..e52e94640f8 100644
--- a/eng/WpfArcadeSdk/tools/Packaging.targets
+++ b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -5,9 +5,9 @@
   <PropertyGroup>
     <!-- Projects can override the name of the 'lib' folder to something else - for e.g., 'tools'-->
     <LibFolder Condition="'$(LibFolder)'==''">lib</LibFolder>
-    
-    <!-- 
-      Architecture-specific assemblies go under runtimes\<rid>\native\ 
+
+    <!--
+      Architecture-specific assemblies go under runtimes\<rid>\native\
       https://docs.microsoft.com/en-us/nuget/create-packages/supporting-multiple-target-frameworks
     -->
   </PropertyGroup>
@@ -19,45 +19,45 @@
     <DevelopmentDependency Condition="'$(MsBuildSdkPackage)'=='true'">true</DevelopmentDependency>
     <PackageType Condition="'$(MsBuildSdkPackage)'=='true'">MSBuildSdk</PackageType>
   </PropertyGroup>
-  
-  <!-- 
-   Target: PreparePackageAssets                                                                   
-    Copies packages assets for a project to artifacts\packaging\$(Configuration)\$(PackageName)\  
-    and prepares it for packaging then Target=Pack is executed                                    
-                                                                                                  
-   Important properties and items:                                                                
-   $(PackageName):  Name of the package                                                           
-                    This target will only run for projects that specify $(PackageName)            
-                                                                                                  
-   @(PackagingContent): Additional content specified by projects                                  
-                        Place under content\ in the package by default                            
-                        Placement in package can be altered by specifying a SubFolder attribute   
-                        <PackagingContent Include="foo.xml" SubFolder="xmls" />  would result in  
-                          foo.xml being packaged under content\xmls                               
-                          
+
+  <!--
+   Target: PreparePackageAssets
+    Copies packages assets for a project to artifacts\packaging\$(Configuration)\$(PackageName)\
+    and prepares it for packaging then Target=Pack is executed
+
+   Important properties and items:
+   $(PackageName):  Name of the package
+                    This target will only run for projects that specify $(PackageName)
+
+   @(PackagingContent): Additional content specified by projects
+                        Place under content\ in the package by default
+                        Placement in package can be altered by specifying a SubFolder attribute
+                        <PackagingContent Include="foo.xml" SubFolder="xmls" />  would result in
+                          foo.xml being packaged under content\xmls
+
                           'root' is a special prefix-value for the attribute SubFolder, and it will result
                           in the placement of the file in the root of the package.
-  -                       <PackagingContent Include="THIRD-PARTY-NOTICES.TXT"  SubFolder="root"/>   
-                          will result in "THIRD-PARTY-NOTICES.TXT" to be placed at the root       
+  -                       <PackagingContent Include="THIRD-PARTY-NOTICES.TXT"  SubFolder="root"/>
+                          will result in "THIRD-PARTY-NOTICES.TXT" to be placed at the root
                           of the package.
                           <PackagingContent Include"sdk\*.props" Subfolder="root\sdk" /> will result in
                           relevant *.props files to be placed under the 'sdk' sub-folder in the package.
-                          
-   @(PackagingAssemblyContent) - 
-                        A way to specify which files under $(OutDir) should be packaged. 
+
+   @(PackagingAssemblyContent) -
+                        A way to specify which files under $(OutDir) should be packaged.
                         If this list is set, then we will only carry assemblies specified in this set
                         an no others.
-   $(ExcludeRefAssemblies) - true/false to include/exclude ref assemblies from packaging. 
+   $(ExcludeRefAssemblies) - true/false to include/exclude ref assemblies from packaging.
                              default is true.
    $(ExcludePdbs)  - true/false to include/exclude PDB's from packaging
                      default is true
-$(PreparePackageAssetsDependsOn):                                                              
-                      List of targets that PreparePackageAssets would depend on                   
-                      This is an extensibility point                                              
-                                                                                                  
-   Packaging projects ($(IsPackagingProject) == true) also have $(PackageName) - do not attempt   
-   to prepare DLL, EXE, PDB etc. assets for those projects. Only prepare content (PackageAsset)   
-   assets for packaging projects                                                                  
+$(PreparePackageAssetsDependsOn):
+                      List of targets that PreparePackageAssets would depend on
+                      This is an extensibility point
+
+   Packaging projects ($(IsPackagingProject) == true) also have $(PackageName) - do not attempt
+   to prepare DLL, EXE, PDB etc. assets for those projects. Only prepare content (PackageAsset)
+   assets for packaging projects
    -->
   <Target Name="PreparePackageAssets"
           AfterTargets="Build"
@@ -71,7 +71,7 @@ $(PreparePackageAssetsDependsOn):
     <MakeDir Condition="!Exists('%(PackageAsset.RelativePath')" Directories="@(PackageAsset->'%(RelativePath)')" />
     <Copy Condition="(@(PackageAsset->Count()) &gt; 0)"
           SourceFiles="@(PackageAsset)"
-          DestinationFolder="%(PackageAsset.RelativePath)" 
+          DestinationFolder="%(PackageAsset.RelativePath)"
           SkipUnchangedFiles="true"/>
   </Target>
 
@@ -86,6 +86,7 @@ $(PreparePackageAssetsDependsOn):
     <PropertyGroup Condition="'$(MSBuildProjectExtension)'=='.vcxproj' and '$(DestinationSubFolder)'==''">
       <DestinationSubFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</DestinationSubFolder>
       <DestinationSubFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</DestinationSubFolder>
+      <DestinationSubFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</DestinationSubFolder>
     </PropertyGroup>
 
     <!--
@@ -97,15 +98,15 @@ $(PreparePackageAssetsDependsOn):
         Include all content files under content\
 
     @(PackageAsset) evaluation should be done after $(PreparePackageAssetsDependsOn) targets have completed running. To ensure
-    delayed evaluation, use CreateItem tasks. 
-    
-    The CreateItem tasks below is equivalent to this: 
-    
+    delayed evaluation, use CreateItem tasks.
+
+    The CreateItem tasks below is equivalent to this:
+
     <ItemGroup Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true'">
       <PackageAsset Include="$(OutDir)*.dll" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
       <PackageAsset Include="$(OutDir)*.exe" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
       <PackageAsset Include="$(OutDir)*.pdb" RelativePath="$(ArtifactsPackagingDir)$(PackageName)\$(DestinationSubFolder)"/>
-      
+
       <PackageAsset Include="$(ReferenceAssemblyDir)*.dll" RelativePath="$(ArtifactsPackagingDir)\$(DestinationSubFolder)"/>
       <PackageAsset Include="$(ReferenceAssemblyDir)*.xml" RelativePath="$(ArtifactsPackagingDir)\$(DestinationSubFolder)"/>
     </ItemGroup>
@@ -118,7 +119,7 @@ $(PreparePackageAssetsDependsOn):
     </CreateItem>
 
     <!--
-      Normally, .lib files are not included in packaging - projects have to opt in by setting   
+      Normally, .lib files are not included in packaging - projects have to opt in by setting
         <PropertyGroup>
           <IncludeLibFilesInPackaging>true<IncludeLibFilesInPackaging>
         </PropertyGroup>
@@ -129,7 +130,7 @@ $(PreparePackageAssetsDependsOn):
             Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'=='' and '$(IncludeLibFilesInPackaging)' == 'true'">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
-    
+
     <CreateItem Include="$(OutDir)*.exe"
                 Exclude="@(FileNamesExcludedFromPackaging -> '$(OutDir)%(Filename)%(Extension)' )"
                 AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
@@ -143,26 +144,26 @@ $(PreparePackageAssetsDependsOn):
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
 
-    <!-- 
-      Static C++ libraries do not copy their PDB's to $(OutDir) -get it directly from $(IntermediateOutputPath) 
-      Also, normally projects generating .lib files are not included in packaging. Such projects must opt in like this: 
+    <!--
+      Static C++ libraries do not copy their PDB's to $(OutDir) -get it directly from $(IntermediateOutputPath)
+      Also, normally projects generating .lib files are not included in packaging. Such projects must opt in like this:
         <PropertyGroup>
           <IncludeLibFilesInPackaging>true<IncludeLibFilesInPackaging>
         </PropertyGroup>
     -->
     <CreateItem Include="$(IntermediateOutputPath)*.pdb"
                 AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
-                Condition="'$(ConfigurationType)'=='StaticLibrary' and '$(Language)'=='C++' and 
+                Condition="'$(ConfigurationType)'=='StaticLibrary' and '$(Language)'=='C++' and
                           '$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludePdbs)'!='true' and '@(PackagingAssemblyContent)'=='' and '$(IncludeLibFilesInPackaging)' == 'true'">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
-    
+
     <CreateItem Include="$(ReferenceAssemblyDir)*.dll"
                 AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\$(TargetFramework)"
                 Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '$(ExcludeRefAssemblies)'!='true'">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
     </CreateItem>
-    
+
     <!-- Intellisense XML's bundled alongwith ref-pack content -->
     <CreateItem Include="$(ReferenceAssemblyDir)*.xml"
             AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\$(TargetFramework)"
@@ -174,13 +175,13 @@ $(PreparePackageAssetsDependsOn):
             AdditionalMetadata="RelativePath=$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationSubFolder)"
             Condition="'$(DestinationSubFolder)'!='' and '$(IsPackagingProject)'!='true' and '@(PackagingAssemblyContent)'!=''">
       <Output ItemName="PackageAsset" TaskParameter="Include"/>
-    </CreateItem>   
-    <!-- 
+    </CreateItem>
+    <!--
         $(XlfLanguages) is defined by XliffTasks.
-        The conversion of .resx files to .xlf files, and the building of resource assemblies (.resources.dll) and 
-        culture-specific satellite assemblies (<culture>\*.resources.dll) are done immediately after Build, as part of 
-        CreateSatelliteAssemblies. 
-        
+        The conversion of .resx files to .xlf files, and the building of resource assemblies (.resources.dll) and
+        culture-specific satellite assemblies (<culture>\*.resources.dll) are done immediately after Build, as part of
+        CreateSatelliteAssemblies.
+
         Include satellite assemblies into the package if $(XlfLanguages) is defined. They are included under a relative path
         that is the same as their respective culture identifier (for e.g., 'fr', 'zh-Hans' etc.)
     -->
@@ -203,26 +204,26 @@ $(PreparePackageAssetsDependsOn):
                     Include="%(PackagingContent.Identity)"
                     RelativePath="$(ArtifactsPackagingDir)$(NormalizedPackageName)\content"/>
 
-      <!-- 
-          %(PackagingContent.SubFolder) StartsWith 'root' 
+      <!--
+          %(PackagingContent.SubFolder) StartsWith 'root'
             Package content under sub-folder %(PackagingContent.SubFolder).TrimLeft('root')
-            
+
             Keep track of such sub-folders that exist immediately under root in a special ItemGroup - PackagingRootFolderSubFolders
             PackagingRootFolderSubFolders will be used later in CreateContentFolder
-            
+
             Implementation Note:
               SubFolder string looks like this: "root\subfolder1\subfolder2"
                 %(SubFolder).SubString(4) ~= "\subfolder1\subfolder2"
                 %(SubFolder).SubString(5) ~= "subfolder1\subfolder2"
-              
-              When concatenating next to $(ArtifactsPackagingDir)$(PackageName), 
+
+              When concatenating next to $(ArtifactsPackagingDir)$(PackageName),
                 - use %(SubFolder).SubString(4)
                 - do not insert a directory separator character (\) between them
                 - this has the benefit of working seamlessly when %(SubFolder) == "root"
-              
-              When SubFolder name must be extracted, 
+
+              When SubFolder name must be extracted,
                 - use %(SubFolder).SubString(5)
-                - In GenerateNuspec target, we have special-case logic to deal with files directly under the root folder, 
+                - In GenerateNuspec target, we have special-case logic to deal with files directly under the root folder,
                     so we only need to keep track of sub-folder names.
       -->
       <PackageAsset Condition="$([System.String]::Copy(&quot;%(PackagingContent.SubFolder)&quot;).StartsWith(&quot;root&quot;))"
@@ -239,37 +240,37 @@ $(PreparePackageAssetsDependsOn):
   <!-- Target:  CreateContentFolder -->
   <!--            Dynamically populates  @(Content) for packaging  -->
    <!--
-    This target is only run for projects which specify $(IsPackable) = true               
-      By convention, NO WPF projects will specify $(IsPackable) = true                    
-      WPF projects will opt into PreparePackageAssets target by specifying $(PackageName) 
-      Special packaging-only projects will be used to orchestrate the actual packaging    
-                                                                                          
-      Also, if an "ArchNeutral" package sets $(IncludeAssembliesInArchNeutralPackage)=true, 
-      then it will include 'lib\**\*' files in it anyway. 
+    This target is only run for projects which specify $(IsPackable) = true
+      By convention, NO WPF projects will specify $(IsPackable) = true
+      WPF projects will opt into PreparePackageAssets target by specifying $(PackageName)
+      Special packaging-only projects will be used to orchestrate the actual packaging
+
+      Also, if an "ArchNeutral" package sets $(IncludeAssembliesInArchNeutralPackage)=true,
+      then it will include 'lib\**\*' files in it anyway.
       This can be combined with $(PlatformIndependentPackage)=true (which controls the generation
-      of runtime.json file) to generate an AnyCPU Sdk package containing ref + lib assemblies alongwith 
+      of runtime.json file) to generate an AnyCPU Sdk package containing ref + lib assemblies alongwith
       all the props and targets.
-                                                                                          
-   The following properties are of interest to this target                                                                    
-   $(PackageName):  The name of the package                                                                                   
-   $(PackageVersion): The package version                                                                                     
-   $(Authors): Authors                                                                                                        
-   $(PackageDescription): Description                                                                                         
-   $(TargetCulture): culture/language of the build. If not specified (or '*'), then $(NeutralLanguage) will be used instead   
-   $(RepositoryUrl): Repo Url                                                                                                 
-   $(PackageRequireLicenseAcceptance): true/false indicating whether license file acceptance is required                       
+
+   The following properties are of interest to this target
+   $(PackageName):  The name of the package
+   $(PackageVersion): The package version
+   $(Authors): Authors
+   $(PackageDescription): Description
+   $(TargetCulture): culture/language of the build. If not specified (or '*'), then $(NeutralLanguage) will be used instead
+   $(RepositoryUrl): Repo Url
+   $(PackageRequireLicenseAcceptance): true/false indicating whether license file acceptance is required
    $(MsBuildSdkPackage): true/false indicating whether the nupkg is an MSBuild SDK package. When set to true, the nuspec produces
                          additional content indicating that the package is an Sdk.
-                                                                                                                              
-   We expect to find $(DefaultPackageLicenseFile) (typically defined as 'LICENSE.TXT' in nupkg\Directory.Build.props) at the  
-   root of the packaging content folder . If a $(DefaultPackageLicenseFile) file is not found, we will fallback to            
-   $(PackageLicenseExpression) license (typically defined as 'MIT')                     
-                                                                                                                              
-   When building a nupkg for a bait-and-switch package ($(CreateArchNeutralPackage)==true), the following changes are     
-    made:                                                                                                                     
-      Package name : A RID is not prefixed onto the package name                                                              
+
+   We expect to find $(DefaultPackageLicenseFile) (typically defined as 'LICENSE.TXT' in nupkg\Directory.Build.props) at the
+   root of the packaging content folder . If a $(DefaultPackageLicenseFile) file is not found, we will fallback to
+   $(PackageLicenseExpression) license (typically defined as 'MIT')
+
+   When building a nupkg for a bait-and-switch package ($(CreateArchNeutralPackage)==true), the following changes are
+    made:
+      Package name : A RID is not prefixed onto the package name
       Files      - : Only ref\ and root-level content files are included
-      
+
   Microsoft.DotNet.Arcade.Sdk\tools\WorkArounds.targets - InitializeStandardNuspecProperties populates $(_CommonMetadataElements)
   with the following metadata information:
     id
@@ -283,7 +284,7 @@ $(PreparePackageAssetsDependsOn):
     developmentDependency
     serviceable
     repository type= url= commit=
-  In effect, it provides us with all the relevant package metadata we need. We can simply reuse that 
+  In effect, it provides us with all the relevant package metadata we need. We can simply reuse that
   information here within <metadata>
   -->
   <Target Condition="'$(PackageName)'!='' and '$(IsPackable)'=='true'"
@@ -301,13 +302,19 @@ $(PreparePackageAssetsDependsOn):
       <RootFolderContents Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\*.*"/>
     </ItemGroup>
 
+    <PropertyGroup>
+      <DestinationRuntimeSubFolder Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='x86' or '$(Platform)'=='Win32'">runtimes\win-x86\native\</DestinationRuntimeSubFolder>
+      <DestinationRuntimeSubFolder Condition="'$(Platform)'=='x64'">runtimes\win-x64\native\</DestinationRuntimeSubFolder>
+      <DestinationRuntimeSubFolder Condition="'$(Platform)'=='arm64'">runtimes\win-arm64\native\</DestinationRuntimeSubFolder>
+    </PropertyGroup>
+
     <ItemGroup>
       <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\**\*.dll"
                Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\')" >
         <Pack>true</Pack>
         <PackagePath>$(LibFolder)</PackagePath>
       </Content>
-      
+
       <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\**\*.exe"
          Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(LibFolder)\')" >
         <Pack>true</Pack>
@@ -320,28 +327,28 @@ $(PreparePackageAssetsDependsOn):
         <PackagePath>$(LibFolder)</PackagePath>
       </Content>
 
-      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.dll"
-         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\*.dll"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\')" >
         <Pack>true</Pack>
-        <PackagePath>runtimes</PackagePath>
+        <PackagePath>$(DestinationRuntimeSubFolder)</PackagePath>
       </Content>
 
-      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.lib"
-         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\*.lib"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\')" >
         <Pack>true</Pack>
-        <PackagePath>runtimes</PackagePath>
+        <PackagePath>$(DestinationRuntimeSubFolder)</PackagePath>
       </Content>
 
-      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.exe"
-         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\*.exe"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\')" >
         <Pack>true</Pack>
-        <PackagePath>runtimes</PackagePath>
+        <PackagePath>$(DestinationRuntimeSubFolder)</PackagePath>
       </Content>
 
-      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\**\*.pdb"
-         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\runtimes\')" >
+      <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\*.pdb"
+         Condition="('$(CreateArchNeutralPackage)'!='true' Or '$(IncludeAssembliesInArchNeutralPackage)'== 'true') and Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\$(DestinationRuntimeSubFolder)\')" >
         <Pack>true</Pack>
-        <PackagePath>runtimes</PackagePath>
+        <PackagePath>$(DestinationRuntimeSubFolder)</PackagePath>
       </Content>
 
       <Content Include="$(ArtifactsPackagingDir)$(NormalizedPackageName)\ref\**\*.dll"
@@ -381,12 +388,12 @@ $(PreparePackageAssetsDependsOn):
         <PackagePath>%(PackagingRootFolderSubFolders.Identity)</PackagePath>
       </Content>
     </ItemGroup>
-    
+
   </Target>
-  
-    <!-- 
+
+    <!--
     We can't reliably insert CreatecontentFolder
-    at the head of GenerateNuspecDependsOn during 
+    at the head of GenerateNuspecDependsOn during
     static imports of props/targets, so we do it
     dynamically from within a target
   -->
@@ -400,15 +407,15 @@ $(PreparePackageAssetsDependsOn):
   </Target>
 
   <!-- Create version.txt containing latest commit ID -->
-  <Target Name="GenerateVersionFileWithRepositoryCommit"  
-          Condition="'$(IsPackable)'=='true' and '$(CreateArchNeutralPackage)'=='true' and !Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\version.txt')" 
-          BeforeTargets="CreateContentFolder" 
+  <Target Name="GenerateVersionFileWithRepositoryCommit"
+          Condition="'$(IsPackable)'=='true' and '$(CreateArchNeutralPackage)'=='true' and !Exists('$(ArtifactsPackagingDir)$(NormalizedPackageName)\version.txt')"
+          BeforeTargets="CreateContentFolder"
           Outputs="$(ArtifactsPackagingDir)$(NormalizedPackageName)\version.txt">
-    <!-- 
-      Workaround 
-        Ensure that SourceRevisionId is obtained if it has not already been read in 
+    <!--
+      Workaround
+        Ensure that SourceRevisionId is obtained if it has not already been read in
         Reuse tasks from Microsoft.Build.Tasks.Git.targets
-    --> 
+    -->
     <Microsoft.Build.Tasks.Git.LocateRepository Path="$(MSBuildProjectDirectory)" Condition="'$(SourceRevisionId)' == ''" >
       <Output TaskParameter="RevisionId" PropertyName="SourceRevisionId" />
     </Microsoft.Build.Tasks.Git.LocateRepository>
@@ -447,6 +454,11 @@ $(PreparePackageAssetsDependsOn):
       "$(NormalizedPackageName)": {
         "runtime.win-x86.$(PackageName)": "$(PackageVersion)"
       }
+    },
+    "win-arm64": {
+      "$(NormalizedPackageName)": {
+        "runtime.win-arm64.$(PackageName)": "$(PackageVersion)"
+      }
     }
   }
 }
@@ -468,5 +480,5 @@ $(PreparePackageAssetsDependsOn):
     <Delete Condition="Exists('$(RuntimeJsonFile)')" Files="$(RuntimeJsonFile)" />
     <WriteLinesToFile Lines="@(RuntimeJson)" File="$(RuntimeJsonFile)"/>
   </Target>
-          
+
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/Redist.targets b/eng/WpfArcadeSdk/tools/Redist.targets
index 4a6424ad8a8..a906ff97e27 100644
--- a/eng/WpfArcadeSdk/tools/Redist.targets
+++ b/eng/WpfArcadeSdk/tools/Redist.targets
@@ -25,4 +25,4 @@
     <Copy SourceFiles="@(AdditionalRedistFile)"
           DestinationFolder="%(AdditionalRedistFile.Destination)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/WpfArcadeSdk/tools/SdkReferences.targets b/eng/WpfArcadeSdk/tools/SdkReferences.targets
index 7df00da9fde..fbc3b63f8e6 100644
--- a/eng/WpfArcadeSdk/tools/SdkReferences.targets
+++ b/eng/WpfArcadeSdk/tools/SdkReferences.targets
@@ -4,13 +4,13 @@
                       Version="$(MicrosoftPrivateWinformsVersion)"
                       ExcludeAssets="All"
                       GeneratePathProperty="True"
-                      Condition="'$(MSBuildProjectExtension)'!='.vcxproj' 
-                              And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' 
-                              And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') 
+                      Condition="'$(MSBuildProjectExtension)'!='.vcxproj'
+                              And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+                              And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
                               And '$(NoAutoMicrosoftPrivateWinformsReference)'!='true'"/>
 
     <!--
-      When @(NetCoreReference) is non-empty, exclude all assets (ExcludeAssets = All) and re-add them in 
+      When @(NetCoreReference) is non-empty, exclude all assets (ExcludeAssets = All) and re-add them in
       ResolveMicrosoftNetCoreAppReferences target
     -->
     <PackageReference Update="Microsoft.NETCore.App"
@@ -119,17 +119,17 @@
   <Target
     Name="ResolveMicrosoftDotNetWpfGitHubReferences"
     Returns="@(ReferencePath)"
-    Condition="'@(MicrosoftDotNetWpfGitHubReference)'!='' 
+    Condition="'@(MicrosoftDotNetWpfGitHubReference)'!=''
            And '$(MSBuildProjectExtension)' != '.vcxproj'
-           And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' 
-           And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') 
+           And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+           And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0')
            and '$(DoNotLimitMicrosoftDotNetWpfGitHubReferences)'!='true'">
-    <!-- 
+    <!--
     In your project, Add a references to WPF GitHub transport package like this:
       <ItemGroup>
         <MicrosoftDotNetWpfGitHubReference Include="System.Xaml" />
       </ItemGroup>
-      
+
       It will get translated into something like this:
       <ItemGroup>
         <Reference Include="C:\Users\username\.nuget\packages\microsoft.dotnet.wpf.github\4.8.0-preview4.19174.2\ref\netcoreapp3.0\System.Xaml.dll" />
@@ -139,9 +139,12 @@
       <!-- Since WPF reference assemblies do not carry internals, we need to directly reference the RID-specific lib assemblies from dotnet_wpf_int builds. -->
       <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-x86' And '$(Configuration)' != 'Debug'">$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_GitHub)</WpfGitHubRidSpecificPackagePath>
       <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-x86' And '$(Configuration)' == 'Debug'">$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_GitHub_Debug)</WpfGitHubRidSpecificPackagePath>
-      
+
       <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-x64' And '$(Configuration)' != 'Debug'">$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_GitHub)</WpfGitHubRidSpecificPackagePath>
       <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-x64' And '$(Configuration)' == 'Debug'">$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_GitHub_Debug)</WpfGitHubRidSpecificPackagePath>
+
+      <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-arm64' And '$(Configuration)' != 'Debug'">$(Pkgruntime_win-arm64_Microsoft_DotNet_Wpf_GitHub)</WpfGitHubRidSpecificPackagePath>
+      <WpfGitHubRidSpecificPackagePath Condition="'$(WpfRuntimeIdentifier)'=='win-arm64' And '$(Configuration)' == 'Debug'">$(Pkgruntime_win-arm64_Microsoft_DotNet_Wpf_GitHub_Debug)</WpfGitHubRidSpecificPackagePath>
     </PropertyGroup>
     <ItemGroup>
       <Reference Include="$(WpfGitHubRidSpecificPackagePath)\lib\$(TargetFramework)\%(MicrosoftDotNetWpfGitHubReference.Identity).dll"
@@ -154,45 +157,45 @@
   <Target
     Name="ResolveMicrosoftDotNetWpfDncEngReferencesForCpp"
     Returns="@(Link)"
-    Condition="'@(MicrosoftDotNetWpfGitHubReference)'!='' 
+    Condition="'@(MicrosoftDotNetWpfGitHubReference)'!=''
            And '$(MSBuildProjectExtension)' == '.vcxproj'
            and '$(DoNotLimitMicrosoftDotNetWpfGitHubReferences)'!='true'">
-    <!-- 
-      Normally, we would use lib files from RID-specific Microsoft.DotNet.Wpf.DncEng package directly. Since this package 
+    <!--
+      Normally, we would use lib files from RID-specific Microsoft.DotNet.Wpf.DncEng package directly. Since this package
       was most likley not restored prior to the start of the build, it had to be restored from with the CppHelper target, and the libs in this package
-      are now enumerated within @(NuGetReferencesForCpp) item. 
+      are now enumerated within @(NuGetReferencesForCpp) item.
     -->
-    
-    <!-- 
+
+    <!--
       Select items from with @(NuGetReferencesForCpp) (which is a proxy for Microsoft.DotNet.Wpf.DncEng's native libs)
       that were requested in MicrosoftDotNetWpfGitHubReference
     -->
     <FilterItem1ByItem2 Item1="@(NuGetReferencesForCpp->'%(FileName)')"
-                        Item2="@(MicrosoftDotNetWpfGitHubReference)" 
+                        Item2="@(MicrosoftDotNetWpfGitHubReference)"
                         Metadata2="Identity"
                         PreserveItem1Metadata="true">
       <Output ItemName="_nugetLibReferencesForCpp" TaskParameter="Result" />
     </FilterItem1ByItem2>
-    
+
     <ItemGroup>
-      <Link Include="@(_nugetLibReferencesForCpp->'%(FilePath)')" />   
+      <Link Include="@(_nugetLibReferencesForCpp->'%(FilePath)')" />
     </ItemGroup>
   </Target>
 
-  <!-- 
+  <!--
     In your project, Add a references to WinForms transport package like this:
       <ItemGroup>
         <MicrosoftPrivateWinFormsReference Include="Accessbility" />
       </ItemGroup>
-      
+
     It will get translated into something like this:
       <ItemGroup>
         <Reference Include="C:\Users\username\.nuget\packages\microsoft.private.winforms\4.8.0-preview4.19170.4\lib\netcoreapp3.0\Accessibility.dll" />
       </ItemGroup>
    -->
   <Target Name="ResolveWinFormsReferences"
-          Condition="'@(MicrosoftPrivateWinFormsReference)'!='' 
-                 And '$(TargetFrameworkIdentifier)' == '.NETCoreApp' 
+          Condition="'@(MicrosoftPrivateWinFormsReference)'!=''
+                 And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
                  And ('$(TargetFrameworkVersion)' == 'v3.0' Or '$(TargetFrameworkVersion)' == 'v3.1' Or '$(TargetFrameworkVersion)' == 'v5.0') ">
     <ItemGroup>
       <Reference Include="$(PkgMicrosoft_Private_Winforms)\ref\$(TargetFramework)\%(MicrosoftPrivateWinFormsReference.Identity).dll"
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
index 54eaa05fc84..06affe49a8c 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -20,7 +20,10 @@
     <Architecture Condition="'$(Platform)'=='Win32'">x86</Architecture>
     <Architecture Condition="'$(Architecture)'==''">x64</Architecture>
 
-    <TraceWpp>$(Windows10SdkPath)bin\$(WindowsTargetPlatformVersion)\$(Architecture)\tracewpp.exe</TraceWpp>
+    <!-- This should always use either x86 or x64 --> 
+    <TraceWppArchitecture Condition="'$(Architecture)'=='ARM64'">x64</TraceWppArchitecture>
+    <TraceWppArchitecture Condition="'$(Architecture)'!='ARM64'">$(Architecture)</TraceWppArchitecture>
+    <TraceWpp>$(Windows10SdkPath)bin\$(WindowsTargetPlatformVersion)\$(TraceWppArchitecture)\tracewpp.exe</TraceWpp>
 
     <GenerateAssemblyInfo>$(ManagedCxx)</GenerateAssemblyInfo>
     <BuildProjectReferences>true</BuildProjectReferences>
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index 45bf6476607..86bdeeba5d0 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -4,10 +4,10 @@
     <NativeVersionFileDirectory>$([System.IO.Path]::GetDirectoryName($(NativeVersionFile)))</NativeVersionFileDirectory>
     <NativeResourceFileWithVersionInformation Condition="'$(NativeResourceFileWithVersionInformation)' == ''">$(IntermediateOutputPath)ExtendedNativeVersion.rc</NativeResourceFileWithVersionInformation>
   </PropertyGroup>
-  
+
   <PropertyGroup>
-      <!-- 
-           Set up Directories 
+      <!--
+           Set up Directories
            Must be done after importing Microsoft.Cpp.VCTools.props
       -->
     <VcrtLibDir>$(VCToolsInstallDir)lib\$(Architecture)\</VcrtLibDir>
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <Import Project="Wpf.Cpp.PrivateTools.targets" Condition="Exists('Wpf.Cpp.PrivateTools.targets') And '$(UsePrivateCppTools)'=='true'"/>
-  
+
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories Condition="Exists('$(WpfSharedDir)inc\')">%(AdditionalIncludeDirectories);$(WpfSharedDir)inc\</AdditionalIncludeDirectories>
@@ -27,12 +27,12 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory);$(WpfTracingDir)native\</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(WpfSharedDir)inc\ddbanned.h</ForcedIncludeFiles>
 
-      <!-- 
+      <!--
         Workaround for https://github.com/dotnet/arcade/issues/4763
-        Embed PDB's into the .lib files directly using /Z7 when building out of 
+        Embed PDB's into the .lib files directly using /Z7 when building out of
         dotnet-wpf-int repo
       -->
-      <DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and 
+      <DebugInformationFormat Condition="'$(ManagedCxx)' != 'true' and
                                          '$(ConfigurationType)' == '$(StaticLibrary)' and
                                          '$(RepositoryName)' == 'dotnet-wpf-int'">oldStyle</DebugInformationFormat>
     </ClCompile>
@@ -43,10 +43,10 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  
-  
 
-  <!-- 
+
+
+  <!--
     Support for /linkrepro
   -->
   <ItemDefinitionGroup Condition="'$(LinkRepro)'=='true'">
@@ -82,9 +82,9 @@
     </BeforeClCompileTargets>
   </PropertyGroup>
 
-  <Target Name="CreateNativeVersionFile" 
+  <Target Name="CreateNativeVersionFile"
           BeforeTargets="ResourceCompile"
-          Outputs="$(NativeVersionFile)" 
+          Outputs="$(NativeVersionFile)"
           Condition="!Exists('$(NativeVersionFile)')">
     <CallTarget Targets="GenerateNativeVersionFile" />
   </Target>
@@ -103,7 +103,7 @@
     </PropertyGroup>
 
     <Copy SourceFiles="$(NativeVersionFile)" DestinationFiles="$(_NativeVersionHeader)" SkipUnchangedFiles="true" />
-    
+
     <PropertyGroup>
       <_WindowsFileVersion>$(FileVersion.Replace('.', ','))</_WindowsFileVersion>
       <_SourceBuildInfo> %40Commit: $(SourceRevisionId)</_SourceBuildInfo>
@@ -112,15 +112,15 @@
       <_VFT_APP>0x00000001</_VFT_APP>
       <_VFT_DLL>0x00000002</_VFT_DLL>
       <_VFT_UNKNOWN>0x00000000</_VFT_UNKNOWN>
-      
+
       <_VOS_NT_WINDOWS32>0x00040004</_VOS_NT_WINDOWS32>
-      
+
       <_VS_FF_DEBUG>0x00000001</_VS_FF_DEBUG>
-      
+
       <_VerFileTypeValue>$(_VFT_UNKNOWN)</_VerFileTypeValue>
       <_VerFileTypeValue Condition="'$(ConfigurationType)' =='Application'">$(_VFT_APP)</_VerFileTypeValue>
       <_VerFileTypeValue Condition="'$(ConfigurationType)' =='DynamicLibrary'">$(_VFT_DLL)</_VerFileTypeValue>
-      
+
       <_ExtendedNativeVersionFileContents>
         <![CDATA[
 
@@ -184,7 +184,7 @@ END
     <ItemGroup>
       <_ExtendenNativeVersionFileLines Include="$(_ExtendedNativeVersionFileContents)" />
     </ItemGroup>
-    
+
     <WriteLinesToFile Lines="@(_ExtendenNativeVersionFileLines)"
                       File="$(NativeResourceFileWithVersionInformation)"
                       Overwrite="true" />
@@ -200,7 +200,7 @@ END
    We needed to ensure a few preconditions for this target, which necessitated a custom version to be written
       - this  target has to execute prior to ResolveAssemblyReferences
       InitializeAssemblyAttributeInformation (defined in ExtendedAssemblyInfo.targets) must run prior to this target, to ensure that $(FileVersion) is populated
-      Additional assembly scope attributes besides TargetFrameworkAttribute are added here 
+      Additional assembly scope attributes besides TargetFrameworkAttribute are added here
   -->
   <Target Name="GenerateTargetFrameworkMonikerAttribute2"
       Condition="'$(ManagedCxx)'=='true'"
@@ -235,21 +235,21 @@ using namespace System::Runtime::Versioning;
       <AssemblyInfoFile Include="CLSCompliantAttribute" Condition="'$(CLSCompliant)'=='true'">
         <Text>
           <![CDATA[
-[assembly:CLSCompliant(true)];        
+[assembly:CLSCompliant(true)];
         ]]>
         </Text>
       </AssemblyInfoFile>
       <AssemblyInfoFile Include="COMVisibleAttribute" Condition="'$(AssemblyComVisible)'!=''">
         <Text>
           <![CDATA[
-[assembly:ComVisible($(AssemblyComVisible))];        
+[assembly:ComVisible($(AssemblyComVisible))];
         ]]>
         </Text>
       </AssemblyInfoFile>
       <AssemblyInfoFile Include="AssemblyMetadataAttribute" Condition="'$(SkipFrameworkAssemblyMetadata)'!='true' and '@(AssemblyMetadata)'!=''">
         <Text>
           <![CDATA[
-[assembly:AssemblyMetadata("%(AssemblyMetadata.Identity)", "%(AssemblyMetadata.Value)")];    
+[assembly:AssemblyMetadata("%(AssemblyMetadata.Identity)", "%(AssemblyMetadata.Value)")];
         ]]>
         </Text>
       </AssemblyInfoFile>
@@ -288,21 +288,21 @@ using namespace System::Runtime::Versioning;
     </EnsureWpfProjectReferenceDependsOn>
   </PropertyGroup>
 
-  <!-- 
+  <!--
     Helper for building C++/CLI projects
-    
+
     C++/CLI doe not have Sdk support for build on .NET Core
     We use existing support for C# to discover Nuget packages, and pass it along to
-    the C++ compiler. 
-    
+    the C++ compiler.
+
     A simple C# project is generated dynamically. It contains PackageReferences for common packages
     that are used in WPF's C++/CLI projects. There are only two such projects - DirectWriteForwarder
     and System.Printing - which makes it unnecessary to create a flexible and parametrized target. This
-    can remain a simple and one-size-fits-all target for now. 
-    
+    can remain a simple and one-size-fits-all target for now.
+
     If additional Nuget references need to be discovered and passed along for builds (for existing, or new) of
     C++/CLI projects, they just need to be added to the vcxproj project file like this:
-    
+
       <AdditionalPackageReference Include="Microsoft.Win32.Registry" Version="<version>" />
   -->
   <Target Name="CppCliHelper"
@@ -315,10 +315,10 @@ using namespace System::Runtime::Versioning;
 
     <ItemGroup>
       <CppClrSupportProject Include="ProjectHeader">
-        <!-- 
-            In the CDATA section that follows, 
+        <!--
+            In the CDATA section that follows,
               %40 ~= @
-              %25 ~= % 
+              %25 ~= %
               %3B ~= ;
               %24 ~= $
           -->
@@ -327,7 +327,7 @@ using namespace System::Runtime::Versioning;
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="EnumerateAdditionalNugetReference">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU%3Bx64</Platforms>
+    <Platforms>AnyCPU%3Bx64%3Barm64</Platforms>
   </PropertyGroup>
   ]]>
         </Text>
@@ -338,7 +338,7 @@ using namespace System::Runtime::Versioning;
         <Text>
           <![CDATA[
 
-  
+
   <Target Name="EnumerateAdditionalNugetReference"
           BeforeTargets="_GenerateRestoreGraph"
           Condition="'%24(AdditionalPackages)'!=''"
@@ -346,15 +346,15 @@ using namespace System::Runtime::Versioning;
      <ItemGroup>
        <_AdditionalPackages Remove="%40(_AdditionalPackages)" />
        <_AdditionalPackages Include="%24(AdditionalPackages)" />
-       
-       <PackageReference Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])" 
+
+       <PackageReference Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])"
                          Version="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[1])" />
-       
+
        <AdditionalNugetIds Remove="%40(AdditionalNugetIds)" />
        <AdditionalNugetIds Include="%24([System.String]::Copy('%25(_AdditionalPackages.Identity)').Split('+')[0])" />
      </ItemGroup>
   </Target>
-  
+
 <Target
     Name="IdentifyNugetReferences"
     AfterTargets="ResolveAssemblyReferences"
@@ -384,14 +384,14 @@ using namespace System::Runtime::Versioning;
              Directories="$(IntermediateOutputPath)CppCliSupport\" />
 
     <Delete Files="$(CppCliHelperProject)" Condition="Exists('$(CppCliHelperProject)')" />
-    
+
     <WriteLinesToFile Lines="%(CppClrSupportProject.Text)"
-                      File="$(CppCliHelperProject)" 
+                      File="$(CppCliHelperProject)"
                       Overwrite="false"/>
 
-    <!-- 
+    <!--
     Do not build - just ask ResolveReferences + IdentifyNetCoreReferences for the information
-    we are looking for, namely the list of .NET Core Sdk references. 
+    we are looking for, namely the list of .NET Core Sdk references.
     -->
     <ItemGroup>
       <ProjectToBuild Remove="@(ProjectToBuild)" />
@@ -401,11 +401,11 @@ using namespace System::Runtime::Versioning;
     </ItemGroup>
     <MSBuild Projects="@(ProjectToBuild)"
              Targets="Restore;ResolveReferences;IdentifyNugetReferences"
-             Properties="TargetFramework=$(TargetFramework);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
+             Properties="TargetFramework=$(TargetFramework);Platform=$(Architecture);RuntimeIdentifier=win10-$(Architecture)">
       <Output  TaskParameter="TargetOutputs" ItemName="NugetReferencesForCppCli" />
     </MSBuild>
 
-    <!-- 
+    <!--
       Add the newly discovered list of .NET core references to $(AdditionalExplicitAssemblyReferences)
     -->
     <ItemGroup Condition="'$(CopyTransitiveReferences)'=='false'">
@@ -431,24 +431,24 @@ using namespace System::Runtime::Versioning;
     </EnsureWpfProjectReferenceDependsOn>
   </PropertyGroup>
 
-  <!-- 
+  <!--
     Helper for building C++ projects that may require references from Microsoft.DotNet.Wpf.DncEng
     transport package
-    
+
     C++ does not have NuGet support for build on .NET Core
     We use existing support for C# to discover Nuget packages, and pass it along to
-    the C++ compiler. 
-    
+    the C++ compiler.
+
     A simple C# project is generated dynamically. It contains a PackageReference for RID specific
-    Microsoft.DotNet.Wpf.DncEng package. 
+    Microsoft.DotNet.Wpf.DncEng package.
 
-   The main purpose of this target is to restore the package with PathProperty=true. As a side-effect, 
+   The main purpose of this target is to restore the package with PathProperty=true. As a side-effect,
    we will also generate an Item @(NuGetReferencesForCpp) from IdentifyNuGetReferences target, which
    will be used by ResolveMicrosoftDotNetWpfDncEngReferencesForCpp
 
-   Note: 
+   Note:
     Test for "$(RepoLocation) != Internal" rather than "$(RepoLocation) == External"
-    The former form is more reliable. 
+    The former form is more reliable.
 
   -->
   <Target Name="CppHelper"
@@ -461,10 +461,10 @@ using namespace System::Runtime::Versioning;
 
     <ItemGroup>
       <CppSupportProject Include="ProjectHeader">
-        <!-- 
-            In the CDATA section that follows, 
+        <!--
+            In the CDATA section that follows,
               %40 ~= @
-              %25 ~= % 
+              %25 ~= %
               %3B ~= ;
               %24 ~= $
           -->
@@ -473,14 +473,16 @@ using namespace System::Runtime::Versioning;
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Platforms>AnyCPU%3Bx64</Platforms>
+    <Platforms>AnyCPU%3Bx64%3Barm64</Platforms>
   </PropertyGroup>
   ]]>
         </Text>
       </CppSupportProject>
-      
-      <!-- 
-        We need a reference to Microsoft.DotNet.Wpf.GitHub 
+
+      <!--
+          We need a reference to Microsoft.DotNet.Wpf.DncEng.
+
+            These are the native libs built internally on dotnet-wpf-int.
       -->
       <CppSupportProject Include="MicrosoftDotNetWpfGitHubPackageReference">
         <Text>
@@ -488,21 +490,21 @@ using namespace System::Runtime::Versioning;
    <ItemGroup>
       <PackageReference Include="runtime.$(WpfRuntimeIdentifier).$(DncEngTransportPackageName)"
                         Condition="'$(MicrosoftDotNetWpfDncEngVersion)' != ''"
-                        Version="$(MicrosoftDotNetWpfDncEngVersion)" 
+                        Version="$(MicrosoftDotNetWpfDncEngVersion)"
                         GeneratePathProperty="true" />
   </ItemGroup>
   ]]>
         </Text>
       </CppSupportProject>
-      
+
       <CppSupportProject Include="ProjectBody">
         <Text>
           <![CDATA[
-  <!-- Ensure that LimitMicrosoftDotNetWpfGitHubReferences target doesn't run --> 
+  <!-- Ensure that LimitMicrosoftDotNetWpfGitHubReferences target doesn't run -->
   <PropertyGroup>
     <DoNotLimitMicrosoftDotNetWpfGitHubReferences>true</DoNotLimitMicrosoftDotNetWpfGitHubReferences>
   </PropertyGroup>
-  
+
 <Target
     Name="IdentifyNuGetReferences"
     AfterTargets="ResolveAssemblyReferences"
@@ -511,13 +513,15 @@ using namespace System::Runtime::Versioning;
    <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
       <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x86' Or '%24(WpfRuntimeIdentifier)'=='win-x86'">%24(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\win-x86\native\</WpfDncEngRidSpecificLibPath>
       <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\win-x64\native\</WpfDncEngRidSpecificLibPath>
+      <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-arm64' Or '%24(WpfRuntimeIdentifier)'=='win-arm64'">%24(Pkgruntime_win-arm64_Microsoft_DotNet_Wpf_DncEng)\runtimes\win-arm64\native\</WpfDncEngRidSpecificLibPath>
    </PropertyGroup>
-   
+
    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
       <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x86' Or '%24(WpfRuntimeIdentifier)'=='win-x86'">%24(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng_Debug)\runtimes\win-x86\native\</WpfDncEngRidSpecificLibPath>
       <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-x64' Or '%24(WpfRuntimeIdentifier)'=='win-x64'">%24(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng_Debug)\runtimes\win-x64\native\</WpfDncEngRidSpecificLibPath>
+      <WpfDncEngRidSpecificLibPath Condition="'%24(RuntimeIdentifier)'=='win-arm64' Or '%24(WpfRuntimeIdentifier)'=='win-arm64'">%24(Pkgruntime_win-arm64_Microsoft_DotNet_Wpf_DncEng_Debug)\runtimes\win-arm64\native\</WpfDncEngRidSpecificLibPath>
    </PropertyGroup>
-   
+
 <!-- Save Microsoft.NETCore.App assemblies and return them -->
     <ItemGroup>
       <NuGetReferencesForCpp Remove="%40(NuGetReferencesForCpp)" />
@@ -539,9 +543,9 @@ using namespace System::Runtime::Versioning;
                       File="$(CppHelperProject)"
                       Overwrite="false"/>
 
-    <!-- 
+    <!--
     Do not build - just ask IdentifyNetCoreReferences for the information
-    we are looking for, namely the list of .NET Core Sdk references. 
+    we are looking for, namely the list of .NET Core Sdk references.
     -->
     <ItemGroup>
       <ProjectToBuild Remove="@(ProjectToBuild)" />
@@ -554,11 +558,11 @@ using namespace System::Runtime::Versioning;
     <!-- Restore, then IdentifyNuGetReferences -->
     <MSBuild Projects="@(ProjectToBuild)" UnloadProjectsOnCompletion="true"
              Targets="Restore"
-             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture);IsRestoring=true" />
-    
+             Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win10-$(Architecture);IsRestoring=true" />
+
     <MSBuild Projects="@(ProjectToBuild)"
          Targets="IdentifyNuGetReferences"
-         Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
+         Properties="TargetFramework=$(TfmForBuild);Platform=$(Architecture);RuntimeIdentifier=win10-$(Architecture)">
       <Output  TaskParameter="TargetOutputs" ItemName="NuGetReferencesForCpp" />
     </MSBuild>
 
@@ -588,7 +592,7 @@ using namespace System::Runtime::Versioning;
       $(BeforeClCompileTargets)
     </BeforeClCompileTargets>
   </PropertyGroup>
-  
+
   <Target Name="UseOldStyleDebugInformationFormat"
           Condition="'$(RepositoryName)'=='dotnet-wpf-int'    And
                      '$(ConfigurationType)' =='StaticLibrary' And

From f1e97ddce44066660af72a5536eaefd57c6f7918 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 20 Jan 2021 13:42:42 -0800
Subject: [PATCH 2/3] Update source files contained in the WPF Arcade SDK for
 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>
---
 .../Shared/OSVersionHelper/OSVersionHelper.vcxproj  | 13 ++++++++-----
 .../src/WpfGfx/common/shared/MILInterlocked.h       |  4 ++--
 .../src/WpfGfx/common/shared/shared.h               |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/OSVersionHelper/OSVersionHelper.vcxproj b/src/Microsoft.DotNet.Wpf/src/Shared/OSVersionHelper/OSVersionHelper.vcxproj
index bbffbcb7e3e..1d07da0ed83 100644
--- a/src/Microsoft.DotNet.Wpf/src/Shared/OSVersionHelper/OSVersionHelper.vcxproj
+++ b/src/Microsoft.DotNet.Wpf/src/Shared/OSVersionHelper/OSVersionHelper.vcxproj
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -18,12 +26,10 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  
   <ItemGroup>
     <ClCompile Include="osversionhelper.cpp" />
     <ClCompile Include="watsonreportinghelper.cpp" />
   </ItemGroup>
-  
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{3801B5AE-6871-4A72-B400-1F6ABCBF9045}</ProjectGuid>
@@ -31,12 +37,9 @@
     <RootNamespace>OSVersionHelper</RootNamespace>
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
-  
-  
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(WpfCppProps)" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/MILInterlocked.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/MILInterlocked.h
index 05c4bb70b3e..70e0fbdccf2 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/MILInterlocked.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/MILInterlocked.h
@@ -107,7 +107,7 @@ MILInterlockedCompareExchange64(
 #pragma warning( pop )
 
 
-#elif defined(_IA64_) || defined(_AMD64_) || defined(_AXP64_)
+#elif defined(_IA64_) || defined(_AMD64_) || defined(_AXP64_) 
 
 //
 // 64 bit Implementation- uses InterlockedCompareExchangePointer
@@ -157,7 +157,7 @@ MILInterlockedCompareExchange64(
         ));
 }
 
-#elif defined(_ARM_)
+#elif defined(_ARM_) || defined(_ARM64_)
 
 //+----------------------------------------------------------------------------
 //
diff --git a/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/shared.h b/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/shared.h
index dae62f58baa..00a0e0808cc 100644
--- a/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/shared.h
+++ b/src/Microsoft.DotNet.Wpf/src/WpfGfx/common/shared/shared.h
@@ -10,7 +10,7 @@
 #include <mmsystem.h>
 // winnt.h and the VC8 emmintrin.h define this function differently, and compilation fails.
 #define _mm_clflush _mm_clflush__dupe_renamed
-#if !defined(_ARM_)
+#if !defined(_ARM_) && !defined(_ARM64_)
 #include <emmintrin.h>
 #endif
 #pragma warning (pop)

From 19af1cfb530c115d206b9b1ee92f8a8cc31c0b72 Mon Sep 17 00:00:00 2001
From: Ryland <41491307+ryalanms@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:34:22 -0800
Subject: [PATCH 3/3] Use correct TFM.  TFM should be win-arm64, not
 win10-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/Wpf.Cpp.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
index 86bdeeba5d0..82cf6eb24bb 100644
--- a/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
+++ b/eng/WpfArcadeSdk/tools/Wpf.Cpp.targets
@@ -401,7 +401,7 @@ using namespace System::Runtime::Versioning;
     </ItemGroup>
     <MSBuild Projects="@(ProjectToBuild)"
              Targets="Restore;ResolveReferences;IdentifyNugetReferences"
-             Properties="TargetFramework=$(TargetFramework);Platform=$(Architecture);RuntimeIdentifier=win10-$(Architecture)">
+             Properties="TargetFramework=$(TargetFramework);Platform=$(Architecture);RuntimeIdentifier=win-$(Architecture)">
       <Output  TaskParameter="TargetOutputs" ItemName="NugetReferencesForCppCli" />
     </MSBuild>