improvements

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://dev.azure.com/codinion/FontAwesome5/_apis/build/status/MartinTopfstedt.FontAwesome5?branchName=master)](https://dev.azure.com/codinion/FontAwesome5/_build/latest?definitionId=11&branchName=master)
 
-WPF (.Net and .Net Core 3.0) and UWP controls for the iconic SVG, font, and CSS toolkit Font Awesome 5.
+WPF (.Net and .Net Core) and UWP controls for the iconic SVG, font, and CSS toolkit Font Awesome 5.
 
 Font Awesome: https://github.com/FortAwesome/Font-Awesome
 

build/build.yml

@@ -65,20 +65,12 @@ steps:
     workingDirectory: '.'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Build: Net Core 3.0'
+  displayName: 'Build: Net Core'
   inputs:
     command: 'build'
-    projects: 'src/FontAwesome5.NetCore30.sln'
+    projects: 'src/FontAwesome5.Net.sln'
     arguments: '--configuration $(buildConfiguration) /p:Version=$(GitVersion.AssemblySemVer);AssemblyVersion=$(GitVersion.AssemblySemVer);FileVersion=$(GitVersion.AssemblySemFileVer)'
 
-- task: VSBuild@1
-  displayName: 'Build: Net 4.0'
-  inputs:
-    solution: 'src/FontAwesome5.Net40.sln'
-    msbuildArgs: '/p:Version=$(GitVersion.AssemblySemVer);AssemblyVersion=$(GitVersion.AssemblySemVer);FileVersion=$(GitVersion.AssemblySemFileVer)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
 - task: VSBuild@1
   displayName: 'Build: UWP'
   inputs:

src/Examples/FontAwesome5.Examples.sln

@@ -15,9 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontAwesome5.Net40.Example"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontAwesome5.NetCore30.Example", "FontAwesome5.NetCore30.Example\FontAwesome5.NetCore30.Example.csproj", "{332373B0-DBF9-4CB5-86A4-DF2D3F873CF7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontAwesome5.Net40", "..\FontAwesome5.Net40\FontAwesome5.Net40.csproj", "{064DF8AB-301D-4A3D-883F-2243DAA66605}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontAwesome5.NetCore30", "..\FontAwesome5.NetCore30\FontAwesome5.NetCore30.csproj", "{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontAwesome5.Net", "..\FontAwesome5.Net\FontAwesome5.Net.csproj", "{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -137,55 +135,34 @@ Global
 		{332373B0-DBF9-4CB5-86A4-DF2D3F873CF7}.Release|x64.Build.0 = Release|Any CPU
 		{332373B0-DBF9-4CB5-86A4-DF2D3F873CF7}.Release|x86.ActiveCfg = Release|Any CPU
 		{332373B0-DBF9-4CB5-86A4-DF2D3F873CF7}.Release|x86.Build.0 = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|ARM.Build.0 = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|x64.Build.0 = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Debug|x86.Build.0 = Debug|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|Any CPU.Build.0 = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|ARM.ActiveCfg = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|ARM.Build.0 = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|ARM64.Build.0 = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|x64.ActiveCfg = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|x64.Build.0 = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|x86.ActiveCfg = Release|Any CPU
-		{064DF8AB-301D-4A3D-883F-2243DAA66605}.Release|x86.Build.0 = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|x64.Build.0 = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Debug|x86.Build.0 = Debug|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|ARM.Build.0 = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|ARM64.Build.0 = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|x64.ActiveCfg = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|x64.Build.0 = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF}.Release|x86.Build.0 = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|ARM.Build.0 = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|ARM64.Build.0 = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|x64.Build.0 = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3DA649D8-590A-4BBD-8181-F01BC81748B7} = {91E6A385-8848-4CE1-BC5C-41D5B79DE86F}
 		{30C458C0-E963-4972-B9D3-8FB51E434F7C} = {91E6A385-8848-4CE1-BC5C-41D5B79DE86F}
