Skip to content

Commit 716fe7c

Browse files
Foxtrot47Foxtrot47
committed
refactor: sync project configuration with win ui 3 defaults
1 parent a755a9e commit 716fe7c

File tree

3 files changed

+31
-76
lines changed

3 files changed

+31
-76
lines changed

‎Crimson/Crimson.csproj

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,21 @@
99
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
1010
<UseWinUI>true</UseWinUI>
1111
<AssemblyName>Crimson</AssemblyName>
12-
<EnableMsixTooling>true</EnableMsixTooling>
13-
<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
14-
15-
<!--<WindowsPackageType>None</WindowsPackageType>
16-
<UseRidGraph>true</UseRidGraph>-->
12+
<EnableMsixTooling>true</EnableMsixTooling>
13+
<!--<WindowsPackageType>None</WindowsPackageType>-->
14+
<UseRidGraph>true</UseRidGraph>
1715
</PropertyGroup>
18-
<ItemGroup>
19-
<None Remove="Views\CurrentControl.xaml" />
20-
<None Remove="Views\DownloadsPage.xaml" />
21-
<None Remove="Views\GameInfoPage.xaml" />
22-
<None Remove="Views\LibraryPage.xaml" />
23-
<None Remove="Views\LoginPage.xaml" />
24-
<None Remove="Package.appxmanifest" />
25-
<None Remove="Views\SettingsPage.xaml" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<AppxManifest Include="Package.appxmanifest">
29-
<SubType>Designer</SubType>
30-
</AppxManifest>
31-
</ItemGroup>
3216

17+
<ItemGroup>
18+
<Content Include="Assets\SplashScreen.scale-200.png" />
19+
<Content Include="Assets\LockScreenLogo.scale-200.png" />
20+
<Content Include="Assets\Square150x150Logo.scale-200.png" />
21+
<Content Include="Assets\Square44x44Logo.scale-200.png" />
22+
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
23+
<Content Include="Assets\StoreLogo.png" />
24+
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
25+
</ItemGroup>
26+
3327
<ItemGroup>
3428
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
3529
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.230907" />
@@ -45,49 +39,21 @@
4539
<Manifest Include="$(ApplicationManifest)" />
4640
</ItemGroup>
4741

48-
<!--
42+
<!--
4943
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
5044
Tools extension to be activated for this project even if the Windows App SDK Nuget
5145
package has not yet been restored.
5246
-->
53-
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
54-
<ProjectCapability Include="Msix" />
55-
</ItemGroup>
56-
<ItemGroup>
57-
<Page Update="Views\CurrentDownloadControl.xaml">
58-
<Generator>MSBuild:Compile</Generator>
59-
</Page>
60-
</ItemGroup>
61-
<ItemGroup>
62-
<Page Update="Views\DownloadsPage.xaml">
63-
<Generator>MSBuild:Compile</Generator>
64-
</Page>
65-
</ItemGroup>
66-
<ItemGroup>
67-
<Page Update="Views\GameInfoPage.xaml">
68-
<Generator>MSBuild:Compile</Generator>
69-
</Page>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<Page Update="Views\LibraryPage.xaml">
73-
<Generator>MSBuild:Compile</Generator>
74-
</Page>
75-
</ItemGroup>
76-
<ItemGroup>
77-
<Folder Include="Controls\" />
78-
</ItemGroup>
79-
<ItemGroup>
80-
<Page Update="Views\LoginPage.xaml">
81-
<Generator>MSBuild:Compile</Generator>
82-
</Page>
47+
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
48+
<ProjectCapability Include="Msix"/>
8349
</ItemGroup>
8450

85-
<!--
51+
<!--
8652
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
8753
Explorer "Package and Publish" context menu entry to be enabled for this project even if
8854
the Windows App SDK Nuget package has not yet been restored.
8955
-->
90-
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
91-
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
92-
</PropertyGroup>
56+
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
57+
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
58+
</PropertyGroup>
9359
</Project>

‎Crimson/app.manifest

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
33
<assemblyIdentity version="1.0.0.0" name="Crimson.app"/>
44

5+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
6+
<application>
7+
<!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10.
8+
It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
9+
For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
10+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
11+
</application>
12+
</compatibility>
13+
514
<application xmlns="urn:schemas-microsoft-com:asm.v3">
615
<windowsSettings>
7-
<!-- The combination of below two tags have the following effect:
8-
1) Per-Monitor for >= Windows 10 Anniversary Update
9-
2) System < Windows 10 Anniversary Update
10-
-->
11-
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
12-
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
16+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
1317
</windowsSettings>
1418
</application>
15-
</assembly>
19+
</assembly>

‎Crimson/launchSettings.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)