From fde45587e7f90e23dc570aaf10ddd18a48bfd62f Mon Sep 17 00:00:00 2001
From: Matt Cooley <macool@microsoft.com>
Date: Thu, 21 Mar 2019 14:10:50 -0700
Subject: [PATCH] Add TemporaryKey.pfx

---
 .gitignore                                      |   1 +
 .../pipelines/templates/build-app-internal.yaml |   2 +-
 .../templates/prepare-release-internalonly.yaml |   2 +-
 src/Calculator/Calculator.vcxproj               |  16 +++++-----------
 src/Calculator/Calculator.vcxproj.filters       |   1 +
 src/Calculator/TemporaryKey.pfx                 | Bin 0 -> 2917 bytes
 6 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 src/Calculator/TemporaryKey.pfx

diff --git a/.gitignore b/.gitignore
index 80d64f53..2100dfc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,4 +290,5 @@ __pycache__/
 # Calculator specific
 Generated Files/
 !/build/config/TRexDefs/**
+!src/Calculator/TemporaryKey.pfx
 !src/CalculatorUnitTests/CalculatorUnitTests_TemporaryKey.pfx
\ No newline at end of file
diff --git a/build/pipelines/templates/build-app-internal.yaml b/build/pipelines/templates/build-app-internal.yaml
index 8a75dcec..2de18a01 100644
--- a/build/pipelines/templates/build-app-internal.yaml
+++ b/build/pipelines/templates/build-app-internal.yaml
@@ -29,7 +29,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.7
+      vstsPackageVersion: 0.0.10
 
   - template: ./build-single-architecture.yaml
     parameters:
diff --git a/build/pipelines/templates/prepare-release-internalonly.yaml b/build/pipelines/templates/prepare-release-internalonly.yaml
index 6bb3b6cb..bf302a4b 100644
--- a/build/pipelines/templates/prepare-release-internalonly.yaml
+++ b/build/pipelines/templates/prepare-release-internalonly.yaml
@@ -87,7 +87,7 @@ jobs:
       downloadDirectory: $(Build.SourcesDirectory)
       vstsFeed: WindowsApps
       vstsFeedPackage: calculator-internals
-      vstsPackageVersion: 0.0.7
+      vstsPackageVersion: 0.0.10
 
   - task: PkgESStoreBrokerPackage@10
     displayName: Create StoreBroker Packages
diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index f29fd3d4..fe874183 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -15,6 +15,10 @@
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <AppxDefaultResourceQualifierUAP_Contrast>black</AppxDefaultResourceQualifierUAP_Contrast>
+    <AppxBundle>Always</AppxBundle>
+    <PackageCertificateKeyFile>TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <!-- This has to be exactly in this place for this to work -->
@@ -126,16 +130,6 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <PropertyGroup Condition="Exists('TemporaryKey.pfx')">
-    <PackageCertificateKeyFile>TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="!Exists('TemporaryKey.pfx')">
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <AdditionalOptions>/bigobj /await /std:c++17 </AdditionalOptions>
@@ -360,7 +354,7 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup Condition="Exists('TemporaryKey.pfx')">
+  <ItemGroup>
     <None Include="TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Calculator/Calculator.vcxproj.filters b/src/Calculator/Calculator.vcxproj.filters
index f17fe368..2cd7dcde 100644
--- a/src/Calculator/Calculator.vcxproj.filters
+++ b/src/Calculator/Calculator.vcxproj.filters
@@ -413,6 +413,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Views\Calculator.xaml">
diff --git a/src/Calculator/TemporaryKey.pfx b/src/Calculator/TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..b10fa3462d7c39f6d32bb1bb41ff26dda365577e
GIT binary patch
literal 2917
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

literal 0
HcmV?d00001