Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
punker76 committed Oct 12, 2020
2 parents 8495346 + e51e4c6 commit 4a06237
Show file tree
Hide file tree
Showing 377 changed files with 20,057 additions and 773 deletions.
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/icon-update--request-.md
@@ -0,0 +1,12 @@
---
name: Icon update (request)
about: Suggest an icon update or request
title: ''
labels: Icon Update
assignees: punker76

---

**Icon update (request)**
Update <ICONS> to v<x.x.x>
<!-- Add <ICONS> from this <site>-->
2 changes: 1 addition & 1 deletion GitVersion.yml
@@ -1,7 +1,7 @@
assembly-versioning-scheme: Major
assembly-file-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDeployment
next-version: 4.5.0
next-version: 4.6.0
branches:
master:
regex: ^main
Expand Down
18 changes: 18 additions & 0 deletions NuGet.Config
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageRestore>
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<activePackageSource>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</activePackageSource>
</configuration>
13 changes: 11 additions & 2 deletions README.md
Expand Up @@ -36,11 +36,16 @@ This `IconPacks` library contains controls, markup extensions and converters to
| Icon collection | Version | &#8721; | NuGet |
|---|--:|--:|:--|
| 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> |
| [BoxIcons](https://boxicons.com/) | 2.0.5 | 1462 | <a href="https://github.com/atisawd/boxicons"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.BoxIcons.svg?style=flat-square&&label=BoxIcons"></a> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [Feather Icons](https://github.com/feathericons/feather) | 4.28.0 | 286 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.FeatherIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.FeatherIcons.svg?style=flat-square&&label=FeatherIcons"></a> |
| [File Icons](https://github.com/file-icons/icons) | 2.1.43 | 876 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.FileIcons/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.FileIcons.svg?style=flat-square&&label=FileIcons"></a> |
| [Fontaudio](https://github.com/fefanto/fontaudio) | 1.1.0 | 155 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Fontaudio/"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Fontaudio.svg?style=flat-square&&label=Fontaudio"></a> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
Expand All @@ -50,10 +55,14 @@ This `IconPacks` library contains controls, markup extensions and converters to
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |
| [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> |

Expand Down
2 changes: 1 addition & 1 deletion build.cake
Expand Up @@ -40,7 +40,7 @@ var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchN
var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("main", branchName);
var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;

var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true });
var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = false });
var msBuildPath = latestInstallationPath.Combine("./MSBuild/Current/Bin");
var msBuildPathExe = msBuildPath.CombineWithFilePath("./MSBuild.exe");

Expand Down
Binary file added resources/SocialCards/1.1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/2.1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/SocialCards/PSD/1.1.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/1.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/2.1.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/2.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/3.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/4.psd
Binary file not shown.
Binary file added resources/SocialCards/PSD/5.psd
Binary file not shown.
2 changes: 1 addition & 1 deletion src/Directory.build.props
Expand Up @@ -6,7 +6,7 @@
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('uap')) ">true</AutoGenerateBindingRedirects>
<LangVersion>7.3</LangVersion>
<LangVersion>latest</LangVersion>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>$(NoWarn);CS1591</NoWarn>
Expand Down

0 comments on commit 4a06237

Please sign in to comment.