Merge pull request #32 from MartinTopfstedt/develop

Develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.1
+- Updated FontAwesome v5.15.3
+- Updated UWP Min Target to: 10.0.10240.0
+- Updated UWP Target to: 10.0.19041.0
 # 2.0.0
 - Added .Net Core 3.0 support
 - Updated UWP Target Version to 17763

README.md

@@ -6,7 +6,7 @@ WPF (.Net and .Net Core) and UWP controls for the iconic SVG, font, and CSS tool
 
 Font Awesome: https://github.com/FortAwesome/Font-Awesome
 
-+ Current Version: v5.15.2
++ Current Version: v5.15.3
 
 # Getting Started
 

build/build.yml

@@ -26,10 +26,10 @@ steps:
     BuildVersion: $(GitVersion.NuGetVersionV2)
 
 - task: UseDotNet@2
-  displayName: 'Install .NET Core 3.x'
+  displayName: 'Install .NET Core'
   inputs:
     packageType: 'sdk'
-    version: '3.x'
+    version: '5.x'
     includePreviewVersions: true
     performMultiLevelLookup: true
 

src/FontAwesome5.UWP/FontAwesome5.UWP.csproj

@@ -11,8 +11,8 @@
     <AssemblyName>FontAwesome5.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

src/FontAwesome5/FontAwesome.cs

