From 485410c67cd1ca45d999e531c107d1692ff34076 Mon Sep 17 00:00:00 2001
From: Tian L <60599517+tian-lt@users.noreply.github.com>
Date: Tue, 25 May 2021 15:11:01 +0800
Subject: [PATCH] fix csproj (#37)

---
 .../CalculatorSplashScreen.scale-400.png      | Bin 5828 -> 0 bytes
 src/Calculator/Calculator.csproj              |  42 ++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)
 delete mode 100644 src/Calculator/Assets/CalculatorSplashScreen.scale-400.png

diff --git a/src/Calculator/Assets/CalculatorSplashScreen.scale-400.png b/src/Calculator/Assets/CalculatorSplashScreen.scale-400.png
deleted file mode 100644
index e9dd7b14d8286fb3b3f0ea679e4d47f288a4ed0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5828
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
E7j2pc00000

diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 458004ab..712f2a2f 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -9,17 +9,36 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CalculatorApp</RootNamespace>
     <AssemblyName>CalculatorApp</AssemblyName>
+    <ApplicationType>Windows Store</ApplicationType>
+    <AppContainerApplication>true</AppContainerApplication>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <!-- We want to manually control the MinVersion/MaxVersionTested in the manifest so turn of the replacement. -->
+    <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
+    <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <AppxDefaultResourceQualifierUAP_Contrast>black</AppxDefaultResourceQualifierUAP_Contrast>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>B06D4942DD6AAC6D5659E3AF866A11D0081C12C1</PackageCertificateThumbprint>
     <PackageCertificateKeyFile>WindowsDev_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <AppxBundle>Always</AppxBundle>
+    <GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+  </PropertyGroup>
+  <!-- This has to be exactly in this place for this to work -->
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -120,6 +139,9 @@
   <PropertyGroup>
     <AppVersion Condition="'$(AppVersion)' == ''">0.0.0.0</AppVersion>
   </PropertyGroup>
+  <ItemGroup>
+      <ResourceCompile Include="Calculator.rc" PreprocessorDefinitions="%(PreprocessorDefinitions);APP_VERSION_MAJOR=$(AppVersion.Split(`.`)[0]);APP_VERSION_MINOR=$(AppVersion.Split(`.`)[1]);APP_VERSION_BUILD=$(AppVersion.Split(`.`)[2]);APP_VERSION_REVISION=$(AppVersion.Split(`.`)[3])" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutFlyout.xaml.cs">
       <DependentUpon>AboutFlyout.xaml</DependentUpon>
@@ -389,7 +411,6 @@
     <Content Include="Assets\CalculatorSplashScreen.scale-200_altform-colorful.png" />
     <Content Include="Assets\CalculatorSplashScreen.scale-200_contrast-black.png" />
     <Content Include="Assets\CalculatorSplashScreen.scale-200_contrast-white.png" />
-    <Content Include="Assets\CalculatorSplashScreen.scale-400.png" />
     <Content Include="Assets\CalculatorSplashScreen.scale-400_altform-colorful.png" />
     <Content Include="Assets\CalculatorSplashScreen.scale-400_contrast-black.png" />
     <Content Include="Assets\CalculatorSplashScreen.scale-400_contrast-white.png" />
@@ -726,6 +747,21 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
+  <!-- Override MSBuild target to workaround VS bug with building using framework packages -->
+  <Target Name="_GenerateAdditionalFrameworkSDKReference">
+    <ItemGroup>
+      <_IntermediateFrameworkSdkReference Include="@(AppxPackageRegistration)" Condition="'@(AppxPackageRegistration)' != ''&#xD;&#xA;                   AND ('$(Configuration)' == '%(AppxPackageRegistration.Configuration)' OR '%(AppxPackageRegistration.Configuration)' == '')&#xD;&#xA;                   AND ('$(PlatformTarget)' == '%(AppxPackageRegistration.Architecture)' OR '%(AppxPackageRegistration.Configuration)' == '')">
+        <SDKName Condition="%(AppxPackageRegistration.Name) != ''">%(AppxPackageRegistration.Name)</SDKName>
+        <SDKName Condition="%(AppxPackageRegistration.Name) == ''">%(AppxPackageRegistration.Filename)</SDKName>
+        <TargetedSDKConfiguration>%(AppxPackageRegistration.Configuration)</TargetedSDKConfiguration>
+        <TargetedSDKArchitecture>%(AppxPackageRegistration.Architecture)</TargetedSDKArchitecture>
+        <AppxLocation>%(AppxPackageRegistration.Identity)</AppxLocation>
+      </_IntermediateFrameworkSdkReference>
+      <FrameworkSdkReference Include="@(_IntermediateFrameworkSdkReference)">
+        <FrameworkIdentity>Name = %(_IntermediateFrameworkSdkReference.SDKName), MinVersion = %(_IntermediateFrameworkSdkReference.Version), Publisher = %(_IntermediateFrameworkSdkReference.Publisher)</FrameworkIdentity>
+      </FrameworkSdkReference>
+    </ItemGroup>
+  </Target>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.