Skip to content

Commit 5112c45

Browse files
committed
Merge branch 'develop' into main
2 parents bd8c7a4 + c301eb5 commit 5112c45

Some content is hidden

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

61 files changed

+405
-6602
lines changed

README.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<a href="https://github.com/MahApps/MahApps.Metro.IconPacks">
44
<img alt="MahApps.Metro.IconPacks" src="./resources/Icon.svg">
55
</a>
6-
<h1>MahApps.Metro.IconPacks</h1>
6+
<h1>MahApps.Metro<br />IconPacks</h1>
77
<p>
88
Awesome icon packs for <code>WPF</code> and <code>UWP</code> in one library
99
</p>
@@ -50,7 +50,7 @@ This `IconPacks` library contains controls, markup extensions and converters to
5050
| [Fork Awesome](https://forkaweso.me/) | 1.2.0 | 794 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.ForkAwesome/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.ForkAwesome.svg?style=flat-square&&label=ForkAwesome"></a> |
5151
| [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> |
5252
| [Jam Icons](https://github.com/michaelampr/jam) | 3.1.0 | 940 | <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> |
53-
| [Material Design Icons](https://materialdesignicons.com/) | 6.1.95 | 6195 | <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> |
53+
| [Material Design Icons](https://materialdesignicons.com/) | 6.2.95 | 6295 | <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> |
5454
| [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> |
5555
| [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> |
5656
| [Microns](https://github.com/stephenhutchings/microns) | 1.0.10 | 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> |
@@ -61,14 +61,16 @@ This `IconPacks` library contains controls, markup extensions and converters to
6161
| [Radix Icons](https://icons.modulz.app/) | 1.0.3 | 312 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RadixIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RadixIcons.svg?style=flat-square&&label=RadixIcons"></a> |
6262
| [Remix Icon](https://remixicon.com/) | 2.5.0 | 2271 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.RemixIcon/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.RemixIcon.svg?style=flat-square&&label=RemixIcon"></a> |
6363
| [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> |
64-
| [Simple Icons](https://simpleicons.org/) | 5.14.0 | 2007 | <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> |
64+
| [Simple Icons](https://simpleicons.org/) | 5.17.0 | 2024 | <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> |
6565
| [Typicons](https://www.s-ings.com/typicons/) | 2.1.2 | 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> |
6666
| [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> |
6767
| [Vaadin Icons](https://vaadin.com/icons) | 4.3.2 | 636 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.VaadinIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.VaadinIcons.svg?style=flat-square&&label=VaadinIcons"></a> |
6868
| [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> |
6969
| [Zondicons](https://www.zondicons.com) | | 297 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Zondicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Zondicons.svg?style=flat-square&&label=Zondicons"></a> |
7070

71-
It's not necessary to install and use [MahApps.Metro](https://github.com/MahApps/MahApps.Metro), but it makes your `WPF` application nicer.
71+
## Note
72+
73+
It's not necessary, but you can use these Icons together with [MahApps.Metro](https://github.com/MahApps/MahApps.Metro) which makes your `WPF` application nicer.
7274

7375
## Let's get started
7476

@@ -77,6 +79,16 @@ It's not necessary to install and use [MahApps.Metro](https://github.com/MahApps
7779

7880
## Want to say thanks?
7981

80-
This framework is free and can be used for free, open source and commercial applications. It's tested and contributed by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...).
82+
This framework is free and can be used for free, open source and commercial applications.
83+
84+
It's tested and contributed by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...).
85+
86+
Please give also a star to all available icon repositories.
87+
88+
[Become a sponsor](https://github.com/sponsors/punker76) and show your support to this open source project.
89+
90+
## IconPacks Browser
91+
92+
The Browser for all available Icon packages can be found [here](https://github.com/MahApps/IconPacks.Browser).
8193

82-
![iconbrowserfinal](./resources/iconpacks_latest.gif)
94+
![iconbrowserfinal](./resources/iconpacks_browser_new.gif)

build.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#load sign.cake
66

7-
#tool dotnet:?package=GitReleaseManager.Tool&version=0.12.0
8-
#tool dotnet:?package=GitVersion.Tool&version=5.6.6
7+
#tool dotnet:?package=GitReleaseManager.Tool&version=0.12.1
8+
#tool dotnet:?package=GitVersion.Tool&version=5.7.0
99

1010
#tool vswhere&version=2.8.4
1111
#addin nuget:?package=Cake.Figlet&version=1.4.0
600 KB
Loading

src/Directory.build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<DebugType>full</DebugType>
1616
<NoWarn>$(NoWarn);CS1591</NoWarn>
1717
<NoError>$(NoError);CS1591</NoError>
18-
19-
<IsSampleProject>$(MSBuildProjectName.Contains('Browser'))</IsSampleProject>
2018
</PropertyGroup>
2119

2220
<PropertyGroup>

src/Directory.build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<!-- Sign assembly -->
17-
<PropertyGroup Condition=" '$(IsSampleProject)' != 'true' ">
17+
<PropertyGroup>
1818
<SignAssembly>True</SignAssembly>
1919
<AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\iconpacks.public.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>

src/MahApps.Metro.IconPacks.Browser/App.net45.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/MahApps.Metro.IconPacks.Browser/App.net46.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/MahApps.Metro.IconPacks.Browser/App.net47.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/MahApps.Metro.IconPacks.Browser/App.xaml

Lines changed: 0 additions & 115 deletions
This file was deleted.

src/MahApps.Metro.IconPacks.Browser/App.xaml.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)