housekeeping: update project files

Update all project files and some package references.

housekeeping: update project files
Update all project files and some package references.
3512ee48 · punker76 · 4543e587 · 3512ee48 · 3512ee48 · 3512ee48
21 changed file
--- a/LICENSE
+++ b/LICENSE
 The MIT License (MIT)

-Copyright (c) 2016-2018 MahApps, Jan Karger
+Copyright (c) 2016-2019 MahApps, Jan Karger

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -4,12 +4,13 @@
    <PropertyGroup>
        <NoWarn>$(NoWarn);CS1591</NoWarn>
        <NoError>$(NoError);CS1591</NoError>
-
        <LangVersion>7.3</LangVersion>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xaml;.xml</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <DebugType>full</DebugType>
+        <DebugSymbols>true</DebugSymbols>
    </PropertyGroup>

    <PropertyGroup Condition=" !$(TargetFramework.StartsWith('uap')) ">
@@ -26,22 +27,12 @@

    <!-- Add the references for all projects and targets -->
    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2018.*" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2019.*" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2*" PrivateAssets="All" />
    </ItemGroup>

-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <DebugType>portable</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <DebugType>full</DebugType>
-        <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
-
    <!-- SourceLink -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
        <!-- Optional: Declare that the Repository URL can be published to NuSpec -->
        <PublishRepositoryUrl>true</PublishRepositoryUrl>
        <!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
@@ -59,8 +50,8 @@
    </PropertyGroup>

    <ItemGroup>
-        <None Remove="**\*.png;**\*.jpg;**\*.ico"/>
-        <Resource Include="**\*.png;**\*.jpg;**\*.ico"/>
+        <None Remove="**\*.png;**\*.jpg;**\*.ico" />
+        <Resource Include="**\*.png;**\*.jpg;**\*.ico" />
    </ItemGroup>

 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks.Browser/MahApps.Metro.IconPacks.Browser.csproj
+++ b/src/MahApps.Metro.IconPacks.Browser/MahApps.Metro.IconPacks.Browser.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -8,7 +9,6 @@
        <DisableFody Condition="'$(Configuration)' == 'Debug' or '$(TargetFramework)' == 'netcoreapp3.0'">true</DisableFody>
        <GenerateDocumentationFile>false</GenerateDocumentationFile>
        <IsPackable>false</IsPackable>
-        <!--<DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' != 'netcoreapp3.0'">true</DisableImplicitFrameworkReferences>-->
    </PropertyGroup>
    <PropertyGroup>
        <OutputType>WinExe</OutputType>
@@ -17,29 +17,21 @@
    </PropertyGroup>
    <ItemGroup>
        <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha*" />
-        <PackageReference Include="Fody" Version="4.*" Condition="'$(Configuration)' != 'Debug' and '$(TargetFramework)' != 'netcoreapp3.0'" />
-        <PackageReference Include="Costura.Fody" Version="3.*" Condition="'$(Configuration)' != 'Debug' and '$(TargetFramework)' != 'netcoreapp3.0'" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(Configuration)' != 'Debug' and '$(TargetFramework)' != 'netcoreapp3.0'">
+        <PackageReference Include="Fody" Version="5.*">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Costura.Fody" Version="4.*" />
    </ItemGroup>
    <ItemGroup>
-        <ProjectReference Include="..\MahApps.Metro.IconPacks.Core\MahApps.Metro.IconPacks.Core.csproj"/>
-        <ProjectReference Include="..\MahApps.Metro.IconPacks\MahApps.Metro.IconPacks.csproj"/>
+        <ProjectReference Include="..\MahApps.Metro.IconPacks.Core\MahApps.Metro.IconPacks.Core.csproj" />
+        <ProjectReference Include="..\MahApps.Metro.IconPacks\MahApps.Metro.IconPacks.csproj" />
    </ItemGroup>
-    <!--<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.0' ">
-        <Reference Include="Microsoft.CSharp"/>
-        <Reference Include="PresentationCore"/>
-        <Reference Include="PresentationFramework"/>
-        <Reference Include="System"/>
-        <Reference Include="System.ComponentModel.DataAnnotations"/>
-        <Reference Include="System.Configuration"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Data.DataSetExtensions"/>
-        <Reference Include="System.Xaml"/>
-        <Reference Include="WindowsBase"/>
-    </ItemGroup>-->
    <ItemGroup>
