Skip to content

Commit b70e316

Browse files
punker76punker76
committed
Merge branch 'develop' into main
2 parents 4a06237 + c71e74e commit b70e316

File tree

70 files changed

+3962
-3451
lines changed

Some content is hidden

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

70 files changed

+3962
-3451
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.6.0
4+
next-version: 4.7.0
55
branches:
66
master:
77
regex: ^main

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This `IconPacks` library contains controls, markup extensions and converters to
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> |
3939
| [Bootstrap Icons](https://icons.getbootstrap.com/) | 1.0.0 | 1120 | <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> |
40-
| [BoxIcons](https://boxicons.com/) | 2.0.5 | 1462 | <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> |
40+
| [BoxIcons](https://boxicons.com/) | 2.0.7 | 1500 | <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> |
4141
| [Codicons](https://github.com/microsoft/vscode-codicons) | 0.0.12 | 331 | <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
| [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> |
4343
| [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> |
@@ -47,19 +47,19 @@ This `IconPacks` library contains controls, markup extensions and converters to
4747
| [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> |
4848
| [Fork Awesome](https://forkaweso.me/) | 1.1.7 | 744 | <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> |
4949
| [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> |
50-
| [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> |
51-
| [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> |
50+
| [Jam Icons](https://github.com/michaelampr/jam) | 3.0.0 | 897 | <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> |
51+
| [Material Design Icons](https://materialdesignicons.com/) | 5.8.55 | 5855 | <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> |
5252
| [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> |
5353
| [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> |
5454
| [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> |
55-
| [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> |
55+
| [Modern UI Icons](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> |
5656
| [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> |
5757
| [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> |
5858
| [Pixelarticons](https://pixelarticons.com/) | 1.2.0 | 359 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PixelartIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PixelartIcons.svg?style=flat-square&&label=PixelartIcons"></a> |
5959
| [Radix Icons](https://icons.modulz.app/) | 3.0.0 | 260 | <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> |
60-
| [RemixIcon](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> |
60+
| [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> |
6161
| [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> |
62-
| [Simple Icons](https://simpleicons.org/) | 3.11.0 | 1461 | <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> |
62+
| [Simple Icons](https://simpleicons.org/) | 3.12.1 | 1463 | <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> |
6363
| [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> |
6464
| [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> |
6565
| [Vaadin Icons](https://vaadin.com/icons) | 4.3.1 | 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> |

‎build.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Task("Build")
119119
};
120120
MSBuild(solution, msBuildSettings
121121
.SetMaxCpuCount(0)
122-
.WithProperty("GeneratePackageOnBuild", target == "appveyor" ? "true" : "false")
122+
.WithProperty("GeneratePackageOnBuild", target == "appveyor" && !isPullRequest ? "true" : "false")
123123
.WithProperty("PackageOutputPath", MakeAbsolute(PACKAGE_DIR).ToString())
124124
.WithProperty("RepositoryBranch", branchName)
125125
.WithProperty("RepositoryCommit", gitVersion.Sha)

‎src/MahApps.Metro.IconPacks.Browser/Styles/CustomTabControl.xaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@
656656
Command="{Binding CopyToClipboard}"
657657
CommandParameter="{Binding}"
658658
Focusable="False"
659-
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=Foreground}"
659+
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}, Path=(TextElement.Foreground)}"
660660
IsTabStop="False"
661661
Style="{StaticResource CustomMetroCircleButtonStyle}">
662662
<Button.ToolTip>
@@ -678,7 +678,7 @@
678678
Command="{Binding CopyToClipboardAsContent}"
679679
CommandParameter="{Binding}"
680680
Focusable="False"
681-
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=Foreground}"
681+
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}, Path=(TextElement.Foreground)}"
682682
IsTabStop="False"
683683
Style="{StaticResource CustomMetroCircleButtonStyle}">
684684
<Button.ToolTip>
@@ -695,7 +695,7 @@
695695
Command="{Binding CopyToClipboardAsPathIcon}"
696696
CommandParameter="{Binding}"
697697
Focusable="False"
698-
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=Foreground}"
698+
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}, Path=(TextElement.Foreground)}"
699699
IsTabStop="False"
700700
Style="{StaticResource CustomMetroCircleButtonStyle}">
701701
<Button.ToolTip>
@@ -711,7 +711,7 @@
711711
Command="{Binding CopyToClipboardAsGeometry}"
712712
CommandParameter="{Binding}"
713713
Focusable="False"
714-
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=Foreground}"
714+
Foreground="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}, Path=(TextElement.Foreground)}"
715715
IsTabStop="False"
716716
Style="{StaticResource CustomMetroCircleButtonStyle}">
717717
<Button.ToolTip>

‎src/MahApps.Metro.IconPacks.Core/Attributes/MetaDataAttribute.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ public MetaDataAttribute()
1212
{
1313
}
1414

15-
public MetaDataAttribute(string projectUrl, string licenseUrl)
15+
public MetaDataAttribute(string name, string projectUrl, string licenseUrl)
1616
{
17+
Name = name;
1718
ProjectUrl = projectUrl;
1819
LicenseUrl = licenseUrl;
1920
}
2021

22+
public string Name { get; }
23+
2124
public string ProjectUrl { get; }
2225

2326
public string LicenseUrl { get; }

‎src/MahApps.Metro.IconPacks/Icons/BootstrapIcons/PackIconBootstrapIcons.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace MahApps.Metro.IconPacks
1313
/// Bootstrap Icons are licensed under the [MIT license](<see><cref>https://github.com/twbs/icons/blob/main/LICENSE.md</cref></see>).
1414
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/twbs/icons</cref></see>.
1515
/// </summary>
16-
[MetaData("https://icons.getbootstrap.com/", "https://github.com/twbs/icons/blob/main/LICENSE.md")]
16+
[MetaData("Bootstrap Icons", "https://icons.getbootstrap.com/", "https://github.com/twbs/icons/blob/main/LICENSE.md")]
1717
public class PackIconBootstrapIcons : PackIconControlBase
1818
{
1919
public static readonly DependencyProperty KindProperty

‎src/MahApps.Metro.IconPacks/Icons/BootstrapIcons/PathIconBootstrapIcons.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace MahApps.Metro.IconPacks
1111
/// Bootstrap Icons are licensed under the [MIT license](<see><cref>https://github.com/twbs/icons/blob/main/LICENSE.md</cref></see>).
1212
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/twbs/icons</cref></see>.
1313
/// </summary>
14+
[MetaData("Bootstrap Icons", "https://icons.getbootstrap.com/", "https://github.com/twbs/icons/blob/main/LICENSE.md")]
1415
public class PathIconBootstrapIcons : PathIconControlBase
1516
{
1617
public static readonly DependencyProperty KindProperty

‎src/MahApps.Metro.IconPacks/Icons/BoxIcons/PackIconBoxIcons.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace MahApps.Metro.IconPacks
1313
/// BoxIcons licensed under [SIL OFL 1.1](<see><cref>http://scripts.sil.org/OFL</cref></see>)
1414
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/atisawd/boxicons</cref></see>.
1515
/// </summary>
16-
[MetaData("https://boxicons.com/", "https://boxicons.com/usage/#license")]
16+
[MetaData("Boxicons", "https://boxicons.com/", "https://boxicons.com/usage/#license")]
1717
public class PackIconBoxIcons : PackIconControlBase
1818
{
1919
public static readonly DependencyProperty KindProperty

0 commit comments

Comments
 (0)