Skip to content

Commit

Permalink
Fixed Maui sample asset project item attributes.
Browse files Browse the repository at this point in the history
  • Loading branch information
kekyo committed Mar 6, 2024
1 parent 0850aef commit df51843
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 1 deletion.
24 changes: 24 additions & 0 deletions Epoxy-build.sln
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Avalonia11", "src\Epo
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Epoxy.Avalonia11", "src\FSharp.Epoxy.Avalonia11\FSharp.Epoxy.Avalonia11.fsproj", "{8890BC8D-034C-4347-89DC-CC221018A378}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.Maui", "src\Epoxy.Core.Maui\Epoxy.Core.Maui.csproj", "{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Maui", "src\Epoxy.Maui\Epoxy.Maui.csproj", "{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.Core.OpenSilver", "src\Epoxy.Core.OpenSilver\Epoxy.Core.OpenSilver.csproj", "{3769F5A2-DB2A-4B34-BCA0-DD8060BE4BFE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Epoxy.OpenSilver", "src\Epoxy.OpenSilver\Epoxy.OpenSilver.csproj", "{32FB1543-CC76-4A2A-9251-72C646EE5AFC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -108,6 +116,22 @@ Global
{8890BC8D-034C-4347-89DC-CC221018A378}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8890BC8D-034C-4347-89DC-CC221018A378}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8890BC8D-034C-4347-89DC-CC221018A378}.Release|Any CPU.Build.0 = Release|Any CPU
{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C1F576F-7AFD-4004-8A50-550C3F2A95F1}.Release|Any CPU.Build.0 = Release|Any CPU
{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60769AB9-21DE-4C7E-90FC-F8ECAA4608B6}.Release|Any CPU.Build.0 = Release|Any CPU
{3769F5A2-DB2A-4B34-BCA0-DD8060BE4BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3769F5A2-DB2A-4B34-BCA0-DD8060BE4BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3769F5A2-DB2A-4B34-BCA0-DD8060BE4BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3769F5A2-DB2A-4B34-BCA0-DD8060BE4BFE}.Release|Any CPU.Build.0 = Release|Any CPU
{32FB1543-CC76-4A2A-9251-72C646EE5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32FB1543-CC76-4A2A-9251-72C646EE5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32FB1543-CC76-4A2A-9251-72C646EE5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32FB1543-CC76-4A2A-9251-72C646EE5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
76 changes: 76 additions & 0 deletions playground/EpoxyHello.Maui/EpoxyHello - Backup.Maui.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\src\Epoxy.Build\build\Epoxy.Build.props" />

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->

<!-- Note for MacCatalyst:
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
When specifying both architectures, use the plural <RuntimeIdentifiers> instead of the singular <RuntimeIdentifier>.
The Mac App Store will NOT accept apps with ONLY maccatalyst-arm64 indicated;
either BOTH runtimes must be indicated or ONLY macatalyst-x64. -->
<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->

<OutputType>Exe</OutputType>
<RootNamespace>EpoxyHello.Maui</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<Nullable>enable</Nullable>

<!-- Display name -->
<ApplicationTitle>EpoxyHello.Maui</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.companyname.epoxyhello.maui</ApplicationId>

<!-- Versions -->
<!--
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
-->

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Epoxy.Maui\Epoxy.Maui.csproj" />
<ProjectReference Include="..\EpoxyHello.Core\EpoxyHello.Core.csproj" />
</ItemGroup>

<Import Project="..\..\src\Epoxy.Build\build\Epoxy.Build.targets" />
<PropertyGroup>
<EpoxyBuildToolingDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\src\Epoxy.Build\bin\$(Configuration)\$(_EB_PlatformName)'))</EpoxyBuildToolingDir>
</PropertyGroup>
</Project>
18 changes: 17 additions & 1 deletion playground/EpoxyHello.Maui/EpoxyHello.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
Expand All @@ -58,6 +57,19 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<None Remove="Resources\AppIcon\appicon.svg" />
<None Remove="Resources\AppIcon\appiconfg.svg" />
<None Remove="Resources\Fonts\OpenSans-Regular.ttf" />
<None Remove="Resources\Fonts\OpenSans-Semibold.ttf" />
<None Remove="Resources\Raw\AboutAssets.txt" />
<None Remove="Resources\Splash\splash.svg" />
</ItemGroup>

<ItemGroup>
<MauiIcon Include="Resources\AppIcon\appiconfg.svg" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
Expand All @@ -69,6 +81,10 @@
<ProjectReference Include="..\EpoxyHello.Core\EpoxyHello.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Folder Include="Resources\Images\" />
</ItemGroup>

<Import Project="..\..\src\Epoxy.Build\build\Epoxy.Build.targets" />
<PropertyGroup>
<EpoxyBuildToolingDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..\src\Epoxy.Build\bin\$(Configuration)\$(_EB_PlatformName)'))</EpoxyBuildToolingDir>
Expand Down
Binary file not shown.

0 comments on commit df51843

Please sign in to comment.