From 1eb4cc09aa9681a39eabd39354f175ee64bc852e Mon Sep 17 00:00:00 2001
From: Rambalac <rambalac+github@gmail.com>
Date: Wed, 12 Apr 2017 13:04:39 +0900
Subject: [PATCH] cleanup

---
 GMaster.Tests/GMaster.Tests.csproj                         | 7 +++----
 .../{MenuSetHelperTests.cs => MenuSetHelperTestsGh3.cs}    | 3 +--
 GMaster.Tests/Package.appxmanifest                         | 2 +-
 Tools.Tests/Tools.Tests.csproj                             | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename GMaster.Tests/{MenuSetHelperTests.cs => MenuSetHelperTestsGh3.cs} (98%)

diff --git a/GMaster.Tests/GMaster.Tests.csproj b/GMaster.Tests/GMaster.Tests.csproj
index d08b9e0..a12aa07 100644
--- a/GMaster.Tests/GMaster.Tests.csproj
+++ b/GMaster.Tests/GMaster.Tests.csproj
@@ -16,12 +16,13 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>GMaster.Tests_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>53B49B4FC55D94637F47667285A1871D45D6A8FE</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>434A2E416E51CE5E43F0E054547009F1E9037A98</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -94,7 +95,6 @@
   </PropertyGroup>
   <ItemGroup>
     <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <None Include="GMaster.Tests_StoreKey.pfx" />
     <None Include="project.json" />
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
@@ -116,7 +116,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="GMaster.Tests_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="TestMenuSetGH5.xml" />
diff --git a/GMaster.Tests/MenuSetHelperTests.cs b/GMaster.Tests/MenuSetHelperTestsGh3.cs
similarity index 98%
rename from GMaster.Tests/MenuSetHelperTests.cs
rename to GMaster.Tests/MenuSetHelperTestsGh3.cs
index da1981f..4f68a71 100644
--- a/GMaster.Tests/MenuSetHelperTests.cs
+++ b/GMaster.Tests/MenuSetHelperTestsGh3.cs
@@ -10,7 +10,7 @@
     using Windows.ApplicationModel;
     using Xunit;
 
-    public class MenuSetHelperTestsGh3
+    public class MenuSetHelperTests
     {
         private MenuSet menuset;
 
@@ -52,6 +52,5 @@ public async Task TestGH5()
             Assert.Equal(2, menuset.LiveviewQuality.Count);
             Assert.True(menuset.LiveviewQuality.Any(q => q.Value == "vga"));
         }
-
     }
 }
\ No newline at end of file
diff --git a/GMaster.Tests/Package.appxmanifest b/GMaster.Tests/Package.appxmanifest
index 316e126..7cb7fbd 100644
--- a/GMaster.Tests/Package.appxmanifest
+++ b/GMaster.Tests/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="51338Rambalac.GMaster" Publisher="CN=92765C0E-C69D-491B-9315-91859F5319B9" Version="1.4.0.0" />
+  <Identity Name="51338Rambalac.GMaster" Publisher="CN=Rambalac" Version="1.4.0.0" />
   <mp:PhoneIdentity PhoneProductId="7cbf77c9-7a56-4d0b-9505-882ff0d0c31f" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>GMaster</DisplayName>
diff --git a/Tools.Tests/Tools.Tests.csproj b/Tools.Tests/Tools.Tests.csproj
index 6bcc7a2..8ffc400 100644
--- a/Tools.Tests/Tools.Tests.csproj
+++ b/Tools.Tests/Tools.Tests.csproj
@@ -16,8 +16,10 @@
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Tools.Tests_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
+    <PackageCertificateThumbprint>434A2E416E51CE5E43F0E054547009F1E9037A98</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -111,7 +113,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="Tools.Tests_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\UnitTestApp.rd.xml" />