Skip to content

Commit a11b494

Browse files
authored
Fixes #1556 (#1558)
1 parent d2d350d commit a11b494

File tree

6 files changed

+10
-90
lines changed

6 files changed

+10
-90
lines changed

MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
77
<UseWPF>true</UseWPF>
88
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9-
<MDIXVersion>$(MDIX_COLORS_VERSION)</MDIXVersion>
9+
<MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
1010
<AssemblyTitle>MaterialDesignColors.Wpf</AssemblyTitle>
1111
<Company>Mulholland Software/James Willock</Company>
1212
<Product>MaterialDesignColors.Wpf</Product>
1313
<Description>Material Design in XAML Toolkit - Colors</Description>
1414
<Copyright>Copyright © 2019</Copyright>
15-
<Version>1.0.1</Version>
16-
<AssemblyVersion>1.0.1</AssemblyVersion>
15+
<Version>$(MDIXColorsVersion)</Version>
16+
<AssemblyVersion>$(MDIXColorsVersion)</AssemblyVersion>
1717
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1818
<Configurations>Debug;Release</Configurations>
1919
<LangVersion>8.0</LangVersion>
2020
<ErrorReport>prompt</ErrorReport>
2121
</PropertyGroup>
22-
<Import Project="..\Versioning.targets" />
2322
<Import Project="..\.paket\Paket.Restore.targets" />
2423
</Project>

MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
7-
<MDIXVersion>$(MDIX_MAHAPPS_VERSION)</MDIXVersion>
7+
<MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
88
<AssemblyTitle>MaterialDesignThemes.MahApps</AssemblyTitle>
99
<Product>MaterialDesignThemes.MahApps</Product>
1010
<Copyright>Copyright © 2015-2016 James Willock, Mulholland Software &amp; Contributors</Copyright>
11-
<Version>1.0.1</Version>
12-
<AssemblyVersion>1.0.1</AssemblyVersion>
11+
<Version>$(MDIXMahAppsVersion)</Version>
12+
<AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
1313
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1414
<LangVersion>8.0</LangVersion>
1515
</PropertyGroup>
16-
<Import Project="..\Versioning.targets" />
1716
<ItemGroup>
1817
<None Include="paket.references" />
1918
</ItemGroup>

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@
44
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
7-
<MDIXVersion>$(MDIX_CORE_VERSION)</MDIXVersion>
7+
<MDIXVersion Condition="$(MDIXVersion) == '' Or $(MDIXVersion) == '*Undefined*'">1.0.1</MDIXVersion>
88
<LangVersion>8.0</LangVersion>
99
<AssemblyTitle>MaterialDesignThemes.Wpf</AssemblyTitle>
1010
<Company>Mulholland Software/James Willock</Company>
1111
<Product>MaterialDesignColors.Wpf</Product>
1212
<Description>Material Design in XAML Toolkit - WPF Themes</Description>
1313
<Copyright>Copyright © 2019</Copyright>
14-
<Version>1.0.1</Version>
15-
<AssemblyVersion>1.0.1</AssemblyVersion>
14+
<Version>$(MDIXVersion)</Version>
15+
<AssemblyVersion>$(MDIXVersion)</AssemblyVersion>
1616
<NoWarn>CS1591;CS1574</NoWarn>
1717
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1818
<Configurations>Debug;Release</Configurations>
1919
<ErrorReport>prompt</ErrorReport>
2020
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
2121
</PropertyGroup>
22-
<Import Project="..\Versioning.targets" />
2322
<ItemGroup>
2423
<Compile Include="..\paket-files\ControlzEx\ControlzEx\src\ControlzEx\BadgedEx.cs">
2524
<Paket>True</Paket>

MaterialDesignToolkit.Wpf.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
4040
MaterialDesignThemes.nuspec = MaterialDesignThemes.nuspec
4141
paket.dependencies = paket.dependencies
4242
paket.lock = paket.lock
43-
Versioning.targets = Versioning.targets
4443
EndProjectSection
4544
EndProject
4645
Global

Versioning.targets

Lines changed: 0 additions & 76 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ steps:
4747
displayName: 'dotnet build'
4848
inputs:
4949
projects: '$(solution)'
50-
arguments: '/p:Configuration=$(buildConfiguration) /p:Platform="Any CPU" /p:MDIX_CORE_VERSION=$(mdixVersion).$(Build.BuildID) /p:MDIX_COLORS_VERSION=$(mdixColorsVersion).$(Build.BuildID) /p:MDIX_MAHAPPS_VERSION=$(mdixMahappsVersion).$(Build.BuildID)'
50+
arguments: '/p:Configuration=$(buildConfiguration) /p:Platform="Any CPU" /p:MDIXVersion=$(mdixVersion).$(Build.BuildID) /p:MDIXColorsVersion=$(mdixColorsVersion).$(Build.BuildID) /p:MDIXMahAppsVersion=$(mdixMahappsVersion).$(Build.BuildID)'
5151

5252
- task: DotNetCoreCLI@2
5353
displayName: 'dotnet test'

0 commit comments

Comments
 (0)