From 97521f174afabb8f7af278b9752006eed2e77744 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Tue, 14 Nov 2017 18:00:44 +0100
Subject: [PATCH] Test project uses same certificate as main App

---
 ModernKeePass/ModernKeePassApp.csproj         |   1 -
 ModernKeePass/ModernKeePass_TemporaryKey.pfx  | Bin 2446 -> 0 bytes
 .../ModernKeePassLib.Test.csproj              |   6 ++-
 .../ModernKeePassLib.Test_TemporaryKey.pfx    | Bin 2446 -> 0 bytes
 ModernKeePassLib.Test/Package.appxmanifest    |  50 +++++-------------
 5 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 ModernKeePass/ModernKeePass_TemporaryKey.pfx
 delete mode 100644 ModernKeePassLib.Test/ModernKeePassLib.Test_TemporaryKey.pfx

diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index 2ffca96..70e832d 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -200,7 +200,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="ModernKeePass_TemporaryKey.pfx" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/ModernKeePass/ModernKeePass_TemporaryKey.pfx b/ModernKeePass/ModernKeePass_TemporaryKey.pfx
deleted file mode 100644
index bfe0f2512c580772d6ab75dd727d98443e6bb9e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2446
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

diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
index cdc0420..975102f 100644
--- a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
+++ b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
@@ -16,11 +16,14 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>ModernKeePassLib.Test_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
     <AppxBundle>Never</AppxBundle>
     <AllowCrossPlatformRetargeting>False</AllowCrossPlatformRetargeting>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PackageCertificateThumbprint>ED3AA34F46D03498F989901C5DB2742B65D72F60</PackageCertificateThumbprint>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -142,7 +145,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="ModernKeePassLib.Test_TemporaryKey.pfx" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test_TemporaryKey.pfx b/ModernKeePassLib.Test/ModernKeePassLib.Test_TemporaryKey.pfx
deleted file mode 100644
index f6250c0470341bcc9cb46ea3c2103b83e5eedf61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2446
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

diff --git a/ModernKeePassLib.Test/Package.appxmanifest b/ModernKeePassLib.Test/Package.appxmanifest
index b6acc3b..82d3b80 100644
--- a/ModernKeePassLib.Test/Package.appxmanifest
+++ b/ModernKeePassLib.Test/Package.appxmanifest
@@ -1,56 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-  
-  <Identity Name="2aac30f7-3bad-4e17-be76-27de378756c9"
-            Publisher="CN=GBE"
-            Version="1.0.0.0" />
-  
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
+  <Identity Name="2aac30f7-3bad-4e17-be76-27de378756c9" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.0.0.0" />
   <Properties>
     <DisplayName>ModernKeePassLib.Test</DisplayName>
-    <PublisherDisplayName>GBE</PublisherDisplayName>
+    <PublisherDisplayName>wismna</PublisherDisplayName>
     <Logo>Images\UnitTestStoreLogo.png</Logo>
     <Description>ModernKeePassLib.Test</Description>
   </Properties>
-  
   <Prerequisites>
     <OSMinVersion>6.3.0</OSMinVersion>
     <OSMaxVersionTested>6.3.0</OSMaxVersionTested>
   </Prerequisites>
-  
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
-  
   <Applications>
-    <Application Id="vstest.executionengine.App" 
-        Executable="vstest.executionengine.appcontainer.exe" 
-        EntryPoint="vstest.executionengine.App">
-        <VisualElements 
-            DisplayName="NoUIEntryPoints"
-            Logo="Images\UnitTestLogo.png"
-            SmallLogo="Images\UnitTestSmallLogo.png"
-            Description="vstest.executionengine.App"
-            ForegroundText="light"
-            BackgroundColor="#0084FF">
-            <SplashScreen Image="Images\UnitTestSplashScreen.png" />
-        </VisualElements>
+    <Application Id="vstest.executionengine.App" Executable="vstest.executionengine.appcontainer.exe" EntryPoint="vstest.executionengine.App">
+      <m2:VisualElements DisplayName="NoUIEntryPoints" Description="vstest.executionengine.App" BackgroundColor="#0084FF" ForegroundText="light" Square150x150Logo="Images\UnitTestLogo.png" Square30x30Logo="Images\UnitTestSmallLogo.png">
+        <m2:SplashScreen Image="Images\UnitTestSplashScreen.png" />
+      </m2:VisualElements>
     </Application>
-
-    <Application Id="vstest.executionengine.x86.App" 
-        Executable="vstest.executionengine.appcontainer.x86.exe" 
-        EntryPoint="vstest.executionengine.x86.App">
-        <VisualElements 
-            DisplayName="NoUIEntryPoints"
-            Logo="Images\UnitTestLogo.png"
-            SmallLogo="Images\UnitTestSmallLogo.png"
-            Description="vstest.executionengine.x86.App"
-            ForegroundText="light"
-            BackgroundColor="#0084FF">
-            <SplashScreen Image="Images\UnitTestSplashScreen.png" />
-        </VisualElements>
+    <Application Id="vstest.executionengine.x86.App" Executable="vstest.executionengine.appcontainer.x86.exe" EntryPoint="vstest.executionengine.x86.App">
+      <VisualElements DisplayName="NoUIEntryPoints" Logo="Images\UnitTestLogo.png" SmallLogo="Images\UnitTestSmallLogo.png" Description="vstest.executionengine.x86.App" ForegroundText="light" BackgroundColor="#0084FF">
+        <SplashScreen Image="Images\UnitTestSplashScreen.png" />
+      </VisualElements>
     </Application>
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
   </Capabilities>
-</Package>
+</Package>
\ No newline at end of file