-		{064DF8AB-301D-4A3D-883F-2243DAA66605} = {91E6A385-8848-4CE1-BC5C-41D5B79DE86F}
-		{A01EBBAF-6DF2-40B7-80AC-D19750F0B0DF} = {91E6A385-8848-4CE1-BC5C-41D5B79DE86F}
+		{1A59D62E-5831-4D38-92AF-6EAEF5DB3395} = {91E6A385-8848-4CE1-BC5C-41D5B79DE86F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {61A8E116-9C47-41CA-8F8F-B830C6FF7B62}

src/Examples/FontAwesome5.Net40.Example/FontAwesome5.Net40.Example.csproj

@@ -120,9 +120,9 @@
     <Resource Include="FodyWeavers.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\FontAwesome5.Net40\FontAwesome5.Net40.csproj">
-      <Project>{064df8ab-301d-4a3d-883f-2243daa66605}</Project>
-      <Name>FontAwesome5.Net40</Name>
+    <ProjectReference Include="..\..\FontAwesome5.Net\FontAwesome5.Net.csproj">
+      <Project>{1a59d62e-5831-4d38-92af-6eaef5db3395}</Project>
+      <Name>FontAwesome5.Net</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\FontAwesome5\FontAwesome5.csproj">
       <Project>{30c458c0-e963-4972-b9d3-8fb51e434f7c}</Project>

src/Examples/FontAwesome5.NetCore30.Example/FontAwesome5.NetCore30.Example.csproj

@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\FontAwesome5.NetCore30\FontAwesome5.NetCore30.csproj" />
     <ProjectReference Include="..\..\FontAwesome5\FontAwesome5.csproj" />
   </ItemGroup>
 

src/FontAwesome5.NetCore30/Extensions/ControlExtensions.cs → src/FontAwesome.Shared/Extensions/ControlExtensions.cs

@@ -1,10 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+
+#if WINDOWS_UWP
+using Windows.Foundation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Animation;
+#else
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+#endif
 
 namespace FontAwesome5.Extensions
 {
@@ -36,7 +43,7 @@ public static void BeginSpin<T>(this T control)
             }
             else
             {
-                transformGroup.Children.Add(new RotateTransform(0.0));
+                transformGroup.Children.Add(new RotateTransform() { Angle = 0.0 });
                 control.RenderTransform = transformGroup;
                 control.RenderTransformOrigin = new Point(0.5, 0.5);
             }
@@ -54,10 +61,13 @@ public static void BeginSpin<T>(this T control)
             storyboard.Children.Add(animation);
 
             Storyboard.SetTarget(animation, control);
+#if WINDOWS_UWP
+            Storyboard.SetTargetProperty(animation, "(FrameworkElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)");
+#else
             Storyboard.SetTargetProperty(animation,
                 new PropertyPath("(0).(1)[0].(2)", UIElement.RenderTransformProperty,
                     TransformGroup.ChildrenProperty, RotateTransform.AngleProperty));
-
+#endif
             storyboard.Begin();
             control.Resources.Add(SpinnerStoryBoardName, storyboard);
         }
@@ -97,7 +107,7 @@ public static void SetRotation<T>(this T control)
             }
             else
             {
-                transformGroup.Children.Add(new RotateTransform(control.Rotation));
+                transformGroup.Children.Add(new RotateTransform() { Angle = control.Rotation });
                 control.RenderTransform = transformGroup;
                 control.RenderTransformOrigin = new Point(0.5, 0.5);
             }
@@ -125,7 +135,7 @@ public static void SetFlipOrientation<T>(this T control)
             }
             else
             {
-                transformGroup.Children.Add(new ScaleTransform(scaleX, scaleY));
+                transformGroup.Children.Add(new ScaleTransform() { ScaleX = scaleX, ScaleY = scaleY });
                 control.RenderTransform = transformGroup;
                 control.RenderTransformOrigin = new Point(0.5, 0.5);
             }

src/FontAwesome5.Net40/Extensions/EFontAwesomeIconExtensions.cs → src/FontAwesome.Shared/Extensions/EFontAwesomeIconExtensions.cs

@@ -1,13 +1,17 @@
 using FontAwesome5.Extensions;
+#if WINDOWS_UWP
+using Windows.UI.Xaml.Media;
+#else
 using System.Windows.Media;
-
+#endif
 namespace FontAwesome5.Extensions
 {
     /// <summary>
     /// EFontAwesomeIcon extensions
     /// </summary>
     public static class EFontAwesomeIconExtensions
     {
+#if !WINDOWS_UWP
         /// <summary>
         /// Get the Typeface of an icon
         /// </summary>
@@ -17,16 +21,16 @@ public static Typeface GetTypeFace(this EFontAwesomeIcon icon)
             if (info == null)
                 return Fonts.RegularTypeface;
 
-            switch (info.Style)
+            return info.Style switch
             {
-                case EFontAwesomeStyle.Regular: return Fonts.RegularTypeface;
-                case EFontAwesomeStyle.Solid: return Fonts.SolidTypeface;
-                case EFontAwesomeStyle.Brands: return Fonts.BrandsTypeface;
-            }
+                EFontAwesomeStyle.Regular => Fonts.RegularTypeface,
+                EFontAwesomeStyle.Solid => Fonts.SolidTypeface,
+                EFontAwesomeStyle.Brands => Fonts.BrandsTypeface,
 
-            return null;
+                _ => null,
+            };
         }
