-
-
Notifications
You must be signed in to change notification settings - Fork 221
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from MahApps/dev
Merge 1.9.0 dev to master
- Loading branch information
Showing
33 changed files
with
1,589 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
162 changes: 162 additions & 0 deletions
162
src/MahApps.Metro.IconPacks.SimpleIcons/MahApps.Metro.IconPacks.SimpleIcons.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{85E73E30-B880-4127-A770-E8F0DE6744CE}</ProjectGuid> | ||
| <OutputType>library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>MahApps.Metro.IconPacks.SimpleIcons</RootNamespace> | ||
| <AssemblyName>MahApps.Metro.IconPacks.SimpleIcons</AssemblyName> | ||
| <FileAlignment>512</FileAlignment> | ||
| <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <WarningLevel>4</WarningLevel> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <OutputPath>..\bin\Debug\</OutputPath> | ||
| <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath> | ||
| <DocumentationFile>..\bin\Debug\$(AssemblyName).XML</DocumentationFile> | ||
| <DefineConstants>TRACE;DEBUG;SIMPLEICONS</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <NoWarn>1591</NoWarn> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>..\bin\Release\</OutputPath> | ||
| <IntermediateOutputPath>obj\Release\</IntermediateOutputPath> | ||
| <DocumentationFile>..\bin\Release\$(AssemblyName).XML</DocumentationFile> | ||
| <DefineConstants>TRACE;SIMPLEICONS</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <NoWarn>0067,1591,0168</NoWarn> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_NET45|AnyCPU'"> | ||
| <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | ||
| <OutputPath>..\bin\Release_NET45\</OutputPath> | ||
| <IntermediateOutputPath>obj\Release_NET45\</IntermediateOutputPath> | ||
| <DocumentationFile>..\bin\Release_NET45\$(AssemblyName).XML</DocumentationFile> | ||
| <DefineConstants>TRACE;SIMPLEICONS</DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <NoWarn>0067,1591,0168</NoWarn> | ||
| <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_NET46|AnyCPU'"> | ||
| <TargetFrameworkVersion>v4.6</TargetFrameworkVersion> | ||
| <OutputPath>..\bin\Release_NET46\</OutputPath> | ||
| <IntermediateOutputPath>obj\Release_NET46\</IntermediateOutputPath> | ||
| <DocumentationFile>..\bin\Release_NET46\$(AssemblyName).XML</DocumentationFile> | ||
| <DefineConstants>TRACE;SIMPLEICONS</DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <NoWarn>0067,1591,0168</NoWarn> | ||
| <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Compile Include="..\GlobalAssemblyInfo.cs"> | ||
| <Link>GlobalAssemblyInfo.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\Converter\FlipToScaleValueConverter.cs"> | ||
| <Link>Converter\FlipToScaleValueConverter.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\Converter\MarkupConverter.cs"> | ||
| <Link>Converter\MarkupConverter.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\Converter\NullToUnsetValueConverter.cs"> | ||
| <Link>Converter\NullToUnsetValueConverter.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIcon.cs"> | ||
| <Link>PackIcon.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIconExtension.cs"> | ||
| <Link>PackIconExtension.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIconSimpleIcons.cs"> | ||
| <Link>PackIconSimpleIcons.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIconSimpleIconsDataFactory.cs"> | ||
| <Link>PackIconSimpleIconsDataFactory.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIconSimpleIconsExtension.cs"> | ||
| <Link>PackIconSimpleIconsExtension.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\MahApps.Metro.IconPacks\PackIconSimpleIconsKind.cs"> | ||
| <Link>PackIconSimpleIconsKind.cs</Link> | ||
| </Compile> | ||
| <Compile Include="..\paket-files\ControlzEx\ControlzEx\src\ControlzEx\PackIconBase.cs"> | ||
| <Paket>True</Paket> | ||
| <Link>ControlzEx/PackIconBase.cs</Link> | ||
| </Compile> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Data" /> | ||
| <Reference Include="System.Xml" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Data.DataSetExtensions" /> | ||
| <Reference Include="System.Xaml"> | ||
| <RequiredTargetFramework>4.0</RequiredTargetFramework> | ||
| </Reference> | ||
| <Reference Include="WindowsBase" /> | ||
| <Reference Include="PresentationCore" /> | ||
| <Reference Include="PresentationFramework" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Page Include="..\MahApps.Metro.IconPacks\Themes\PackIconSimpleIcons.xaml"> | ||
| <Link>Themes\PackIconSimpleIcons.xaml</Link> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| <Page Include="Themes\Generic.xaml"> | ||
| <Generator>MSBuild:Compile</Generator> | ||
| <SubType>Designer</SubType> | ||
| </Page> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="Properties\AssemblyInfo.cs"> | ||
| <SubType>Code</SubType> | ||
| </Compile> | ||
| <Compile Include="Properties\Resources.Designer.cs"> | ||
| <AutoGen>True</AutoGen> | ||
| <DesignTime>True</DesignTime> | ||
| <DependentUpon>Resources.resx</DependentUpon> | ||
| </Compile> | ||
| <Compile Include="Properties\Settings.Designer.cs"> | ||
| <AutoGen>True</AutoGen> | ||
| <DependentUpon>Settings.settings</DependentUpon> | ||
| <DesignTimeSharedInput>True</DesignTimeSharedInput> | ||
| </Compile> | ||
| <EmbeddedResource Include="Properties\Resources.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| <None Include="Properties\Settings.settings"> | ||
| <Generator>SettingsSingleFileGenerator</Generator> | ||
| <LastGenOutput>Settings.Designer.cs</LastGenOutput> | ||
| </None> | ||
| <AppDesigner Include="Properties\" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| <Import Project="..\.paket\paket.targets" /> | ||
| </Project> |
12 changes: 12 additions & 0 deletions
12
src/MahApps.Metro.IconPacks.SimpleIcons/Properties/AssemblyInfo.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| using System.Reflection; | ||
| using System.Runtime.InteropServices; | ||
| using System.Windows; | ||
| using System.Windows.Markup; | ||
|
|
||
| [assembly: ComVisible(false)] | ||
| [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] | ||
|
|
||
| [assembly: XmlnsDefinition("http://metro.mahapps.com/winfx/xaml/iconpacks", "MahApps.Metro.IconPacks")] | ||
| [assembly: AssemblyTitle("MahApps.Metro.IconPacks.SimpleIcons")] | ||
| [assembly: AssemblyDescription("IconPacks for stylish awesome UI WPF apps.")] | ||
| [assembly: AssemblyCompany("MahApps")] |
62 changes: 62 additions & 0 deletions
62
src/MahApps.Metro.IconPacks.SimpleIcons/Properties/Resources.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.