Skip to content

Commit c3e2d70

Browse files
Keboopunker76
authored andcommitted
Fixing issue with botched nuspec merge.
1 parent 113bcca commit c3e2d70

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

MaterialDesignColors.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>MaterialDesignColors</id>
5-
<version>1.1.3-beta</version>
5+
<version>1.1.4-beta</version>
66
<title>Material Design Colors XAML Resources</title>
77
<authors>James Willock</authors>
88
<owners>James Willock</owners>
@@ -18,5 +18,5 @@
1818
<files>
1919
<file src="MaterialDesignColors.Wpf\bin\Release\MaterialDesignColors.dll" target="lib\net45" />
2020
<file src="MaterialDesignColors.Wpf\bin\Release\MaterialDesignColors.pdb" target="lib\net45" />
21-
</files>
21+
</files>
2222
</package>

MaterialDesignThemes.MahApps.nuspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
1616
<tags>WPF XAML WinRT Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
18-
<dependency id="MaterialDesignColors" version="1.1.3" />
19-
<dependency id="MaterialDesignThemes" version="2.3.2" />
20-
<dependency id="MahApps.Metro" version="1.6.0" />
18+
<dependency id="MaterialDesignColors" version="1.1.*" />
19+
<dependency id="MaterialDesignThemes" version="2.5.*" />
20+
<dependency id="MahApps.Metro" version="1.6.*" />
2121
</dependencies>
2222
</metadata>
23-
<files>
23+
<files>
2424
<file src="MaterialDesignThemes.MahApps\bin\Release\MaterialDesignThemes.MahApps.dll" target="lib\net45" />
25-
</files>
25+
</files>
2626
</package>

MaterialDesignThemes.nuspec

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
1616
<tags>WPF XAML WinRT Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
18-
<dependency id="MaterialDesignColors" version="1.1.3" />
19-
<dependency id="MaterialDesignThemes" version="2.4.1" />
20-
<dependency id="MahApps.Metro" version="1.6.5" />
18+
<dependency id="MaterialDesignColors" version="1.1.*" />
2119
</dependencies>
2220
</metadata>
23-
<files>
24-
<file src="MaterialDesignThemes.MahApps\bin\Release\MaterialDesignThemes.MahApps.dll" target="lib\net45" />
25-
</files>
21+
<files>
22+
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\MaterialDesignThemes.Wpf.dll" target="lib\net45" />
23+
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\MaterialDesignThemes.Wpf.pdb" target="lib\net45" />
24+
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\MaterialDesignThemes.Wpf.xml" target="lib\net45" />
25+
<file src="MaterialDesignThemes.Wpf\**\*.cs" target="src\net45" />
26+
</files>
2627
</package>

0 commit comments

Comments
 (0)