Skip to content

Commit e9096e6

Browse files
KebooKeboo
authored
Project file cleanup (#2548)
1 parent 73187ef commit e9096e6

File tree

6 files changed

+5
-51
lines changed

6 files changed

+5
-51
lines changed

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
@@ -8,7 +8,6 @@
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
99
<AssemblyTitle>MahMaterialDragablzMashUp</AssemblyTitle>
1010
<Product>MahMaterialDragablzMashUp</Product>
11-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1211
<Prefer32Bit>true</Prefer32Bit>
1312
<SignAssembly>false</SignAssembly>
1413
</PropertyGroup>

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
7-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
87
<Prefer32Bit>true</Prefer32Bit>
98
<ApplicationIcon>favicon.ico</ApplicationIcon>
109
<UseWPF>true</UseWPF>

‎MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
7-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
87
<Prefer32Bit>true</Prefer32Bit>
98
<ApplicationIcon>favicon.ico</ApplicationIcon>
109
<UseWPF>true</UseWPF>

‎MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
32
<PropertyGroup>
43
<RootNamespace>MaterialDesignColors</RootNamespace>
54
<AssemblyName>MaterialDesignColors</AssemblyName>
65
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
76
<UseWPF>true</UseWPF>
8-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
97
<MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
108
<AssemblyTitle>MaterialDesignColors.Wpf</AssemblyTitle>
119
<Product>MaterialDesignColors.Wpf</Product>
1210
<Description>Material Design in XAML Toolkit - Colors</Description>
1311
<Version>$(MDIXColorsVersion)</Version>
1412
<AssemblyVersion>$(MDIXColorsVersion)</AssemblyVersion>
15-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1613
</PropertyGroup>
1714
</Project>

‎MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
55
<UseWPF>true</UseWPF>
6-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
76
<MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
87
<AssemblyTitle>MaterialDesignThemes.MahApps</AssemblyTitle>
98
<Product>MaterialDesignThemes.MahApps</Product>
109
<Version>$(MDIXMahAppsVersion)</Version>
1110
<AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
12-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1311
<UseWPF>true</UseWPF>
1412
</PropertyGroup>
1513
<ItemGroup>

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,66 +3,28 @@
33
<PropertyGroup>
44
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
55
<UseWPF>true</UseWPF>
6-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
76
<MDIXVersion Condition="$(MDIXVersion) == '' Or $(MDIXVersion) == '*Undefined*'">1.0.1</MDIXVersion>
87
<AssemblyTitle>MaterialDesignThemes.Wpf</AssemblyTitle>
98
<Product>MaterialDesignColors.Wpf</Product>
109
<Description>Material Design in XAML Toolkit - WPF Themes</Description>
1110
<Version>$(MDIXVersion)</Version>
1211
<AssemblyVersion>$(MDIXVersion)</AssemblyVersion>
1312
<NoWarn>CS1591;CS1574</NoWarn>
14-
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1513
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
1614
</PropertyGroup>
1715
<ItemGroup>
1816
<Resource Include="Resources\Roboto\*.ttf" />
1917
<Content Include="Resources\Roboto\*.ttf">
2018
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2119
</Content>
22-
</ItemGroup>
23-
<ItemGroup>
24-
<None Remove="Resources\Noto\NotoSans-Bold.ttf" />
25-
<None Remove="Resources\Noto\NotoSans-BoldItalic.ttf" />
26-
<None Remove="Resources\Noto\NotoSans-Italic.ttf" />
27-
<None Remove="Resources\Noto\NotoSans-Regular.ttf" />
20+
21+
<None Remove="Resources\Noto\*.ttf" />
2822
<None Remove="Resources\Noto\OFL.txt" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<Content Include="Resources\Noto\NotoSans-Bold.ttf">
32-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33-
</Content>
34-
<Content Include="Resources\Noto\NotoSans-BoldItalic.ttf">
35-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
36-
</Content>
37-
<Content Include="Resources\Noto\NotoSans-Italic.ttf">
38-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39-
</Content>
40-
<Content Include="Resources\Noto\NotoSans-Regular.ttf">
41-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
42-
</Content>
43-
<Content Include="Resources\Noto\OFL.txt">
23+
<Content Include="Resources\Noto\*.ttf">
4424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4525
</Content>
4626
</ItemGroup>
4727
<ItemGroup>
4828
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
4929
</ItemGroup>
50-
<ItemGroup>
51-
<Page Update="Themes\MaterialDesign3.Defaults.xaml">
52-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
53-
<SubType>Designer</SubType>
54-
</Page>
55-
<Page Update="Themes\MaterialDesign3.Font.xaml">
56-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
57-
</Page>
58-
<Page Update="Themes\MaterialDesign3.Window.xaml">
59-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
60-
</Page>
61-
<Page Update="Themes\MaterialDesignTheme.Defaults.xaml">
62-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
63-
</Page>
64-
<Page Update="Themes\MaterialDesign3.TextBlock.xaml">
65-
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
66-
</Page>
67-
</ItemGroup>
6830
</Project>

0 commit comments

Comments
 (0)