Skip to content

Commit 2b994c0

Browse files
punker76punker76
committed
Merge branch 'develop' into main
2 parents d3677ad + fc3408e commit 2b994c0

13 files changed

+2191
-1783
lines changed

‎GitVersion.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
assembly-versioning-scheme: Major
22
assembly-file-versioning-scheme: MajorMinorPatchTag
3-
next-version: 4.10.0
3+
next-version: 4.11.0
44
mode: ContinuousDeployment
55
branches:
66
master:

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ This `IconPacks` library contains controls, markup extensions and converters to
3636
| Icon collection | Version | ∑ | NuGet |
3737
|---|--:|--:|:--|
3838
| Complete IconPacks collection with all Icons in one package | | | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.svg?style=flat-square&&label=IconPacks"></a> |
39-
| [Bootstrap Icons](https://icons.getbootstrap.com/) | 1.5.0 | 1370 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.BootstrapIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.BootstrapIcons.svg?style=flat-square&&label=BootstrapIcons"></a> |
39+
| [Bootstrap Icons](https://icons.getbootstrap.com/) | 1.6.1 | 1406 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.BootstrapIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.BootstrapIcons.svg?style=flat-square&&label=BootstrapIcons"></a> |
4040
| [Boxicons](https://boxicons.com/) | 2.0.9 | 1525 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.BoxIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.BoxIcons.svg?style=flat-square&&label=BoxIcons"></a> |
41-
| [Codicons](https://github.com/microsoft/vscode-codicons) | 0.0.22 | 376 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Codicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Codicons.svg?style=flat-square&&label=Codicons"></a> |
41+
| [Codicons](https://github.com/microsoft/vscode-codicons) | 0.0.25 | 383 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Codicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Codicons.svg?style=flat-square&&label=Codicons"></a> |
4242
| [Coolicons](https://github.com/krystonschwarze/coolicons) | 2.5.0 | 412 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Coolicons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Coolicons.svg?style=flat-square&&label=Coolicons"></a> |
4343
| [Entypo+](http://www.entypo.com/) | | 411 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Entypo/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Entypo.svg?style=flat-square&&label=Entypo"></a> |
4444
| [Eva Icons](https://github.com/akveo/eva-icons) | 1.1.3 | 490 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.EvaIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.EvaIcons.svg?style=flat-square&&label=EvaIcons"></a> |
@@ -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.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> |
53+
| [Material Design Icons](https://materialdesignicons.com/) | 6.3.95 | 6395 | <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,7 +61,7 @@ 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.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> |
64+
| [Simple Icons](https://simpleicons.org/) | 5.19.0 | 2064 | <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> |

‎appveyor.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ branches:
77
- /\d*\.\d*\.\d*/
88

99
environment:
10+
# bad, but without this, gitversion doesn't work anymore
11+
IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
1012
azure-key-vault-url:
1113
secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
1214
azure-key-vault-client-id:
@@ -23,8 +25,8 @@ test: off
2325
install:
2426
# Install Windows SDK 10.0.16299 and .NET 5
2527
- ps: .\build\Install-WindowsSDK.ps1
26-
- ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
27-
- ps: ./dotnet-install.ps1 -Version 5.0.301 -InstallDir "C:\Program Files\dotnet"
28+
# - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
29+
# - ps: ./dotnet-install.ps1 -Version 5.0.301 -InstallDir "C:\Program Files\dotnet"
2830

2931
pull_requests:
3032
do_not_increment_build_number: false

0 commit comments

Comments
 (0)