Skip to content

Commit

Permalink
NP
Browse files Browse the repository at this point in the history
  • Loading branch information
neuecc committed Feb 16, 2024
1 parent 383e756 commit b44d873
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 45 deletions.
41 changes: 33 additions & 8 deletions R3.sln
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp1", "sandbox\MauiApp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R3.Maui", "src\R3.Maui\R3.Maui.csproj", "{F1D6609C-AA33-4099-8932-BADBCB935FBD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameApplication1", "sandbox\MonoGameApplication1\MonoGameApplication1.csproj", "{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoGameApplication1", "sandbox\MonoGameApplication1\MonoGameApplication1.csproj", "{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R3.MonoGame", "src\R3.MonoGame\R3.MonoGame.csproj", "{D754069D-C912-4D71-97CB-9B2DDD2380B4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "R3.MonoGame", "src\R3.MonoGame\R3.MonoGame.csproj", "{D754069D-C912-4D71-97CB-9B2DDD2380B4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "R3.WinUI3", "src\R3.WinUI3\R3.WinUI3.csproj", "{87F12DBB-E32B-49B8-B5F1-5B53B711989B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUI3App1", "sandbox\WinUI3App1\WinUI3App1.csproj", "{CDC17599-81AD-44B9-B4E5-38241147CDA2}"
Expand Down Expand Up @@ -322,20 +323,44 @@ Global
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Debug|x86.Build.0 = Debug|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|Any CPU.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|ARM64.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|ARM64.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x64.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x64.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x86.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x86.Build.0 = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|ARM64.Build.0 = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|x64.ActiveCfg = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|x64.Build.0 = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|x86.ActiveCfg = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Debug|x86.Build.0 = Debug|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|Any CPU.Build.0 = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|ARM64.ActiveCfg = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|ARM64.Build.0 = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|x64.ActiveCfg = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|x64.Build.0 = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|x86.ActiveCfg = Release|Any CPU
{BEF76A77-E2F9-4113-8DC2-DB825964D6EF}.Release|x86.Build.0 = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|ARM64.Build.0 = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|x64.ActiveCfg = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|x64.Build.0 = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|x86.ActiveCfg = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Debug|x86.Build.0 = Debug|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|Any CPU.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|ARM64.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|ARM64.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x64.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x64.Build.0 = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x86.ActiveCfg = Release|Any CPU
{F1D6609C-AA33-4099-8932-BADBCB935FBD}.Release|x86.Build.0 = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|ARM64.ActiveCfg = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|ARM64.Build.0 = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|x64.ActiveCfg = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|x64.Build.0 = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|x86.ActiveCfg = Release|Any CPU
{D754069D-C912-4D71-97CB-9B2DDD2380B4}.Release|x86.Build.0 = Release|Any CPU
{87F12DBB-E32B-49B8-B5F1-5B53B711989B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87F12DBB-E32B-49B8-B5F1-5B53B711989B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87F12DBB-E32B-49B8-B5F1-5B53B711989B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
Expand Down
76 changes: 39 additions & 37 deletions sandbox/WinUI3App1/WinUI3App1.csproj
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>WinUI3App1</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;ARM64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnableMsixTooling>true</EnableMsixTooling>
</PropertyGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>WinUI3App1</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;ARM64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnableMsixTooling>true</EnableMsixTooling>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

<!--
<!--
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored.
-->
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\R3.WinUI3\R3.WinUI3.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\R3.WinUI3\R3.WinUI3.csproj" />
</ItemGroup>

<!--
<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
the Windows App SDK Nuget package has not yet been restored.
-->
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
</PropertyGroup>
</Project>

0 comments on commit b44d873

Please sign in to comment.