updated font awesome to 5.15.4,

fixed issue#41
MartinTopfstedt · Nov 22, 2021 · 3c2cc48 · 3c2cc48
1 parent ea45c37
commit 3c2cc48
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 162 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
+# 2.1.5
+- added WinUi support (thanks to David Hovey)
+- Updated FontAwesome v5.15.4
 # 2.1.4
- - Removed ResourceDictionary(FontAwesome5Dictionary.xaml)
- - Added new function for Font saving and loading to Fonts class.
-   - fonts now get saved to temporary directory and referenced from there to prevent memory leak
+- Removed ResourceDictionary(FontAwesome5Dictionary.xaml)
+- Added new function for Font saving and loading to Fonts class.
+- fonts now get saved to temporary directory and referenced from there to prevent memory leak
 # 2.1.3
 - Added ImageSourceSvgConverter
 - Made the Font Families adjustable on the static Fonts class

diff --git a/Font-Awesome b/Font-Awesome
diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
 
 [![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) and UWP controls for the iconic SVG, font, and CSS toolkit Font Awesome 5.
+WPF (.Net and .Net Core) and UWP/WinUI controls for the iconic SVG, font, and CSS toolkit Font Awesome 5.
 
 Font Awesome: https://github.com/FortAwesome/Font-Awesome
 
-+ Current Version: v5.15.3
++ Current Version: v5.15.4
 
 # Getting Started
 

diff --git a/src/Examples/FontAwesome5.Net40.Example/FontAwesome5.Net40.Example.csproj b/src/Examples/FontAwesome5.Net40.Example/FontAwesome5.Net40.Example.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" />
+  <Import Project="..\..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props" Condition="Exists('..\..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,7 +45,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PropertyChanged, Version=3.2.7.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
-      <HintPath>..\packages\PropertyChanged.Fody.3.2.7\lib\net40\PropertyChanged.dll</HintPath>
+      <HintPath>..\..\packages\PropertyChanged.Fody.3.2.7\lib\net40\PropertyChanged.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -134,8 +134,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.6.1.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.1.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.6.1.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.6.1.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PropertyChanged.Fody.3.2.7\build\PropertyChanged.Fody.props'))" />
   </Target>
-  <Import Project="..\packages\Fody.6.1.1\build\Fody.targets" Condition="Exists('..\packages\Fody.6.1.1\build\Fody.targets')" />
+  <Import Project="..\..\packages\Fody.6.1.1\build\Fody.targets" Condition="Exists('..\..\packages\Fody.6.1.1\build\Fody.targets')" />
 </Project>
diff --git a/src/FontAwesome5.Net/FontAwesome5.Net.csproj b/src/FontAwesome5.Net/FontAwesome5.Net.csproj
@@ -1,35 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <TargetFrameworks>net40;net462;net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
-    <UseWPF>true</UseWPF>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
-    <AssemblyName>FontAwesome5.Net</AssemblyName>
-    <RootNamespace>FontAwesome5</RootNamespace>
-     <LangVersion>latest</LangVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net40;net462;net472;netcoreapp3.1;net5.0-windows;net6.0-windows</TargetFrameworks>
+		<UseWPF>true</UseWPF>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+		<AssemblyName>FontAwesome5.Net</AssemblyName>
+		<RootNamespace>FontAwesome5</RootNamespace>
+		<LangVersion>latest</LangVersion>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <DocumentationFile>$(OutDir)\FontAwesome5.Net.xml</DocumentationFile>
-    <Authors>Martin Topfstedt</Authors>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Copyright>Copyright © Codinion 2018</Copyright>
-    <Company>Codinion</Company>
-  </PropertyGroup>
+	<PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+		<Authors>Martin Topfstedt</Authors>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<Copyright>Copyright © Codinion 2018</Copyright>
+		<Company>Codinion</Company>
+	</PropertyGroup>
 
 
-  <ItemGroup>
-    <Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Brands-Regular-400.otf" Link="Fonts\Font Awesome 5 Brands-Regular-400.otf" />
-    <Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Free-Regular-400.otf" Link="Fonts\Font Awesome 5 Free-Regular-400.otf" />
-    <Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Free-Solid-900.otf" Link="Fonts\Font Awesome 5 Free-Solid-900.otf" />
-  </ItemGroup>
+	<ItemGroup>
+		<Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Brands-Regular-400.otf" Link="Fonts\Font Awesome 5 Brands-Regular-400.otf" />
+		<Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Free-Regular-400.otf" Link="Fonts\Font Awesome 5 Free-Regular-400.otf" />
+		<Resource Include="..\..\Font-Awesome\otfs\Font Awesome 5 Free-Solid-900.otf" Link="Fonts\Font Awesome 5 Free-Solid-900.otf" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\FontAwesome5\FontAwesome5.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\FontAwesome5\FontAwesome5.csproj" />
+	</ItemGroup>
 
-  <Import Project="..\FontAwesome.Shared\FontAwesome.Shared.projitems" Label="Shared" />
+	<Import Project="..\FontAwesome.Shared\FontAwesome.Shared.projitems" Label="Shared" />
 
 </Project>
diff --git a/src/FontAwesome5.UWP/FontAwesome5.UWP.csproj b/src/FontAwesome5.UWP/FontAwesome5.UWP.csproj
@@ -26,7 +26,7 @@
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\FontAwesome5.UWP.XML</DocumentationFile>
+	  <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,7 +36,7 @@
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\FontAwesome5.UWP.XML</DocumentationFile>
+	  <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>

diff --git a/src/FontAwesome5.WinUI/FontAwesome5.WinUI.csproj b/src/FontAwesome5.WinUI/FontAwesome5.WinUI.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<DocumentationFile>$(OutDir)\FontAwesome5.WinUI.xml</DocumentationFile>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Authors>Martin Topfstedt</Authors>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Copyright>Copyright © Codinion 2018</Copyright>

diff --git a/src/FontAwesome5/EFontAwesomeIcon.cs b/src/FontAwesome5/EFontAwesomeIcon.cs
@@ -9323,12 +9323,6 @@ public enum EFontAwesomeIcon
 		///<see href="http://fontawesome.com/icons/trello?style=brands" />
 		Brands_Trello,
 
-		/// <summary>
-		/// TripAdvisor
-		/// </summary>
-		///<see href="http://fontawesome.com/icons/tripadvisor?style=brands" />
-		Brands_Tripadvisor,
-
 		/// <summary>
 		/// Tumblr
 		/// </summary>

diff --git a/src/FontAwesome5/FontAwesome5.csproj b/src/FontAwesome5/FontAwesome5.csproj
@@ -1,29 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;netstandard2.1;net40;net5.0</TargetFrameworks>
-    <Company>Codinion</Company>
-    <Authors>Martin Topfstedt</Authors>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard1.4;netstandard2.1;net40;net5.0;net6.0</TargetFrameworks>
+		<Company>Codinion</Company>
+		<Authors>Martin Topfstedt</Authors>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <DocumentationFile>$(OutDir)\FontAwesome5.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../FontAwesome5.NET/Key.snk</AssemblyOriginatorKeyFile>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Copyright>Copyright © Codinion 2018</Copyright>
-  </PropertyGroup>
+	<PropertyGroup>
+		<GenerateDocumentationFile>True</GenerateDocumentationFile>
+	</PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
-    <PackageReference Include="System.Reflection.TypeExtensions">
-      <Version>4.5.0</Version>
-    </PackageReference>
-  </ItemGroup>
+	<PropertyGroup>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>../FontAwesome5.NET/Key.snk</AssemblyOriginatorKeyFile>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<Copyright>Copyright © Codinion 2018</Copyright>
+	</PropertyGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
+		<PackageReference Include="System.Reflection.TypeExtensions">
+			<Version>4.5.0</Version>
+		</PackageReference>
+	</ItemGroup>
 
 </Project>