Skip to content

Commit 6ed61a5

Browse files
KebooKeboo
authored
Cleanup pipeline (#1538)
* WIP cleaning up build pipeline since we no longer need AppVeyor. * Parameterizing the nuget to make local builds easier. * Fixing license url Fixing framework dependency groups * Script and nuspec updates to handle the icons * Fixing dependency group * Moving build script and adding all NuGets * Adding netcore target to nuget package. * Adding default dependency group * Updating build pipeline to build NuGet packages. * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines
1 parent e331c4f commit 6ed61a5

14 files changed

+120
-265
lines changed

‎MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,10 @@
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1010
<AssemblyTitle>MahMaterialDragablzMashUp</AssemblyTitle>
1111
<Product>MahMaterialDragablzMashUp</Product>
12-
<Copyright>Copyright © 2015</Copyright>
12+
<Copyright>Copyright © 2019</Copyright>
1313
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
14-
<Configurations>Debug;Release;AppVeyor</Configurations>
15-
</PropertyGroup>
16-
<PropertyGroup>
17-
<StartupObject />
18-
</PropertyGroup>
19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|Any CPU'">
20-
<OutputPath>bin\AppVeyor\</OutputPath>
21-
<DefineConstants>TRACE</DefineConstants>
22-
<Optimize>true</Optimize>
23-
<DebugType>pdbonly</DebugType>
14+
<Configurations>Debug;Release</Configurations>
2415
<ErrorReport>prompt</ErrorReport>
25-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2616
<Prefer32Bit>true</Prefer32Bit>
2717
</PropertyGroup>
2818
<ItemGroup>
@@ -36,10 +26,5 @@
3626
<ItemGroup>
3727
<Resource Include="Resources\ProfilePic.jpg" />
3828
</ItemGroup>
39-
<ItemGroup>
40-
<Compile Remove="obj\AppVeyor\Dialogs.g.cs" />
41-
<Compile Remove="obj\AppVeyor\FlyoutContent.g.cs" />
42-
<Compile Remove="obj\AppVeyor\Mah.g.cs" />
43-
</ItemGroup>
4429
<Import Project="..\.paket\Paket.Restore.targets" />
4530
</Project>

‎MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,17 @@
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
88
<AssemblyTitle>MaterialDesignColors.WpfExample</AssemblyTitle>
99
<Product>MaterialDesignColors.WpfExample</Product>
10-
<Copyright>Copyright © 2015</Copyright>
10+
<Copyright>Copyright © 2019</Copyright>
1111
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
12-
<Configurations>Debug;Release;AppVeyor</Configurations>
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
15-
<UseWPF>true</UseWPF>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
18-
<OutputPath>bin\AppVeyor\</OutputPath>
19-
<DefineConstants>TRACE</DefineConstants>
20-
<Optimize>true</Optimize>
21-
<DebugType>pdbonly</DebugType>
12+
<Configurations>Debug;Release</Configurations>
2213
<ErrorReport>prompt</ErrorReport>
23-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2414
<Prefer32Bit>true</Prefer32Bit>
25-
</PropertyGroup>
26-
<PropertyGroup>
2715
<ApplicationIcon>favicon.ico</ApplicationIcon>
2816
<LangVersion>8.0</LangVersion>
2917
</PropertyGroup>
18+
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
19+
<UseWPF>true</UseWPF>
20+
</PropertyGroup>
3021
<Import Project="..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets" Label="Paket" />
3122
<Target Name="ShowMeTheXAML_EnsureXamlCreated" AfterTargets="BeforeCompile">
3223
<Error Condition="('$(ShowMeTheXAMLGeneratedFileName)' == '' Or $(ShowMeTheXAMLGeneratedFileName) == '*Undefined*') And Exists('..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets')" Text="ShowMeTheXAML was added to the $(ProjectName) project. Please rebuild the project." />
@@ -238,33 +229,14 @@
238229
<ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
239230
</ItemGroup>
240231
<ItemGroup>
241-
<Resource Include="Resources\ProfilePic.jpg" />
232+
<Resource Include="Resources\*.jpg" />
233+
<Resource Include="Resources\*.png" />
242234
</ItemGroup>
243235
<ItemGroup>
244236
<Resource Include="ScreenGrabFromGoogle.gif" />
245237
</ItemGroup>
246-
<ItemGroup>
247-
<Resource Include="Resources\Chartridge046_small.jpg" />
248-
</ItemGroup>
249-
<ItemGroup>
250-
<Resource Include="Resources\ms-icon-310x310.png" />
251-
</ItemGroup>
252-
<ItemGroup>
253-
<Resource Include="Resources\Contact.png" />
254-
</ItemGroup>
255238
<ItemGroup>
256239
<Resource Include="favicon.ico" />
257240
</ItemGroup>
258-
<ItemGroup>
259-
<Compile Remove="obj\AppVeyor\GeneratedInternalTypeHelper.g.cs" />
260-
<Compile Remove="obj\AppVeyor\Lists.g.cs" />
261-
<Compile Remove="obj\AppVeyor\Palette.g.cs" />
262-
<Compile Remove="obj\AppVeyor\ShowMeTheXaml_XamlDictionary.g.cs" />
263-
<Compile Remove="obj\AppVeyor\Sliders.g.cs" />
264-
<Compile Remove="obj\AppVeyor\Transitions.g.cs" />
265-
<Compile Remove="obj\AppVeyor\Typography.g.cs" />
266-
<Compile Remove="obj\AppVeyor\Domain\SampleProgressDialog.g.cs" />
267-
<Compile Remove="obj\AppVeyor\TransitionsDemo\Slide8_Details.g.cs" />
268-
</ItemGroup>
269241
<Import Project="..\.paket\Paket.Restore.targets" />
270242
</Project>

‎MaterialDesignColors.Wpf/ColorManipulation/Hsv.cs

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

‎MaterialDesignColors.Wpf/ColorManipulation/HsvConverter.cs

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

‎MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,14 @@
1111
<Company>Mulholland Software/James Willock</Company>
1212
<Product>MaterialDesignColors.Wpf</Product>
1313
<Description>Material Design in XAML Toolkit - Colors</Description>
14-
<Copyright>Copyright © 2015</Copyright>
14+
<Copyright>Copyright © 2019</Copyright>
1515
<Version>1.0.1</Version>
1616
<AssemblyVersion>1.0.1</AssemblyVersion>
1717
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
18-
<Configurations>Debug;Release;AppVeyor</Configurations>
18+
<Configurations>Debug;Release</Configurations>
1919
<LangVersion>8.0</LangVersion>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
22-
<OutputPath>bin\AppVeyor\</OutputPath>
23-
<DefineConstants>TRACE</DefineConstants>
24-
<Optimize>true</Optimize>
25-
<DebugType>pdbonly</DebugType>
2620
<ErrorReport>prompt</ErrorReport>
27-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2821
</PropertyGroup>
2922
<Import Project="..\Versioning.targets" />
30-
<ItemGroup>
31-
<Compile Remove="ColorManipulation\Hsv.cs" />
32-
<Compile Remove="ColorManipulation\HsvConverter.cs" />
33-
</ItemGroup>
3423
<Import Project="..\.paket\Paket.Restore.targets" />
3524
</Project>

‎MaterialDesignColors.nuspec

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<?xml version="1.0"?>
2-
<package >
2+
<package>
33
<metadata>
44
<id>MaterialDesignColors</id>
5-
<version>1.1.4-beta</version>
5+
<version>$version$</version>
66
<title>Material Design Colors XAML Resources</title>
77
<authors>James Willock</authors>
88
<owners>James Willock</owners>
9-
<licenseUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE</licenseUrl>
10-
<projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
9+
<license type="expression">MIT</license>
10+
<projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
1111
<iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
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>
15-
<copyright>Copyright 2019 James Willock/Mulholland Software Ltd</copyright>
15+
<copyright>$copyright$</copyright>
1616
<tags>WPF XAML Material Design Colour Color UI UX</tags>
17+
<dependencies>
18+
<group targetFramework=".NETFramework4.5" />
19+
<group targetFramework=".NETCoreApp3.0" />
20+
</dependencies>
1721
</metadata>
1822
<files>
19-
<file src="MaterialDesignColors.Wpf\bin\AppVeyor\net45\MaterialDesignColors.dll" target="lib\net45" />
20-
<file src="MaterialDesignColors.Wpf\bin\AppVeyor\net45\MaterialDesignColors.pdb" target="lib\net45" />
21-
<file src="MaterialDesignColors.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignColors.dll" target="lib\netcoreapp3.0" />
22-
<file src="MaterialDesignColors.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignColors.pdb" target="lib\netcoreapp3.0" />
23+
<file src="MaterialDesignColors.Wpf\bin\$configuration$\net45\MaterialDesignColors.*" target="lib\net45" exclude="**\*.json" />
24+
<file src="MaterialDesignColors.Wpf\bin\$configuration$\netcoreapp3.0\MaterialDesignColors.*" target="lib\netcoreapp3.0" exclude="**\*.json" />
2325
</files>
2426
</package>

‎MaterialDesignThemes.MahApps.nuspec

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,30 @@
22
<package>
33
<metadata>
44
<id>MaterialDesignThemes.MahApps</id>
5-
<version>0.1.0-beta</version>
5+
<version>$version$</version>
66
<title>Material Design Themes XAML Resources For MahApps Controls</title>
77
<authors>James Willock</authors>
88
<owners>James Willock</owners>
9-
<licenseUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE</licenseUrl>
10-
<projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
9+
<license type="expression">MIT</license>
10+
<projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
1111
<iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
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 2019 James Willock/Mulholland Software Ltd</copyright>
15+
<copyright>$copyright$</copyright>
1616
<tags>WPF XAML MahApps Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
18-
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
19-
<dependency id="MaterialDesignThemes" version="[2.6.0, 3.0)" />
20-
<dependency id="MahApps.Metro" version="1.6.*" />
18+
<group>
19+
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
20+
<dependency id="MaterialDesignThemes" version="[2.6.0, 3.0)" />
21+
<dependency id="MahApps.Metro" version="1.6.*" />
22+
</group>
23+
<group targetFramework=".NETFramework4.5" />
24+
<group targetFramework=".NETCoreApp3.0" />
2125
</dependencies>
2226
</metadata>
2327
<files>
24-
<file src="MaterialDesignThemes.MahApps\bin\Release\net45\MaterialDesignThemes.MahApps.dll" target="lib\net45" />
28+
<file src="MaterialDesignThemes.MahApps\bin\$configuration$\net45\MaterialDesignThemes.MahApps.*" target="lib\net45" exclude="**\*.json" />
29+
<file src="MaterialDesignThemes.MahApps\bin\$configuration$\netcoreapp3.0\MaterialDesignThemes.MahApps.*" target="lib\netcoreapp3.0" exclude="**\*.json" />
2530
</files>
2631
</package>

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,9 @@
1515
<AssemblyVersion>1.0.1</AssemblyVersion>
1616
<NoWarn>CS1591;CS1574</NoWarn>
1717
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
18-
<Configurations>Debug;Release;AppVeyor</Configurations>
19-
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
22-
<OutputPath>bin\AppVeyor\</OutputPath>
23-
<DefineConstants>TRACE</DefineConstants>
24-
<Optimize>true</Optimize>
25-
<DebugType>pdbonly</DebugType>
18+
<Configurations>Debug;Release</Configurations>
2619
<ErrorReport>prompt</ErrorReport>
27-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
20+
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
2821
</PropertyGroup>
2922
<Import Project="..\Versioning.targets" />
3023
<ItemGroup>

‎MaterialDesignThemes.nuspec

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
<package>
33
<metadata>
44
<id>MaterialDesignThemes</id>
5-
<version>0.1.0-beta</version>
5+
<version>$version$</version>
66
<title>Material Design Themes XAML Resources</title>
77
<authors>James Willock</authors>
88
<owners>James Willock</owners>
9-
<licenseUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE</licenseUrl>
9+
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
1111
<iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
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 2019 James Willock/Mulholland Software Ltd</copyright>
15+
<copyright>$copyright$</copyright>
1616
<tags>WPF XAML Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
18-
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
18+
<group>
19+
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
20+
</group>
21+
<group targetFramework=".NETFramework4.5" />
22+
<group targetFramework=".NETCoreApp3.0" />
1923
</dependencies>
2024
</metadata>
2125
<files>
22-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.dll" target="lib\net45" />
23-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.pdb" target="lib\net45" />
24-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.xml" target="lib\net45" />
25-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
26+
<file src="MaterialDesignThemes.Wpf\bin\$configuration$\net45\MaterialDesignThemes.Wpf.*" target="lib\net45" exclude="**\*.json" />
27+
<file src="MaterialDesignThemes.Wpf\bin\$configuration$\netcoreapp3.0\MaterialDesignThemes.Wpf.*" target="lib\netcoreapp3.0" exclude="**\*.json" />
28+
<file src="MaterialDesignThemes.Wpf\Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
2629
<file src="MaterialDesignThemes.Wpf\MaterialDesignThemes.targets" target="build" />
27-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.dll" target="lib\netcoreapp3.0" />
28-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.pdb" target="lib\netcoreapp3.0" />
29-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.xml" target="lib\netcoreapp3.0" />
3030
</files>
3131
</package>

‎MaterialDesignToolkit.ResourceGeneration.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdresgen", "mdresgen\mdresg
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
AppVeyor|Any CPU = AppVeyor|Any CPU
1110
Debug|Any CPU = Debug|Any CPU
1211
Release|Any CPU = Release|Any CPU
1312
EndGlobalSection
1413
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{8E2BD5CB-1C31-4226-8A0C-7D5BD015EF43}.AppVeyor|Any CPU.ActiveCfg = AppVeyor|Any CPU
16-
{8E2BD5CB-1C31-4226-8A0C-7D5BD015EF43}.AppVeyor|Any CPU.Build.0 = AppVeyor|Any CPU
1714
{8E2BD5CB-1C31-4226-8A0C-7D5BD015EF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1815
{8E2BD5CB-1C31-4226-8A0C-7D5BD015EF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
1916
{8E2BD5CB-1C31-4226-8A0C-7D5BD015EF43}.Release|Any CPU.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)