-        <None Include="app.manifest"/>
-        <None Remove="App.config"/>
+        <None Include="app.manifest" />
+        <None Remove="App.config" />
    </ItemGroup>
    <ItemGroup Condition=" !$(TargetFramework.StartsWith('netcore')) ">
        <AppConfigWithTargetPath Include="App.$(TargetFramework).config">
@@ -47,7 +39,7 @@
        </AppConfigWithTargetPath>
    </ItemGroup>
    <ItemGroup>
-        <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)"/>
-        <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)"/>
+        <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
+        <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks.Core/Directory.build.targets
+++ b/src/MahApps.Metro.IconPacks.Core/Directory.build.targets
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

    <!-- Sign assembly -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
        <SignAssembly>True</SignAssembly>
        <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\iconpacks.public.snk</AssemblyOriginatorKeyFile>
        <DelaySign>false</DelaySign>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
    </PropertyGroup>

-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))"/>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj
+++ b/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -12,7 +13,7 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-    	<Compile Remove="PathIcon*.cs" />
+        <Compile Remove="PathIcon*.cs" />
        <Compile Remove="Attributes\DescriptionAttribute.cs" />
    </ItemGroup>
    <!-- UWP Items include -->

--- a/src/MahApps.Metro.IconPacks/Directory.build.props
+++ b/src/MahApps.Metro.IconPacks/Directory.build.props
@@ -41,5 +41,5 @@
        </ItemGroup>
    </Target>

-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/Directory.build.targets
+++ b/src/MahApps.Metro.IconPacks/Directory.build.targets
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

    <!-- NuGet -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
        <Authors>Jan Karger</Authors>
-        <PackageLicenseUrl>https://github.com/MahApps/MahApps.Metro.IconPacks/blob/dev/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageProjectUrl>https://github.com/MahApps/MahApps.Metro.IconPacks</PackageProjectUrl>
        <PackageIconUrl>https://raw.githubusercontent.com/MahApps/MahApps.Metro/master/mahapps.metro.logo2.png</PackageIconUrl>
        <PackageTags>WPF;UWP;UAP;Windows;Windows10;WinRT;App;Universal;UI;Metro;Modern;ModernUI;Material;XAML;Toolkit;Library;.NET;Icon</PackageTags>
@@ -13,12 +13,12 @@
    </PropertyGroup>

    <!-- Sign assembly -->
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
        <SignAssembly>True</SignAssembly>
        <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\..\iconpacks.public.snk</AssemblyOriginatorKeyFile>
        <DelaySign>false</DelaySign>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
    </PropertyGroup>

