Prepare project for Microsoft Store

stephtr · Apr 19, 2020 · b03acc0 · b03acc0
1 parent 576b00c
commit b03acc0
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 37 deletions.
diff --git a/BrightnessSwitch.Package/BrightnessSwitch.Package.wapproj b/BrightnessSwitch.Package/BrightnessSwitch.Package.wapproj
@@ -44,6 +44,26 @@
       <Configuration>Release</Configuration>
       <Platform>AnyCPU</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|AnyCPU">
+      <Configuration>Store</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|ARM">
+      <Configuration>Store</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|ARM64">
+      <Configuration>Store</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|x64">
+      <Configuration>Store</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Store|x86">
+      <Configuration>Store</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@@ -55,53 +75,73 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>de-DE</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <EntryPointProjectUniqueName>..\BrightnessSwitch\BrightnessSwitch.csproj</EntryPointProjectUniqueName>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <PackageCertificateThumbprint>315F1886FE04204590357ECE2ECFB403E162F914</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>75DDB99AA9E685A79A2C124358709AEAA7F4BCAA</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <EntryPointProjectUniqueName>..\BrightnessSwitch\BrightnessSwitch.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Store|ARM64'">
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Store|AnyCPU'">
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Store|x86'">
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Store|x64'">
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Store|ARM'">
+    <AppxBundle>Auto</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <ItemGroup>
@@ -111,6 +151,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
+    <None Include="Package.StoreAssociation.xml" />
     <None Include="BrightnessSwitch.Package_TemporaryKey.pfx" />
     <Content Include="Images\LargeTile.scale-100.png" />
     <Content Include="Images\LargeTile.scale-125.png" />

diff --git a/BrightnessSwitch.Package/Package.appxmanifest b/BrightnessSwitch.Package/Package.appxmanifest
@@ -8,9 +8,9 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="StephanTroyer.BrightnessSwitch"
-    Publisher="CN=Stephan Troyer"
-    Version="1.0.1.0" />
+    Name="2595StephanTroyer.BrightnessSwitch"
+    Publisher="CN=5E1C7B43-8F35-4F79-B41B-3E55190119C0"
+    Version="1.1.0.0" />
 
   <Properties>
     <DisplayName>BrightnessSwitch</DisplayName>
@@ -43,7 +43,7 @@
       <Extensions>
         <desktop:Extension
           Category="windows.startupTask"
-          Executable="BrightnessSwitch.exe"
+          Executable="BrightnessSwitch\BrightnessSwitch.exe"
           EntryPoint="Windows.FullTrustApplication">
           <desktop:StartupTask
             TaskId="BrightnessSwitch"

diff --git a/BrightnessSwitch.sln b/BrightnessSwitch.sln
@@ -19,6 +19,11 @@ Global
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Store|Any CPU = Store|Any CPU
+		Store|ARM = Store|ARM
+		Store|ARM64 = Store|ARM64
+		Store|x64 = Store|x64
+		Store|x86 = Store|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -41,36 +46,41 @@ Global
 		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Release|x64.Build.0 = Release|Any CPU
 		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Release|x86.ActiveCfg = Release|Any CPU
 		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Release|x86.Build.0 = Release|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|Any CPU.Build.0 = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|ARM.ActiveCfg = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|ARM.Build.0 = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|ARM64.ActiveCfg = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|ARM64.Build.0 = Store|Any CPU
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|x64.ActiveCfg = Store|x64
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|x64.Build.0 = Store|x64
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|x86.ActiveCfg = Store|x86
+		{4DBF6252-3072-49D8-8433-1E631F8B7FD9}.Store|x86.Build.0 = Store|x86
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM.ActiveCfg = Debug|ARM
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM.Build.0 = Debug|ARM
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM.Deploy.0 = Debug|ARM
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM64.Build.0 = Debug|ARM64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x64.ActiveCfg = Debug|x64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x64.Build.0 = Debug|x64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x64.Deploy.0 = Debug|x64
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x86.ActiveCfg = Debug|x86
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x86.Build.0 = Debug|x86
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Debug|x86.Deploy.0 = Debug|x86
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM.ActiveCfg = Release|ARM
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM.Build.0 = Release|ARM
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM.Deploy.0 = Release|ARM
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM64.ActiveCfg = Release|ARM64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM64.Build.0 = Release|ARM64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|ARM64.Deploy.0 = Release|ARM64
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x64.ActiveCfg = Release|x64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x64.Build.0 = Release|x64
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x64.Deploy.0 = Release|x64
 		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x86.ActiveCfg = Release|x86
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x86.Build.0 = Release|x86
-		{239B06A5-17E2-410A-83B4-2229F970DA26}.Release|x86.Deploy.0 = Release|x86
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|Any CPU.ActiveCfg = Store|Any CPU
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|Any CPU.Build.0 = Store|Any CPU
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|Any CPU.Deploy.0 = Store|Any CPU
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM.ActiveCfg = Store|ARM
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM.Build.0 = Store|ARM
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM.Deploy.0 = Store|ARM
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM64.ActiveCfg = Store|ARM64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM64.Build.0 = Store|ARM64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|ARM64.Deploy.0 = Store|ARM64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x64.ActiveCfg = Store|x64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x64.Build.0 = Store|x64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x64.Deploy.0 = Store|x64
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x86.ActiveCfg = Store|x86
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x86.Build.0 = Store|x86
+		{239B06A5-17E2-410A-83B4-2229F970DA26}.Store|x86.Deploy.0 = Store|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE