Skip to content

Commit 9c9a410

Browse files
KebooKeboo
committed
Updates to include font files in nuget
1 parent b93980b commit 9c9a410

File tree

4 files changed

+10
-173
lines changed

4 files changed

+10
-173
lines changed

‎MaterialDesignColors.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application.</description>
1414
<releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
1515
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
16-
<tags>WPF XAML WinRT Material Design Colour Color UI UX</tags>
16+
<tags>WPF XAML Material Design Colour Color UI UX</tags>
1717
</metadata>
1818
<files>
1919
<file src="MaterialDesignColors.Wpf\bin\AppVeyor\net45\MaterialDesignColors.dll" target="lib\net45" />

‎MaterialDesignThemes.MahApps.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library.</description>
1414
<releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
1515
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
16-
<tags>WPF XAML WinRT Material Design Theme Colour Color UI UX</tags>
16+
<tags>WPF XAML MahApps Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
1818
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
1919
<dependency id="MaterialDesignThemes" version="[2.6.0, 3.0)" />

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 4 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -36,180 +36,16 @@
3636
<Paket>True</Paket>
3737
<Link>ControlzEx/PopupEx.cs</Link>
3838
</Compile>
39-
<!--<Page Include="Themes\Generic.xaml">
40-
<Generator>MSBuild:Compile</Generator>
41-
</Page>
42-
<Page Include="Themes\MaterialDesignTheme.Badged.xaml">
43-
<Generator>MSBuild:Compile</Generator>
44-
</Page>
45-
<Page Include="Themes\MaterialDesignTheme.Button.xaml">
46-
<Generator>MSBuild:Compile</Generator>
47-
</Page>
48-
<Page Include="Themes\MaterialDesignTheme.Calendar.xaml">
49-
<Generator>MSBuild:Compile</Generator>
50-
</Page>
51-
<Page Include="Themes\MaterialDesignTheme.Card.xaml">
52-
<Generator>MSBuild:Compile</Generator>
53-
</Page>
54-
<Page Include="Themes\MaterialDesignTheme.CheckBox.xaml">
55-
<Generator>MSBuild:Compile</Generator>
56-
</Page>
57-
<Page Include="Themes\MaterialDesignTheme.Chip.xaml">
58-
<Generator>MSBuild:Compile</Generator>
59-
</Page>
60-
<Page Include="Themes\MaterialDesignTheme.Clock.xaml">
61-
<Generator>MSBuild:Compile</Generator>
62-
</Page>
63-
<Page Include="Themes\MaterialDesignTheme.ColorPicker.xaml">
64-
<Generator>MSBuild:Compile</Generator>
65-
</Page>
66-
<Page Include="Themes\MaterialDesignTheme.ComboBox.xaml">
67-
<Generator>MSBuild:Compile</Generator>
68-
</Page>
69-
<Page Include="Themes\MaterialDesignTheme.Dark.xaml">
70-
<Generator>MSBuild:Compile</Generator>
71-
</Page>
72-
<Page Include="Themes\MaterialDesignTheme.DataGrid.ComboBox.xaml">
73-
<Generator>MSBuild:Compile</Generator>
74-
</Page>
75-
<Page Include="Themes\MaterialDesignTheme.DataGrid.xaml">
76-
<Generator>MSBuild:Compile</Generator>
77-
</Page>
78-
<Page Include="Themes\MaterialDesignTheme.DatePicker.xaml">
79-
<Generator>MSBuild:Compile</Generator>
80-
</Page>
81-
<Page Include="Themes\MaterialDesignTheme.Defaults.xaml">
82-
<Generator>MSBuild:Compile</Generator>
83-
</Page>
84-
<Page Include="Themes\MaterialDesignTheme.DialogHost.xaml">
85-
<Generator>MSBuild:Compile</Generator>
86-
</Page>
87-
<Page Include="Themes\MaterialDesignTheme.Expander.xaml">
88-
<Generator>MSBuild:Compile</Generator>
89-
</Page>
90-
<Page Include="Themes\MaterialDesignTheme.Flipper.xaml">
91-
<Generator>MSBuild:Compile</Generator>
92-
</Page>
93-
<Page Include="Themes\MaterialDesignTheme.Font.xaml">
94-
<Generator>MSBuild:Compile</Generator>
95-
</Page>
96-
<Page Include="Themes\MaterialDesignTheme.GridSplitter.xaml">
97-
<Generator>MSBuild:Compile</Generator>
98-
</Page>
99-
<Page Include="Themes\MaterialDesignTheme.GroupBox.xaml">
100-
<Generator>MSBuild:Compile</Generator>
101-
</Page>
102-
<Page Include="Themes\MaterialDesignTheme.Hyperlink.xaml">
103-
<Generator>MSBuild:Compile</Generator>
104-
</Page>
105-
<Page Include="Themes\MaterialDesignTheme.Label.xaml">
106-
<Generator>MSBuild:Compile</Generator>
107-
</Page>
108-
<Page Include="Themes\MaterialDesignTheme.Light.xaml">
109-
<Generator>MSBuild:Compile</Generator>
110-
</Page>
111-
<Page Include="Themes\MaterialDesignTheme.ListBox.xaml">
112-
<Generator>MSBuild:Compile</Generator>
113-
</Page>
114-
<Page Include="Themes\MaterialDesignTheme.ListView.xaml">
115-
<Generator>MSBuild:Compile</Generator>
116-
</Page>
117-
<Page Include="Themes\MaterialDesignTheme.Menu.xaml">
118-
<Generator>MSBuild:Compile</Generator>
119-
</Page>
120-
<Page Include="Themes\MaterialDesignTheme.PasswordBox.xaml">
121-
<Generator>MSBuild:Compile</Generator>
122-
</Page>
123-
<Page Include="Themes\MaterialDesignTheme.PopupBox.xaml">
124-
<Generator>MSBuild:Compile</Generator>
125-
</Page>
126-
<Page Include="Themes\MaterialDesignTheme.ProgressBar.xaml">
127-
<Generator>MSBuild:Compile</Generator>
128-
</Page>
129-
<Page Include="Themes\MaterialDesignTheme.RadioButton.xaml">
130-
<Generator>MSBuild:Compile</Generator>
131-
</Page>
132-
<Page Include="Themes\MaterialDesignTheme.RatingBar.xaml">
133-
<Generator>MSBuild:Compile</Generator>
134-
</Page>
135-
<Page Include="Themes\MaterialDesignTheme.RichTextBox.xaml">
136-
<Generator>MSBuild:Compile</Generator>
137-
</Page>
138-
<Page Include="Themes\MaterialDesignTheme.ScrollBar.xaml">
139-
<Generator>MSBuild:Compile</Generator>
140-
</Page>
141-
<Page Include="Themes\MaterialDesignTheme.ScrollViewer.xaml">
142-
<Generator>MSBuild:Compile</Generator>
143-
</Page>
144-
<Page Include="Themes\MaterialDesignTheme.Shadows.xaml">
145-
<Generator>MSBuild:Compile</Generator>
146-
</Page>
147-
<Page Include="Themes\MaterialDesignTheme.Slider.xaml">
148-
<Generator>MSBuild:Compile</Generator>
149-
</Page>
150-
<Page Include="Themes\MaterialDesignTheme.SmartHint.xaml">
151-
<Generator>MSBuild:Compile</Generator>
152-
</Page>
153-
<Page Include="Themes\MaterialDesignTheme.Snackbar.xaml">
154-
<Generator>MSBuild:Compile</Generator>
155-
</Page>
156-
<Page Include="Themes\MaterialDesignTheme.TextBlock.xaml">
157-
<Generator>MSBuild:Compile</Generator>
158-
</Page>
159-
<Page Include="Themes\MaterialDesignTheme.TextBox.xaml">
160-
<Generator>MSBuild:Compile</Generator>
161-
</Page>
162-
<Page Include="Themes\MaterialDesignTheme.Thumb.xaml">
163-
<Generator>MSBuild:Compile</Generator>
164-
</Page>
165-
<Page Include="Themes\MaterialDesignTheme.TimePicker.xaml">
166-
<Generator>MSBuild:Compile</Generator>
167-
</Page>
168-
<Page Include="Themes\MaterialDesignTheme.ToggleButton.xaml">
169-
<Generator>MSBuild:Compile</Generator>
170-
</Page>
171-
<Page Include="Themes\MaterialDesignTheme.ToolBar.xaml">
172-
<Generator>MSBuild:Compile</Generator>
173-
</Page>
174-
<Page Include="Themes\MaterialDesignTheme.ToolBarTray.xaml">
175-
<Generator>MSBuild:Compile</Generator>
176-
</Page>
177-
<Page Include="Themes\MaterialDesignTheme.ToolTip.xaml">
178-
<Generator>MSBuild:Compile</Generator>
179-
</Page>
180-
<Page Include="Themes\MaterialDesignTheme.TreeView.xaml">
181-
<Generator>MSBuild:Compile</Generator>
182-
</Page>
183-
<Page Include="Themes\MaterialDesignTheme.ValidationErrorTemplate.xaml">
184-
<Generator>MSBuild:Compile</Generator>
185-
</Page>-->
18639
</ItemGroup>
18740
<ItemGroup>
18841
<None Include="paket.references" />
189-
<Resource Include="Resources\Roboto\RobotoCondensed-Regular.ttf" />
190-
<Resource Include="Resources\Roboto\RobotoCondensed-LightItalic.ttf" />
191-
<Resource Include="Resources\Roboto\RobotoCondensed-Light.ttf" />
192-
<Resource Include="Resources\Roboto\RobotoCondensed-Italic.ttf" />
193-
<Resource Include="Resources\Roboto\RobotoCondensed-BoldItalic.ttf" />
194-
<Resource Include="Resources\Roboto\RobotoCondensed-Bold.ttf" />
195-
<Resource Include="Resources\Roboto\Roboto-ThinItalic.ttf" />
196-
<Resource Include="Resources\Roboto\Roboto-Thin.ttf" />
197-
<Resource Include="Resources\Roboto\Roboto-Regular.ttf" />
198-
<Resource Include="Resources\Roboto\Roboto-MediumItalic.ttf" />
199-
<Resource Include="Resources\Roboto\Roboto-Medium.ttf" />
200-
<Resource Include="Resources\Roboto\Roboto-LightItalic.ttf" />
201-
<Resource Include="Resources\Roboto\Roboto-Light.ttf" />
202-
<Resource Include="Resources\Roboto\Roboto-Italic.ttf" />
203-
<Resource Include="Resources\Roboto\Roboto-BoldItalic.ttf" />
204-
<Resource Include="Resources\Roboto\Roboto-Bold.ttf" />
205-
<Resource Include="Resources\Roboto\Roboto-BlackItalic.ttf" />
206-
<Resource Include="Resources\Roboto\Roboto-Black.ttf" />
42+
<Resource Include="Resources\Roboto\*.ttf" />
43+
<Content Include="Resources\Roboto\*.ttf">
44+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45+
</Content>
20746
</ItemGroup>
20847
<ItemGroup>
20948
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
21049
</ItemGroup>
211-
<ItemGroup>
212-
<Compile Remove="obj\AppVeyor\GeneratedInternalTypeHelper.g.cs" />
213-
</ItemGroup>
21450
<Import Project="..\.paket\Paket.Restore.targets" />
21551
</Project>

‎MaterialDesignThemes.nuspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library.</description>
1414
<releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
15-
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
16-
<tags>WPF XAML WinRT Material Design Theme Colour Color UI UX</tags>
15+
<copyright>Copyright 2019 James Willock/Mulholland Software Ltd</copyright>
16+
<tags>WPF XAML Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
1818
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
1919
</dependencies>
@@ -22,9 +22,10 @@
2222
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.dll" target="lib\net45" />
2323
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.pdb" target="lib\net45" />
2424
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.xml" target="lib\net45" />
25-
<file src="MaterialDesignThemes.Wpf\**\*.cs" target="src\net45" />
25+
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\*.ttf" target="content" />
2626
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.dll" target="lib\netcoreapp3.0" />
2727
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.pdb" target="lib\netcoreapp3.0" />
2828
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.xml" target="lib\netcoreapp3.0" />
29+
2930
</files>
3031
</package>

0 commit comments

Comments
 (0)