Run WACK tests for ARM64 (#6184)

microsoft · Oct 29, 2021 · aff0350 · aff0350
1 parent 7ec5fb5
commit aff0350
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 13 deletions.
diff --git a/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml b/build/AzurePipelinesTemplates/MUX-NugetReleaseTest-Job.yml
@@ -24,6 +24,9 @@ parameters:
     Release_arm:
       buildPlatform: 'arm'
       buildConfiguration: 'Release'
+    Release_arm64:
+      buildPlatform: 'arm64'
+      buildConfiguration: 'Release'
 
 jobs:
 - job: ${{ parameters.buildJobName }}

diff --git a/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml b/build/AzurePipelinesTemplates/MUX-WACKTests-Job.yml
@@ -12,6 +12,9 @@ parameters:
     Release_Arm:
       buildPlatform: 'arm'
       buildConfiguration: 'Release'
+    Release_Arm64:
+      buildPlatform: 'arm64'
+      buildConfiguration: 'Release'
 jobs:
 - job: ${{ parameters.name }}
   dependsOn: ${{ parameters.dependsOn }}

diff --git a/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj b/test/MUXControlsReleaseTest/AppThatUsesMUXIndirectly/AppThatUsesMUXIndirectly.csproj
@@ -15,7 +15,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition="'$(Platform)' != 'ARM64'">10.0.15063.0</TargetPlatformMinVersion>
+    <!-- arm64 build is supported only after 16299 -->
+    <TargetPlatformMinVersion Condition="'$(Platform)' == 'ARM64'">$(SDKVersionRS3)</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -72,6 +74,28 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>

diff --git a/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln b/test/MUXControlsReleaseTest/MUXControlsReleaseTest.sln
@@ -88,7 +88,9 @@ Global
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.Build.0 = Debug|ARM
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|ARM.Deploy.0 = Debug|ARM
-		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.ActiveCfg = Debug|Win32
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.Build.0 = Debug|ARM64
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|arm64.Deploy.0 = Debug|ARM64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.ActiveCfg = Debug|x64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.Build.0 = Debug|x64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Debug|x64.Deploy.0 = Debug|x64
@@ -98,7 +100,9 @@ Global
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.ActiveCfg = Release|ARM
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.Build.0 = Release|ARM
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|ARM.Deploy.0 = Release|ARM
-		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.ActiveCfg = Release|x64
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.ActiveCfg = Release|ARM64
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.Build.0 = Release|ARM64
+		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|arm64.Deploy.0 = Release|ARM64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.ActiveCfg = Release|x64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.Build.0 = Release|x64
 		{2F339B02-2B8C-4ED8-9C20-93E24A183A2B}.Release|x64.Deploy.0 = Release|x64
@@ -118,7 +122,9 @@ Global
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.ActiveCfg = Debug|ARM
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.Build.0 = Debug|ARM
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|ARM.Deploy.0 = Debug|ARM
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.ActiveCfg = Debug|x86
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.Build.0 = Debug|ARM64
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|arm64.Deploy.0 = Debug|ARM64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.ActiveCfg = Debug|x64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Build.0 = Debug|x64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Debug|x64.Deploy.0 = Debug|x64
@@ -128,7 +134,9 @@ Global
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.ActiveCfg = Release|ARM
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.Build.0 = Release|ARM
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|ARM.Deploy.0 = Release|ARM
-		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.ActiveCfg = Release|x64
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.ActiveCfg = Release|ARM64
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.Build.0 = Release|ARM64
+		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|arm64.Deploy.0 = Release|ARM64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.ActiveCfg = Release|x64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Build.0 = Release|x64
 		{CCA3696F-5CAC-421D-8528-4D9122B4D240}.Release|x64.Deploy.0 = Release|x64
@@ -260,7 +268,9 @@ Global
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.ActiveCfg = Debug|ARM
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.Build.0 = Debug|ARM
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|ARM.Deploy.0 = Debug|ARM
-		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.ActiveCfg = Debug|x86
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.Build.0 = Debug|ARM64
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|arm64.Deploy.0 = Debug|ARM64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.ActiveCfg = Debug|x64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.Build.0 = Debug|x64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Debug|x64.Deploy.0 = Debug|x64
@@ -270,7 +280,9 @@ Global
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.ActiveCfg = Release|ARM
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.Build.0 = Release|ARM
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|ARM.Deploy.0 = Release|ARM
-		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.ActiveCfg = Release|x86
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.ActiveCfg = Release|ARM64
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.Build.0 = Release|ARM64
+		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|arm64.Deploy.0 = Release|ARM64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.ActiveCfg = Release|x64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.Build.0 = Release|x64
 		{E1F7AB45-FD1A-4220-AC81-874FCBEFD294}.Release|x64.Deploy.0 = Release|x64
@@ -288,15 +300,13 @@ Global
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|ARM.Build.0 = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|arm64.Build.0 = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|ARM.ActiveCfg = Release|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|ARM.Build.0 = Release|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|arm64.ActiveCfg = Release|Any CPU
-		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|arm64.Build.0 = Release|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x64.ActiveCfg = Release|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x64.Build.0 = Release|Any CPU
 		{A3A130B0-993B-4EBC-9E17-81F021EDBEED}.Release|x86.ActiveCfg = Release|Any CPU
@@ -336,15 +346,13 @@ Global
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|ARM.Build.0 = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|arm64.Build.0 = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x64.Build.0 = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Debug|x86.Build.0 = Debug|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|ARM.ActiveCfg = Release|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|ARM.Build.0 = Release|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|arm64.ActiveCfg = Release|Any CPU
-		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|arm64.Build.0 = Release|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x64.ActiveCfg = Release|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x64.Build.0 = Release|Any CPU
 		{94DF1545-C2FD-41DC-B68D-2C16D6BA3FD4}.Release|x86.ActiveCfg = Release|Any CPU

diff --git a/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj b/test/MUXControlsReleaseTest/NugetPackageTestApp/NugetPackageTestApp.csproj
@@ -15,7 +15,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(MuxSdkVersion)</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition="'$(Platform)' != 'ARM64'">10.0.15063.0</TargetPlatformMinVersion>
+    <!-- arm64 build is supported only after 16299 -->
+    <TargetPlatformMinVersion Condition="'$(Platform)' == 'ARM64'">$(SDKVersionRS3)</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -71,6 +73,28 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>

diff --git a/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj b/test/MUXControlsReleaseTest/NugetPackageTestAppCX/NugetPackageTestAppCX.vcxproj
@@ -23,6 +23,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -35,6 +39,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -54,6 +62,11 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -73,6 +86,13 @@
     <PlatformToolset>v142</PlatformToolset>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -92,9 +112,15 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -112,12 +138,24 @@
       <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -191,7 +229,9 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>

diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>RuntimeComponentThatUsesMUX</id>