- ARM64 configuration added (microsoft#1014)

- Nuget packages updated to versions which support arm64 Co-authored-by: Sam <samuelg12321@hotmail.com>
tola9999 · Jun 16, 2022 · f75c752 · f75c752
1 parent 38db21a
commit f75c752
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/WinUIGallery/WinUIGallery.csproj b/WinUIGallery/WinUIGallery.csproj
@@ -25,7 +25,7 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateThumbprint>
     </PackageCertificateThumbprint>
@@ -57,6 +57,29 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</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>
     <OutputPath>bin\x64\Debug\</OutputPath>
@@ -1388,16 +1411,16 @@
       <Version>2.0.5</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.8.0-prerelease.220118001</Version>
+      <Version>2.8.0-prerelease.220601001</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
-      <Version>2.0.0</Version>
+      <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
-      <Version>1.23.0</Version>
+      <Version>1.26.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/WinUIGallery/WinUIGallery.sln b/WinUIGallery/WinUIGallery.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29728.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32602.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUIGallery", "WinUIGallery.csproj", "{3F68773A-31A5-59FE-926C-0569E415C9D9}"
 EndProject
@@ -25,7 +25,9 @@ Global
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM.ActiveCfg = Debug|ARM
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM.Build.0 = Debug|ARM
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM.Deploy.0 = Debug|ARM
-		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM64.ActiveCfg = Debug|x86
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|x64.ActiveCfg = Debug|x64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|x64.Build.0 = Debug|x64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Debug|x64.Deploy.0 = Debug|x64
@@ -35,7 +37,9 @@ Global
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM.ActiveCfg = Release|ARM
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM.Build.0 = Release|ARM
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM.Deploy.0 = Release|ARM
-		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM64.ActiveCfg = Release|x86
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM64.Build.0 = Release|ARM64
+		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|ARM64.Deploy.0 = Release|ARM64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|x64.ActiveCfg = Release|x64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|x64.Build.0 = Release|x64
 		{3F68773A-31A5-59FE-926C-0569E415C9D9}.Release|x64.Deploy.0 = Release|x64