@@ -17,7 +17,7 @@ internal static class FontAwesome
 			{EFontAwesomeIcon.Solid_AddressBook, new FontAwesomeInformation("Address Book", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M436 160c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-20V48c0-26.5-21.5-48-48-48H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h320c26.5 0 48-21.5 48-48v-48h20c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-20v-64h20c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-20v-64h20zm-228-32c35.3 0 64 28.7 64 64s-28.7 64-64 64-64-28.7-64-64 28.7-64 64-64zm112 236.8c0 10.6-10 19.2-22.4 19.2H118.4C106 384 96 375.4 96 364.8v-19.2c0-31.8 30.1-57.6 67.2-57.6h5c12.3 5.1 25.7 8 39.8 8s27.6-2.9 39.8-8h5c37.1 0 67.2 25.8 67.2 57.6v19.2z", 448, 512))},
 			{EFontAwesomeIcon.Solid_AddressCard, new FontAwesomeInformation("Address Card", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-352 96c35.3 0 64 28.7 64 64s-28.7 64-64 64-64-28.7-64-64 28.7-64 64-64zm112 236.8c0 10.6-10 19.2-22.4 19.2H86.4C74 384 64 375.4 64 364.8v-19.2c0-31.8 30.1-57.6 67.2-57.6h5c12.3 5.1 25.7 8 39.8 8s27.6-2.9 39.8-8h5c37.1 0 67.2 25.8 67.2 57.6v19.2zM512 312c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16z", 576, 512))},
 			{EFontAwesomeIcon.Solid_Adjust, new FontAwesomeInformation("adjust", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M8 256c0 136.966 111.033 248 248 248s248-111.034 248-248S392.966 8 256 8 8 119.033 8 256zm248 184V72c101.705 0 184 82.311 184 184 0 101.705-82.311 184-184 184z", 512, 512))},
-			{EFontAwesomeIcon.Solid_AirFreshener, new FontAwesomeInformation("Air Freshener", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M378.94 321.41L284.7 224h49.22c15.3 0 23.66-16.6 13.86-27.53L234.45 69.96c3.43-6.61 5.55-14 5.55-21.96 0-26.51-21.49-48-48-48s-48 21.49-48 48c0 7.96 2.12 15.35 5.55 21.96L36.22 196.47C26.42 207.4 34.78 224 50.08 224H99.3L5.06 321.41C-6.69 333.56 3.34 352 21.7 352H160v32H48c-8.84 0-16 7.16-16 16v96c0 8.84 7.16 16 16 16h288c8.84 0 16-7.16 16-16v-96c0-8.84-7.16-16-16-16H224v-32h138.3c18.36 0 28.39-18.44 16.64-30.59zM192 31.98c8.85 0 16.02 7.17 16.02 16.02 0 8.84-7.17 16.02-16.02 16.02S175.98 56.84 175.98 48c0-8.85 7.17-16.02 16.02-16.02zM304 432v32H80v-32h224z", 384, 512))},
+			{EFontAwesomeIcon.Solid_AirFreshener, new FontAwesomeInformation("Air Freshener", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M224 160H96C43 160 0 203 0 256V480C0 497.625 14.375 512 32 512H288C305.625 512 320 497.625 320 480V256C320 203 277 160 224 160ZM160 416C115.875 416 80 380.125 80 336S115.875 256 160 256S240 291.875 240 336S204.125 416 160 416ZM224 32C224 14.375 209.625 0 192 0H128C110.375 0 96 14.375 96 32V128H224V32ZM381.781 51.578C383 50.969 384 49.359 384 48C384 46.625 383 45.031 381.781 44.422L352 32L339.562 2.219C338.969 1 337.375 0 336 0S333.031 1 332.406 2.219L320 32L290.219 44.422C289 45.031 288 46.625 288 48C288 49.359 289 50.969 290.219 51.578L320 64L332.406 93.781C333.031 95 334.625 96 336 96S338.969 95 339.562 93.781L352 64L381.781 51.578ZM448 64L460.406 93.781C461.031 95 462.625 96 464 96S466.969 95 467.562 93.781L480 64L509.781 51.578C511 50.969 512 49.359 512 48C512 46.625 511 45.031 509.781 44.422L480 32L467.562 2.219C466.969 1 465.375 0 464 0S461.031 1 460.406 2.219L448 32L418.219 44.422C417 45.031 416 46.625 416 48C416 49.359 417 50.969 418.219 51.578L448 64ZM480 224L467.562 194.219C466.969 193 465.375 192 464 192S461.031 193 460.406 194.219L448 224L418.219 236.422C417 237.031 416 238.625 416 240C416 241.359 417 242.969 418.219 243.578L448 256L460.406 285.781C461.031 287 462.625 288 464 288S466.969 287 467.562 285.781L480 256L509.781 243.578C511 242.969 512 241.359 512 240C512 238.625 511 237.031 509.781 236.422L480 224ZM445.781 147.578C447 146.969 448 145.359 448 144C448 142.625 447 141.031 445.781 140.422L416 128L403.562 98.219C402.969 97 401.375 96 400 96S397.031 97 396.406 98.219L384 128L354.219 140.422C353 141.031 352 142.625 352 144C352 145.359 353 146.969 354.219 147.578L384 160L396.406 189.781C397.031 191 398.625 192 400 192S402.969 191 403.562 189.781L416 160L445.781 147.578Z", 512, 512))},
 			{EFontAwesomeIcon.Solid_AlignCenter, new FontAwesomeInformation("align-center", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M432 160H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0 256H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM108.1 96h231.81A12.09 12.09 0 0 0 352 83.9V44.09A12.09 12.09 0 0 0 339.91 32H108.1A12.09 12.09 0 0 0 96 44.09V83.9A12.1 12.1 0 0 0 108.1 96zm231.81 256A12.09 12.09 0 0 0 352 339.9v-39.81A12.09 12.09 0 0 0 339.91 288H108.1A12.09 12.09 0 0 0 96 300.09v39.81a12.1 12.1 0 0 0 12.1 12.1z", 448, 512))},
 			{EFontAwesomeIcon.Solid_AlignJustify, new FontAwesomeInformation("align-justify", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M432 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-128H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-128H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-128H16A16 16 0 0 0 0 48v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16V48a16 16 0 0 0-16-16z", 448, 512))},
 			{EFontAwesomeIcon.Solid_AlignLeft, new FontAwesomeInformation("align-left", EFontAwesomeStyle.Solid, "", new FontAwesomeSvgInformation("M12.83 352h262.34A12.82 12.82 0 0 0 288 339.17v-38.34A12.82 12.82 0 0 0 275.17 288H12.83A12.82 12.82 0 0 0 0 300.83v38.34A12.82 12.82 0 0 0 12.83 352zm0-256h262.34A12.82 12.82 0 0 0 288 83.17V44.83A12.82 12.82 0 0 0 275.17 32H12.83A12.82 12.82 0 0 0 0 44.83v38.34A12.82 12.82 0 0 0 12.83 96zM432 160H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0 256H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z", 448, 512))},

src/NuGet/FontAwesome5.nuspec

@@ -6,7 +6,7 @@
         <description>
             WPF (.Net and .Net Core) and UWP controls for the iconic SVG, font, and CSS toolkit Font Awesome 5.
             For examples https://github.com/MartinTopfstedt/FontAwesome5
-            Font-Awesome Version: 5.15.2
+            Font-Awesome Version: 5.15.3
         </description>
         <authors>Codinion</authors>
         <license type="expression">MIT</license>
@@ -57,12 +57,12 @@
         <file src="..\FontAwesome5.Net\bin\Release\netcoreapp3.1\FontAwesome5.Net.pdb" target="lib\netcoreapp3.1\" />
 
         <!-- .Net 5.0 -->
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.dll" target="lib\net5.0-windows\" />
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.xml" target="lib\net5.0-windows\" />
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.pdb" target="lib\net5.0-windows\" />
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.dll" target="lib\net5.0-windows\" />
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.xml" target="lib\net5.0-windows\" />
-        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.pdb" target="lib\net5.0-windows\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.dll" target="lib\net5.0-windows7.0\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.xml" target="lib\net5.0-windows7.0\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.pdb" target="lib\net5.0-windows7.0\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.dll" target="lib\net5.0-windows7.0\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.xml" target="lib\net5.0-windows7.0\" />
+        <file src="..\FontAwesome5.Net\bin\Release\net5.0-windows\FontAwesome5.Net.pdb" target="lib\net5.0-windows7.0\" />
 
         <!-- UWP -->
         <file src="..\FontAwesome5.UWP\bin\Release\FontAwesome5.dll" target="lib\uap10.0" />