Skip to content

Commit 76dfedb

Browse files
committed
chore(package): Configure MSIX packaging and update the app manifest and resources```
- Update Package.appxmanifest with fixed DevTools app information - Added release configuration files and packaging-related MSBuild configurations - Add MSIX packaging product and script gitignore rules Update project properties to support multi-platform desktop packaging - Replace all application icon resource files
1 parent 557b120 commit 76dfedb

12 files changed

Lines changed: 148 additions & 21 deletions

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,22 @@ node_modules/
126126
# JetBrains Rider local history
127127
.idea/.idea.LocalHistory/
128128

129+
# MSIX / APPX packaging build output
130+
**/AppPackages/
131+
*.msix
132+
*.msixbundle
133+
*.msixupload
134+
*.appx
135+
*.appxbundle
136+
*.appxupload
137+
*.appxsym
138+
*.msixsym
139+
140+
# MSIX generated install scripts and resources
141+
**/Add-AppDevPackage.ps1
142+
**/Add-AppDevPackage.resources/
143+
**/TelemetryDependencies/
144+
129145
# If .vs was already committed, remove it from the repo with:
130146
# git rm -r --cached .vs && git commit -m "Remove .vs from repo"
131147

DevTools.Package/DevTools.Package.wapproj

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" InitialTargets="RestoreDevTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
4-
<VisualStudioVersion>15.0</VisualStudioVersion>
4+
<VisualStudioVersion>17.0</VisualStudioVersion>
55
</PropertyGroup>
66
<ItemGroup Label="ProjectConfigurations">
77
<ProjectConfiguration Include="Debug|x64">
@@ -30,31 +30,83 @@
3030
</ProjectConfiguration>
3131
</ItemGroup>
3232
<PropertyGroup>
33+
<WapProjPath Condition="'$(WapProjPath)'=='' and '$(MSBuildExtensionsPath32)'!=''">$(MSBuildExtensionsPath32)\Microsoft\DesktopBridge\</WapProjPath>
34+
<WapProjPath Condition="'$(WapProjPath)'=='' and '$(VSInstallDir)'!=''">$(VSInstallDir)MSBuild\Microsoft\DesktopBridge\</WapProjPath>
3335
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
3436
</PropertyGroup>
3537
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
3638
<PropertyGroup>
37-
<ProjectGuid>a1b2c3d4-e5f6-7890-abcd-ef1234567890</ProjectGuid>
39+
<ProjectGuid>{5C866C20-228F-4EE5-9CA1-49CA0DE26E4E}</ProjectGuid>
3840
<TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
3941
<TargetPlatformMinVersion>10.0.26100.0</TargetPlatformMinVersion>
4042
<DefaultLanguage>en-US</DefaultLanguage>
43+
<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
4144
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
4245
<GenerateAppInstallerFile>false</GenerateAppInstallerFile>
4346
<AppxAutoIncrementPackageRevision>false</AppxAutoIncrementPackageRevision>
4447
<AppxSymbolPackageEnabled>false</AppxSymbolPackageEnabled>
45-
<GenerateTestArtifacts>false</GenerateTestArtifacts>
46-
<AppxBundle>Never</AppxBundle>
48+
<GenerateTestArtifacts>true</GenerateTestArtifacts>
4749
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
50+
<EntryPointProjectUniqueName>..\DevTools.csproj</EntryPointProjectUniqueName>
51+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
52+
<_IsGeneratingAppxPackage>true</_IsGeneratingAppxPackage>
53+
<PlatformTarget>$(Platform)</PlatformTarget>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Platform)' == 'x64'">
56+
<AppxBundle>Never</AppxBundle>
57+
<AppxPackageArchitecture>x64</AppxPackageArchitecture>
58+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Platform)' == 'x86'">
61+
<AppxBundle>Never</AppxBundle>
62+
<AppxPackageArchitecture>x86</AppxPackageArchitecture>
63+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
64+
</PropertyGroup>
65+
<PropertyGroup Condition="'$(Platform)' == 'arm64'">
66+
<AppxBundle>Never</AppxBundle>
67+
<AppxPackageArchitecture>arm64</AppxPackageArchitecture>
68+
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
71+
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
72+
<AppxPackageSigningTimestampServerUrl>http://timestamp.digicert.com</AppxPackageSigningTimestampServerUrl>
73+
<AppxHashAlgorithm>SHA256</AppxHashAlgorithm>
4874
</PropertyGroup>
4975
<ItemGroup>
5076
<AppxManifest Include="Package.appxmanifest">
5177
<SubType>Designer</SubType>
5278
</AppxManifest>
5379
</ItemGroup>
5480
<ItemGroup>
55-
<ApplicationReference Include="..\DevTools.csproj">
56-
<TargetProject>DevTools</TargetProject>
57-
</ApplicationReference>
81+
<Content Include="Images\StoreLogo.png" />
82+
<Content Include="Images\Square150x150Logo.png" />
83+
<Content Include="Images\Square44x44Logo.png" />
84+
<Content Include="Images\Wide310x150Logo.png" />
85+
<Content Include="Images\Square71x71Logo.png" />
86+
<Content Include="Images\Square310x310Logo.png" />
87+
<Content Include="Images\SplashScreen.png" />
88+
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="..\DevTools.csproj" />
5891
</ItemGroup>
5992
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
93+
<Target Name="RestoreDevTools">
94+
<Message Importance="high" Text="RestoreDevTools: Platform=$(Platform), Configuration=$(Configuration)" />
95+
<Exec Command="dotnet restore ..\DevTools.csproj" />
96+
</Target>
97+
<Target Name="BeforeBuild">
98+
<Message Importance="high" Text="BeforeBuild: Platform=$(Platform), RuntimeIdentifier=$(RuntimeIdentifier), AppxPackageArchitecture=$(AppxPackageArchitecture)" />
99+
<PropertyGroup>
100+
<_RuntimeIdentifier Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</_RuntimeIdentifier>
101+
<_RuntimeIdentifier Condition="'$(_RuntimeIdentifier)' == ''">win-$(Platform)</_RuntimeIdentifier>
102+
</PropertyGroup>
103+
<Message Importance="high" Text="BeforeBuild: _RuntimeIdentifier=$(_RuntimeIdentifier)" />
104+
<Exec Command="dotnet restore ..\DevTools.csproj" />
105+
<MakeDir Directories="..\obj\wappublish\$(_RuntimeIdentifier)" />
106+
<Copy SourceFiles="..\obj\project.assets.json" DestinationFolder="..\obj\wappublish\$(_RuntimeIdentifier)" SkipUnchangedFiles="true" Condition="Exists('..\obj\project.assets.json')" />
107+
<Copy SourceFiles="..\obj\DevTools.csproj.nuget.g.props" DestinationFolder="..\obj\wappublish\$(_RuntimeIdentifier)" SkipUnchangedFiles="true" Condition="Exists('..\obj\DevTools.csproj.nuget.g.props')" />
108+
<Copy SourceFiles="..\obj\DevTools.csproj.nuget.g.targets" DestinationFolder="..\obj\wappublish\$(_RuntimeIdentifier)" SkipUnchangedFiles="true" Condition="Exists('..\obj\DevTools.csproj.nuget.g.targets')" />
109+
<Copy SourceFiles="..\obj\DevTools.csproj.nuget.dgspec.json" DestinationFolder="..\obj\wappublish\$(_RuntimeIdentifier)" SkipUnchangedFiles="true" Condition="Exists('..\obj\DevTools.csproj.nuget.dgspec.json')" />
110+
<Message Importance="high" Text="BeforeBuild: Copied files to ..\obj\wappublish\$(_RuntimeIdentifier)" />
111+
</Target>
60112
</Project>
-1.31 MB
Loading
-1.46 MB
Loading
-1.38 MB
Loading
-1.47 MB
Loading
-1.47 MB
Loading
-1.47 MB
Loading
-1.44 MB
Loading

DevTools.Package/Package.appxmanifest

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
55
IgnorableNamespaces="uap rescap">
66

7-
<Identity Name="$PACKAGE_NAME$"
8-
Publisher="$PUBLISHER_ID$"
9-
Version="$VERSION$"
10-
ProcessorArchitecture="$ARCHITECTURE$" />
7+
<Identity Name="DevTools"
8+
Publisher="CN=Sunquakes"
9+
Version="1.0.0.0"
10+
ProcessorArchitecture="neutral" />
1111

1212
<Properties>
13-
<DisplayName>$DISPLAY_NAME$</DisplayName>
13+
<DisplayName>DevTools Pro</DisplayName>
1414
<PublisherDisplayName>Sunquakes</PublisherDisplayName>
1515
<Logo>Images\StoreLogo.png</Logo>
16-
<Description>Developer Tools Collection</Description>
16+
<Description>A collection of developer tools for everyday tasks</Description>
1717
</Properties>
1818

1919
<Dependencies>
@@ -29,8 +29,8 @@
2929
<Application Id="App"
3030
Executable="DevTools.exe"
3131
EntryPoint="Windows.FullTrustApplication">
32-
<uap:VisualElements DisplayName="$DISPLAY_NAME$"
33-
Description="Developer Tools Collection"
32+
<uap:VisualElements DisplayName="DevTools Pro"
33+
Description="A collection of developer tools for everyday tasks"
3434
BackgroundColor="transparent"
3535
Square150x150Logo="Images\Square150x150Logo.png"
3636
Square44x44Logo="Images\Square44x44Logo.png">

0 commit comments

Comments
 (0)