Fixed package builds for x86 and arm64. Changed app identity in manifest

microsoft · May 16, 2024 · c5a6ab7 · c5a6ab7
1 parent 7373dda
commit c5a6ab7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 76 deletions.
diff --git a/Sample Applications/WPFGallery.DesktopWap/Package.appxmanifest b/Sample Applications/WPFGallery.DesktopWap/Package.appxmanifest
@@ -7,19 +7,18 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="3c481b40-a233-4435-a941-c37082a63dc7"
-    Publisher="CN=WPF-Gallery-Test"
-    Version="1.0.4.0" />
+    Name="Microsoft.WPFGallery"
+    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+    Version="1.0.8.0" />
 
   <Properties>
-    <DisplayName>WPF Gallery</DisplayName>
-    <PublisherDisplayName>dipeshkumar</PublisherDisplayName>
+    <DisplayName>WPF Gallery Preview</DisplayName>
+    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.22621.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>
@@ -31,8 +30,8 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="WPF Gallery"
-        Description="WPF Gallery"
+        DisplayName="WPF Gallery Preview"
+        Description="WPF Gallery Preview"
         BackgroundColor="transparent"
         Square150x150Logo="Images\Square150x150Logo.png"
         Square44x44Logo="Images\Square44x44Logo.png">

diff --git a/Sample Applications/WPFGallery.DesktopWap/WPFGallery.DesktopWap.Package.wapproj b/Sample Applications/WPFGallery.DesktopWap/WPFGallery.DesktopWap.Package.wapproj
@@ -20,14 +20,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -36,14 +28,6 @@
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@@ -56,41 +40,28 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <NoWarn>$(NoWarn);NU1702</NoWarn>
-    <DependsOnNETStandard>false</DependsOnNETStandard>
     <EntryPointProjectUniqueName>..\WPFGallery\WPFGallery.csproj</EntryPointProjectUniqueName>
-    <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <PackageCertificateKeyFile>test-cert\WPF-Gallery-Test.pfx</PackageCertificateKeyFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <AppInstallerUri>C:\</AppInstallerUri>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
+    <DependsOnNETStandard>False</DependsOnNETStandard>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
@@ -139,6 +110,6 @@
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\WPFGallery\WPFGallery.csproj" SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="..\WPFGallery\WPFGallery.csproj" SkipGetTargetFrameworkProperties="True" />
   </ItemGroup>
 </Project>
diff --git a/Sample Applications/WPFGallery/WPFGallery.DesktopWap.sln b/Sample Applications/WPFGallery/WPFGallery.DesktopWap.sln
@@ -9,59 +9,35 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WPFGallery.DesktopWap.Packa
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|Any CPU.Build.0 = Debug|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|ARM.ActiveCfg = Debug|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|ARM.Build.0 = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|ARM64.ActiveCfg = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|ARM64.Build.0 = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|x64.ActiveCfg = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|x64.Build.0 = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|x86.ActiveCfg = Debug|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Debug|x86.Build.0 = Debug|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|Any CPU.ActiveCfg = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|Any CPU.Build.0 = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM.ActiveCfg = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM.Build.0 = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM64.ActiveCfg = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM64.Build.0 = Release|x64
+		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM64.ActiveCfg = Release|ARM64
+		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|ARM64.Build.0 = Release|ARM64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x64.ActiveCfg = Release|x64
 		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x64.Build.0 = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x86.ActiveCfg = Release|x64
-		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x86.Build.0 = Release|x64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|Any CPU.Build.0 = Debug|x64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM.ActiveCfg = Debug|ARM
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM.Build.0 = Debug|ARM
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM.Deploy.0 = Debug|ARM
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x86.ActiveCfg = Release|x86
+		{249DB69E-5516-43B8-A159-4071258F6B75}.Release|x86.Build.0 = Release|x86
+		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.ActiveCfg = Debug|x64
+		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.Build.0 = Debug|x64
+		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|ARM64.Deploy.0 = Debug|x64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x64.ActiveCfg = Debug|x64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x64.Build.0 = Debug|x64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x64.Deploy.0 = Debug|x64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x86.ActiveCfg = Debug|x86
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x86.Build.0 = Debug|x86
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Debug|x86.Deploy.0 = Debug|x86
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM.ActiveCfg = Release|ARM
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM.Build.0 = Release|ARM
-		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM.Deploy.0 = Release|ARM
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM64.ActiveCfg = Release|ARM64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM64.Build.0 = Release|ARM64
 		{C652518A-D79A-4CEC-B902-0093B93A8CEB}.Release|ARM64.Deploy.0 = Release|ARM64

diff --git a/Sample Applications/WPFGallery/WPFGallery.csproj b/Sample Applications/WPFGallery/WPFGallery.csproj
@@ -6,9 +6,9 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UseWPF>true</UseWPF>
-		<PlatformTarget>x64</PlatformTarget>
-		<Platforms>x64</Platforms>
+		<Platforms>x86;x64;ARM64</Platforms> 
 		<StartupObject>WPFGallery.App</StartupObject>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
 	</PropertyGroup>