Merge pull request #7 from srbala/wsl-updates

Code cleanup and rebuild
AlmaLinux · Oct 18, 2021 · ebe026e · ebe026e
2 parents f416a98 + b45d338
commit ebe026e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/WSL-DistroLauncher/DistroLauncher-Appx/AlmaLinux.appxmanifest b/WSL-DistroLauncher/DistroLauncher-Appx/AlmaLinux.appxmanifest
@@ -4,7 +4,7 @@
   <mp:PhoneIdentity PhoneProductId="160867c6-4e75-4e36-85c6-1543de07d5f3" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>AlmaLinux 8</DisplayName>
-    <PublisherDisplayName>AlmaLinux OS Project (Testing)</PublisherDisplayName>
+    <PublisherDisplayName>AlmaLinux OS WSL</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>

diff --git a/WSL-DistroLauncher/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj b/WSL-DistroLauncher/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj
@@ -48,15 +48,21 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>DistroLauncher-Appx_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <PackageCertificateThumbprint>03F8E4EC11592527858D3BAEE9B0497ADEF67B17</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>8FB099224B3D3A5DDD89226021174934AE970CE0</PackageCertificateThumbprint>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
+    <AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxPackageDir>$(SolutionDir)\$(platform)\$(Configuration)\AlmaLinux-Appx\</AppxPackageDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>

diff --git a/WSL-DistroLauncher/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters b/WSL-DistroLauncher/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj.filters
@@ -170,8 +170,5 @@
   <ItemGroup>
     <CustomBuild Include="$(targetname)" />
     <CustomBuild Include="$(targetname)" />
-    <CustomBuild Include="$(targetname)" />
-    <CustomBuild Include="$(targetname)" />
-    <CustomBuild Include="$(targetname)" />
   </ItemGroup>
 </Project>
diff --git a/WSL-DistroLauncher/DistroLauncher/DistroLauncher.vcxproj b/WSL-DistroLauncher/DistroLauncher/DistroLauncher.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DistroLauncher</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
-    <ProjectName>AlmaLinux8</ProjectName>
+    <ProjectName>launcher</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">