Add atm64 stuff and hide mscorlib targets a different processor warning

donut2008 · Mar 1, 2021 · d85a5ea · d85a5ea
1 parent 305072b
commit d85a5ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/ModernFlyouts.Package/ModernFlyouts.Package.wapproj b/ModernFlyouts.Package/ModernFlyouts.Package.wapproj
@@ -60,7 +60,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppInstallerUri>https://github.com/ModernFlyouts-Community/ModernFlyouts/tree/main/ModernFlyouts.Package/Package.appinstaller</AppInstallerUri>
     <PackageCertificateKeyFile>ModernFlyouts.Package_TemporaryKey.pfx</PackageCertificateKeyFile>

diff --git a/ModernFlyouts.Package/Package.appxmanifest b/ModernFlyouts.Package/Package.appxmanifest
@@ -11,7 +11,7 @@
   <Identity
     Name="32669SamG.ModernFlyouts"
     Publisher="CN=Developer"
-    Version="0.9.1.0" />
+    Version="0.9.9.0" />
 
   <Properties>
 	<DisplayName>ModernFlyouts (Preview)</DisplayName>

diff --git a/ModernFlyouts/ModernFlyouts.csproj b/ModernFlyouts/ModernFlyouts.csproj
@@ -4,7 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
 	<Platforms>AnyCPU;x64;x86;ARM64</Platforms>
-	<RuntimeIdentifiers>win10-x64;win10-x86;win10-arm64</RuntimeIdentifiers>
+	<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <NeutralLanguage>en-US</NeutralLanguage>
     <EnableDefaultApplicationDefinition>false</EnableDefaultApplicationDefinition>
@@ -126,6 +126,14 @@
     <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
    </PropertyGroup>-->
 
+	<Target Name="FixAL1703Warning" BeforeTargets="GenerateSatelliteAssemblies"
+			Condition="'$(PlatformTarget)' == 'x64'">
+		<Message Text="Adjusting SDK tools directory to use x64 version of AL.EXE"/>
+			<PropertyGroup>
+				<TargetFrameworkSDKToolsDirectory>$(TargetFrameworkSDKToolsDirectory)$(PlatformTarget)\</TargetFrameworkSDKToolsDirectory>
+			</PropertyGroup>
+		</Target>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
@@ -134,6 +142,10 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+		<PlatformTarget>arm64</PlatformTarget>
+	</PropertyGroup>
+
   <PropertyGroup Label="MultilingualAppToolkit">
     <MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
     <MultilingualFallbackLanguage>en-US</MultilingualFallbackLanguage>