-
+#endif
         /// <summary>
         /// Get the FontFamily of an icon
         /// </summary>
@@ -35,7 +39,7 @@ public static FontFamily GetFontFamily(this EFontAwesomeIcon icon)
             var info = icon.GetInformationAttribute<FontAwesomeInformationAttribute>();
             if (info == null)
                 return Fonts.RegularFontFamily;
-            
+
             switch (info.Style)
             {
                 case EFontAwesomeStyle.Regular: return Fonts.RegularFontFamily;

src/FontAwesome.Shared/FontAwesome.Shared.projitems

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>2f36f2df-f8b2-49cb-91e7-e5c88e3a96d5</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>FontAwesome.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ControlExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\EFontAwesomeIconExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IFlippable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IRotatable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ISpinable.cs" />
+  </ItemGroup>
+</Project>

src/FontAwesome.Shared/FontAwesome.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>2f36f2df-f8b2-49cb-91e7-e5c88e3a96d5</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="FontAwesome.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

src/FontAwesome5.Net40/IFlippable.cs → src/FontAwesome.Shared/IFlippable.cs

@@ -10,7 +10,9 @@ namespace FontAwesome5
     /// <summary>
     /// Defines the different flip orientations that a icon can have.
     /// </summary>
+    #if !WINDOWS_UWP
     [Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
+    #endif
     public enum EFlipOrientation
     {
         /// <summary>

src/FontAwesome5.NetCore30.sln → src/FontAwesome5.Net.sln

@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5DB18EB6
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FontAwesome5.Generator", "Tools\FontAwesome5.Generator\FontAwesome5.Generator.csproj", "{36BAF672-62DD-46A9-B6E6-1F3B0AA0D84B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontAwesome5.NetCore30", "FontAwesome5.NetCore30\FontAwesome5.NetCore30.csproj", "{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FontAwesome5.Net", "FontAwesome5.Net\FontAwesome5.Net.csproj", "{E3B67831-928E-4B93-8249-3BAB7E52AE3F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,22 +64,22 @@ Global
 		{36BAF672-62DD-46A9-B6E6-1F3B0AA0D84B}.Release|x64.Build.0 = Release|Any CPU
 		{36BAF672-62DD-46A9-B6E6-1F3B0AA0D84B}.Release|x86.ActiveCfg = Release|Any CPU
 		{36BAF672-62DD-46A9-B6E6-1F3B0AA0D84B}.Release|x86.Build.0 = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|x64.Build.0 = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Debug|x86.Build.0 = Debug|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|ARM.Build.0 = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|x64.ActiveCfg = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|x64.Build.0 = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|x86.ActiveCfg = Release|Any CPU
-		{AC444839-F0A4-47CE-B919-B9C1E33EF5D4}.Release|x86.Build.0 = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|ARM.Build.0 = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|x64.Build.0 = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3B67831-928E-4B93-8249-3BAB7E52AE3F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/FontAwesome5.NetCore30/FontAwesome5.NetCore30.csproj → src/FontAwesome5.Net/FontAwesome5.Net.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net40;net462;net472;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
-    <AssemblyName>FontAwesome5.NetCore30</AssemblyName>
+    <AssemblyName>FontAwesome5.Net</AssemblyName>
     <RootNamespace>FontAwesome5</RootNamespace>
+     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
-    <DocumentationFile>$(OutDir)\FontAwesome5.NetCore30.xml</DocumentationFile>
+    <DocumentationFile>$(OutDir)\FontAwesome5.Net.xml</DocumentationFile>
     <Authors>Martin Topfstedt</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright © Codinion 2018</Copyright>
@@ -32,4 +33,6 @@
     <Folder Include="Fonts\" />
   </ItemGroup>
 
+  <Import Project="..\FontAwesome.Shared\FontAwesome.Shared.projitems" Label="Shared" />
+
 </Project>