From 6b45001dade9475d36aab88ef9e0d73977ddd3fb Mon Sep 17 00:00:00 2001
From: devsko <devsko@users.noreply.github.com>
Date: Wed, 13 Nov 2024 01:32:02 +0100
Subject: [PATCH] Add support for Modern UWP (#12)

* Fixing uap content files

* Add modern UWP, add font resource content files manually

* Fix AOT

* Only copy fonts to executables and don't bother packaging projects

* Make platform check more generic

* Asset path changed

---------

Co-authored-by: Dawei Huang <davidxuang@live.com>
---
 FluentIcons.Uwp/FluentIcons.Uwp.csproj          | 17 +++++++++++++----
 FluentIcons.Uwp/SymbolIcon.cs                   |  2 +-
 FluentIcons.Uwp/SymbolIconSource.cs             |  2 +-
 .../FluentIcons.Uwp.props                       |  7 +++++++
 .../FluentIcons.Uwp.targets                     |  2 ++
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.props
 create mode 100644 FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.targets

diff --git a/FluentIcons.Uwp/FluentIcons.Uwp.csproj b/FluentIcons.Uwp/FluentIcons.Uwp.csproj
index f1b04e0..34a9452 100644
--- a/FluentIcons.Uwp/FluentIcons.Uwp.csproj
+++ b/FluentIcons.Uwp/FluentIcons.Uwp.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">
-      $(TargetFrameworks);uap10.0.17763.0
+      $(TargetFrameworks);uap10.0.17763.0;net8.0-windows10.0.26100.0
     </TargetFrameworks>
     <TargetFrameworks>$(TargetFrameworks);net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-macos</TargetFrameworks>
     <Description>FluentUI System Icons control library for UWP.</Description>
@@ -14,7 +14,7 @@
   <Choose>
     <When Condition="$(TargetFramework.StartsWith('uap'))">
       <PropertyGroup>
-        <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+        <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
       </PropertyGroup>
 
@@ -23,6 +23,15 @@
       </ItemGroup>
     </When>
 
+    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+      <PropertyGroup>
+        <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+        <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+        <UseUwp>true</UseUwp>
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+      </PropertyGroup>
+    </When>
+
     <Otherwise>
       <ItemGroup>
         <ProjectReference Include="..\FluentIcons.Uno\FluentIcons.Uno.csproj" ExactVersion="true" />
@@ -46,4 +55,4 @@
       PackagePath="content-transitive/$(PackageId)/Assets" />
     <None Include="VisualStudioToolsManifest.xml" Pack="True" PackagePath="tools" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/FluentIcons.Uwp/SymbolIcon.cs b/FluentIcons.Uwp/SymbolIcon.cs
index 6666f62..f5bbb3d 100644
--- a/FluentIcons.Uwp/SymbolIcon.cs
+++ b/FluentIcons.Uwp/SymbolIcon.cs
@@ -154,7 +154,7 @@ private static void OnMirroredWhenRightToLeftChanged(DependencyObject sender, De
 }
 
 [MarkupExtensionReturnType(ReturnType = typeof(SymbolIcon))]
-public class SymbolIconExtension : MarkupExtension
+public partial class SymbolIconExtension : MarkupExtension
 {
     public Symbol? Symbol { get; set; }
     public IconVariant? IconVariant { get; set; }
diff --git a/FluentIcons.Uwp/SymbolIconSource.cs b/FluentIcons.Uwp/SymbolIconSource.cs
index 74d129a..ab62f55 100644
--- a/FluentIcons.Uwp/SymbolIconSource.cs
+++ b/FluentIcons.Uwp/SymbolIconSource.cs
@@ -126,7 +126,7 @@ private static void OnMirroredWhenRightToLeftChanged(DependencyObject sender, De
 }
 
 [MarkupExtensionReturnType(ReturnType = typeof(SymbolIconSource))]
-public class SymbolIconSourceExtension : MarkupExtension
+public partial class SymbolIconSourceExtension : MarkupExtension
 {
     public Symbol? Symbol { get; set; }
     public IconVariant? IconVariant { get; set; }
diff --git a/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.props b/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.props
new file mode 100644
index 0000000..0d23b10
--- /dev/null
+++ b/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.props
@@ -0,0 +1,7 @@
+<Project>
+
+  <ItemGroup Condition="'$(UseUwp)' == 'true' and '$(OutputType)' == 'WinExe'">
+    <Content Include="$(MSBuildThisFileDirectory)..\..\content-transitive\**" Visible="false" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.targets b/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.targets
new file mode 100644
index 0000000..c1df222
--- /dev/null
+++ b/FluentIcons.Uwp/build/net8.0-windows10.0.26100.0/FluentIcons.Uwp.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
\ No newline at end of file