-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))"/>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconEntypo*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Entypo\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconEntypo.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconEntypo*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Entypo\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconEntypo.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*Entypo*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Entypo\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconEntypo.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Entypo*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Entypo\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconEntypo.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconFeatherIcons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\FeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconFeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconFeatherIcons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\FeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconFeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*FeatherIcons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\FeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconFeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*FeatherIcons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\FeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconFeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconFontAwesome*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\FontAwesome\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconFontAwesome.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconFontAwesome*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\FontAwesome\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconFontAwesome.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*FontAwesome*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\FontAwesome\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconFontAwesome.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*FontAwesome*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\FontAwesome\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconFontAwesome.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconIonicons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Ionicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconIonicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconIonicons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Ionicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconIonicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*Ionicons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Ionicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconIonicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Ionicons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Ionicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconIonicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Exclude="PackIconMaterialLight*.cs;PackIconMaterialDesign*.cs" Include="PackIconMaterial*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Material\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterial.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Exclude="PackIconMaterialLight*.cs;PackIconMaterialDesign*.cs" Include="PackIconMaterial*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Material\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterial.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*MaterialLight*.cs;*MaterialDesign*.cs;*Extension*.cs" Include="*Material*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Material\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterial.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*MaterialLight*.cs;*MaterialDesign*.cs;*Extension*.cs" Include="*Material*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Material\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterial.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Exclude="PackIconMaterialLight*.cs" Include="PackIconMaterialDesign*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\MaterialDesign\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterialDesign.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Exclude="PackIconMaterialLight*.cs" Include="PackIconMaterialDesign*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\MaterialDesign\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterialDesign.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*MaterialLight*.cs;*Extension*.cs" Include="*MaterialDesign*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\MaterialDesign\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterialDesign.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*MaterialLight*.cs;*Extension*.cs" Include="*MaterialDesign*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\MaterialDesign\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterialDesign.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconMaterialLight*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\MaterialLight\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterialLight.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconMaterialLight*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\MaterialLight\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconMaterialLight.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*MaterialLight*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\MaterialLight\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterialLight.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*MaterialLight*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\MaterialLight\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconMaterialLight.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconModern*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Modern\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconModern.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconModern*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Modern\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconModern.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*Modern*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Modern\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconModern.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Modern*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Modern\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconModern.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconOcticons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Octicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconOcticons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconOcticons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Octicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconOcticons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*Octicons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Octicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconOcticons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Octicons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Octicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconOcticons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconSimpleIcons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\SimpleIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconSimpleIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconSimpleIcons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\SimpleIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconSimpleIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*SimpleIcons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\SimpleIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconSimpleIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*SimpleIcons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\SimpleIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconSimpleIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconTypicons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Typicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconTypicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconTypicons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Typicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconTypicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*Typicons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Typicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconTypicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Typicons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Typicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconTypicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="Current">
-  <!-- Project properties -->
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants);UNICONS</DefineConstants>
-    <AssemblyName>MahApps.Metro.IconPacks.Unicons</AssemblyName>
-    <Title>MahApps.Metro.IconPacks.Unicons</Title>
-    <RootNamespace>MahApps.Metro.IconPacks</RootNamespace>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-  </PropertyGroup>
-  <!-- WPF Items include -->
-  <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-    <Compile Remove="PathIcon*.cs" />
-    <Compile Remove="*.cs" />
-    <Compile Include="PackIconExtension.cs" />
-    <Compile Include="PackIconUnicons*.cs" />
-    <Page Generator="MSBuild:Compile" Include="Themes\WPF\Unicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
-    <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconUnicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
-  </ItemGroup>
-  <!-- UWP Items include -->
-  <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-    <Compile Remove="*.cs" />
-    <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
-    <Compile Remove="*Extension*.cs" />
-    <EmbeddedResource Include="**\*.rd.xml" />
-    <Compile Exclude="*Extension*.cs" Include="*Unicons*.cs" />
-    <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Unicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
-    <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconUnicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
-    <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
-  </ItemGroup>
+    <!-- Project properties -->
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);UNICONS</DefineConstants>
+        <AssemblyName>MahApps.Metro.IconPacks.Unicons</AssemblyName>
+        <Title>MahApps.Metro.IconPacks.Unicons</Title>
+        <RootNamespace>MahApps.Metro.IconPacks</RootNamespace>
+    </PropertyGroup>
+    <!-- WPF Items include -->
+    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconUnicons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\Unicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconUnicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+    </ItemGroup>
+    <!-- UWP Items include -->
+    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*Unicons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\Unicons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconUnicons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
+    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,22 +10,22 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Compile Remove="*.cs"/>
-        <Compile Include="PackIconExtension.cs"/>
-        <Compile Include="PackIconWeatherIcons*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\WeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconWeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Compile Remove="*.cs" />
+        <Compile Include="PackIconExtension.cs" />
+        <Compile Include="PackIconWeatherIcons*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\WeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\PackIconWeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="*.cs"/>
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Compile Exclude="*Extension*.cs" Include="*WeatherIcons*.cs"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\WeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconWeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="*.cs" />
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Compile Exclude="*Extension*.cs" Include="*WeatherIcons*.cs" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\WeatherIcons\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Page Generator="MSBuild:Compile" Include="Themes\UAP\PackIconWeatherIcons.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file
--- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj
+++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj
 <?xml version="1.0" encoding="utf-8"?>
+
 <Project Sdk="MSBuild.Sdk.Extras">
    <!-- Project properties -->
    <PropertyGroup>
@@ -9,15 +10,15 @@
    </PropertyGroup>
    <!-- WPF Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' != 'uap'">
-        <Compile Remove="PathIcon*.cs"/>
-        <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
+        <Compile Remove="PathIcon*.cs" />
+        <Page Generator="MSBuild:Compile" Include="Themes\WPF\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
    </ItemGroup>
    <!-- UWP Items include -->
    <ItemGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
-        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*"/>
-        <Compile Remove="*Extension*.cs"/>
-        <EmbeddedResource Include="**\*.rd.xml"/>
-        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer"/>
-        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs"/>
+        <Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
+        <Compile Remove="*Extension*.cs" />
+        <EmbeddedResource Include="**\*.rd.xml" />
+        <Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\*.xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
+        <Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
    </ItemGroup>
 </Project>
\ No newline at end of file