Skip to content

Commit 8495346

Browse files
committed
Merge branch 'develop' into main
2 parents 20f151d + e3dee2f commit 8495346

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1167
-737
lines changed

GitVersion.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
assembly-versioning-scheme: Major
22
assembly-file-versioning-scheme: MajorMinorPatchTag
33
mode: ContinuousDeployment
4-
next-version: 4.4.0
4+
next-version: 4.5.0
55
branches:
66
master:
77
regex: ^main

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ This `IconPacks` library contains controls, markup extensions and converters to
4343
| [Font Awesome Free](https://fontawesome.com/) | 5.14.0 | 1601 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.FontAwesome/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.FontAwesome.svg?style=flat-square&&label=FontAwesome"></a> |
4444
| [Ionicons](https://ionicons.com/) | 4.6.4.1 | 696 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Ionicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Ionicons.svg?style=flat-square&&label=Ionicons"></a> |
4545
| [Jam Icons](https://github.com/michaelampr/jam) | 2.0.0 | 896 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.JamIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.JamIcons.svg?style=flat-square&&label=JamIcons"></a> |
46-
| [Material Design Icons](https://materialdesignicons.com/) | 5.4.55 | 5455 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Material/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Material.svg?style=flat-square&&label=Material"></a> |
46+
| [Material Design Icons](https://materialdesignicons.com/) | 5.6.55 | 5655 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Material/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Material.svg?style=flat-square&&label=Material"></a> |
4747
| [Material Design Icons Light](https://github.com/Templarian/MaterialDesignLight) | 0.2.63 | 257 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.MaterialLight/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.MaterialLight.svg?style=flat-square&&label=MaterialLight"></a> |
4848
| [Material design icons (Google)](https://github.com/google/material-design-icons) | 3.0.1 | 932 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.MaterialDesign/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.MaterialDesign.svg?style=flat-square&&label=MaterialDesign"></a> |
49-
| [Microns](https://github.com/stephenhutchings/microns) | 1.0.6 | 108 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Microns/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Microns.svg?style=flat-square&&label=Microns"></a> |
49+
| [Microns](https://github.com/stephenhutchings/microns) | 1.0.8 | 108 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Microns/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Microns.svg?style=flat-square&&label=Microns"></a> |
5050
| [Modern](http://modernuiicons.com/) | | 1260 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Modern/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Modern.svg?style=flat-square&&label=Modern"></a> |
5151
| [GitHub Octicons](https://octicons.github.com/) | 9.6.0 | 204 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Octicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Octicons.svg?style=flat-square&&label=Octicons"></a> |
5252
| [PICOL Icons](https://github.com/PicolSigns/Icons) | 1.1.0 | 549 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PicolIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PicolIcons.svg?style=flat-square&&label=PicolIcons"></a> |
5353
| [RPG Awesome](https://nagoshiashumari.github.io/Rpg-Awesome/) | 0.2.0 | 495 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RPGAwesome/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RPGAwesome.svg?style=flat-square&&label=RPGAwesome"></a> |
54-
| [Simple Icons](https://simpleicons.org/) | 3.3.0 | 1390 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.SimpleIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.SimpleIcons.svg?style=flat-square&&label=SimpleIcons"></a> |
54+
| [Simple Icons](https://simpleicons.org/) | 3.8.0 | 1405 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.SimpleIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.SimpleIcons.svg?style=flat-square&&label=SimpleIcons"></a> |
5555
| [Typicons](https://www.s-ings.com/typicons/) | 2.0.9 | 336 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Typicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Typicons.svg?style=flat-square&&label=Typicons"></a> |
5656
| [Unicons](https://github.com/Iconscout/unicons) | 2.1.11 | 1184 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Unicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Unicons.svg?style=flat-square&&label=Unicons"></a> |
5757
| [Weather Icons](https://github.com/erikflowers/weather-icons) | 2.0.10 | 219 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.WeatherIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.WeatherIcons.svg?style=flat-square&&label=WeatherIcons"></a> |

src/MahApps.Metro.IconPacks/PackIconEntypo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace MahApps.Metro.IconPacks
1111
{
1212
/// <summary>
1313
/// All icons sourced from Entypo+ Icons Font <see><cref>http://www.entypo.com</cref></see>
14-
/// Licensed under <see><cref>http://creativecommons.org/licenses/by-sa/4.0/</cref></see>.
14+
/// Licensed under [CC BY 4.0](<see><cref>http://creativecommons.org/licenses/by-sa/4.0/</cref></see>).
1515
/// </summary>
1616
public class PackIconEntypo : PackIconControlBase
1717
{

src/MahApps.Metro.IconPacks/PackIconEntypoKind.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/// </summary>
1414
/// <remarks>
1515
/// All icons sourced from Entypo+ Icons Font <see><cref>http://www.entypo.com</cref></see>
16-
/// Licensed under <see><cref>http://creativecommons.org/licenses/by-sa/4.0/</cref></see>.
16+
/// Licensed under [CC BY 4.0](<see><cref>http://creativecommons.org/licenses/by-sa/4.0/</cref></see>).
1717
/// </remarks>
1818
public enum PackIconEntypoKind
1919
{

src/MahApps.Metro.IconPacks/PackIconIonicons.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace MahApps.Metro.IconPacks
1111
{
1212
/// <summary>
13-
/// Ionicons is licensed under the [MIT license](<see><cref>https://github.com/ionic-team/ionicons/blob/master/LICENSE</cref></see>).
13+
/// Ionicons are licensed under the [MIT license](<see><cref>https://github.com/ionic-team/ionicons/blob/master/LICENSE</cref></see>).
1414
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/ionic-team/ionicons</cref></see>.
1515
/// </summary>
1616
public class PackIconIonicons : PackIconControlBase

src/MahApps.Metro.IconPacks/PackIconIoniconsKind.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/// List of available icons for use with <see cref="PackIconIonicons" />.
1313
/// </summary>
1414
/// <remarks>
15-
/// Ionicons is licensed under the [MIT license](<see><cref>https://github.com/ionic-team/ionicons/blob/master/LICENSE</cref></see>).
15+
/// Ionicons are licensed under the [MIT license](<see><cref>https://github.com/ionic-team/ionicons/blob/master/LICENSE</cref></see>).
1616
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/ionic-team/ionicons</cref></see>.
1717
/// </remarks>
1818
public enum PackIconIoniconsKind

src/MahApps.Metro.IconPacks/PackIconMaterial.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
namespace MahApps.Metro.IconPacks
1111
{
1212
/// <summary>
13-
/// All icons sourced from Material Design Icons Font v1.6.50 - <see><cref>https://materialdesignicons.com</cref></see> - in accordance of
14-
/// <see><cref>https://github.com/Templarian/MaterialDesign/blob/master/license.txt</cref></see>.
13+
/// All icons sourced from Material Design Icons Font <see><cref>https://materialdesignicons.com</cref></see>
14+
/// In accordance of <see><cref>https://github.com/Templarian/MaterialDesign/blob/master/license.txt</cref></see>.
1515
/// </summary>
1616
public class PackIconMaterial : PackIconControlBase
1717
{

0 commit comments

Comments
 (0)