Skip to content

Commit 62e5e7b

Browse files
punker76punker76
authored
Merge pull request #4520 from MahApps/deps
Update cake and MahApps.Metro.IconPacks
2 parents 721af24 + 9d9193f commit 62e5e7b

File tree

4 files changed

+55
-54
lines changed

4 files changed

+55
-54
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "3.1.0",
6+
"version": "4.0.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎build.cake

+14-19
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
#tool dotnet:?package=GitReleaseManager.Tool&version=0.15.0
88
#tool dotnet:?package=XamlStyler.Console&version=3.2404.2
99
#tool nuget:?package=GitVersion.CommandLine&version=5.12.0
10-
#tool nuget:?package=NUnit.ConsoleRunner&version=3.18.3
11-
12-
#addin nuget:?package=Cake.Figlet&version=2.0.1
1310

1411
///////////////////////////////////////////////////////////////////////////////
1512
// ARGUMENTS
@@ -28,6 +25,8 @@ var solution = srcDir + "/MahApps.Metro.sln";
2825
var publishDir = baseDir + "/Publish";
2926
var testResultsDir = Directory(baseDir + "/TestResults");
3027

28+
var gitVersionPath = Context.Tools.Resolve("gitversion.exe");
29+
3130
var styler = Context.Tools.Resolve("xstyler.exe");
3231
var stylerFile = baseDir + "/Settings.XAMLStyler";
3332

@@ -38,8 +37,7 @@ public class BuildData
3837
public DotNetVerbosity DotNetVerbosity { get; }
3938
public bool IsLocalBuild { get; set; }
4039
public bool IsPullRequest { get; set; }
41-
public bool IsDevelopBranch { get; set; }
42-
public bool IsReleaseBranch { get; set; }
40+
public bool IsPrerelease { get; set; }
4341
public GitVersion GitVersion { get; set; }
4442

4543
public BuildData(
@@ -56,9 +54,7 @@ public class BuildData
5654
public void SetGitVersion(GitVersion gitVersion)
5755
{
5856
GitVersion = gitVersion;
59-
60-
IsDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", GitVersion.BranchName);
61-
IsReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("main", GitVersion.BranchName);
57+
IsPrerelease = GitVersion.NuGetVersion.Contains("-");
6258
}
6359
}
6460

@@ -73,11 +69,7 @@ Setup<BuildData>(ctx =>
7369
throw new NotImplementedException($"{repoName} will only build on Windows because it's not possible to target WPF and Windows Forms from UNIX.");
7470
}
7571

76-
Information(Figlet(repoName));
77-
78-
var gitVersionPath = Context.Tools.Resolve("gitversion.exe");
79-
80-
Information("GitVersion : {0}", gitVersionPath);
72+
Spectre.Console.AnsiConsole.Write(new Spectre.Console.FigletText(repoName));
8173

8274
var buildData = new BuildData(
8375
configuration: Argument("configuration", "Release"),
@@ -98,15 +90,18 @@ Setup<BuildData>(ctx =>
9890
}
9991
buildData.SetGitVersion(GitVersion(new GitVersionSettings { ToolPath = gitVersionPath, OutputType = GitVersionOutput.Json }));
10092

93+
Information("GitVersion : {0}", gitVersionPath);
10194
Information("Branch : {0}", buildData.GitVersion.BranchName);
10295
Information("Configuration : {0}", buildData.Configuration);
10396
Information("IsLocalBuild : {0}", buildData.IsLocalBuild);
97+
Information("IsPrerelease : {0}", buildData.IsPrerelease);
10498
Information("Informational Version: {0}", buildData.GitVersion.InformationalVersion);
10599
Information("SemVer Version: {0}", buildData.GitVersion.SemVer);
106100
Information("AssemblySemVer Version: {0}", buildData.GitVersion.AssemblySemVer);
107101
Information("MajorMinorPatch Version: {0}", buildData.GitVersion.MajorMinorPatch);
108102
Information("NuGet Version: {0}", buildData.GitVersion.NuGetVersion);
109103
Information("Verbosity : {0}", buildData.Verbosity);
104+
Information("Publish folder : {0}", publishDir);
110105

111106
return buildData;
112107
});
@@ -123,8 +118,7 @@ Task("Clean")
123118
.ContinueOnError()
124119
.Does(() =>
125120
{
126-
var filesToDelete = GetFiles("**/*_wpftmp.csproj")
127-
;
121+
var filesToDelete = GetFiles("**/*_wpftmp.csproj");
128122
DeleteFiles(filesToDelete);
129123

130124
var directoriesToDelete = GetDirectories("./**/obj")
@@ -146,11 +140,11 @@ Task("Build")
146140
var msbuildSettings = new DotNetMSBuildSettings
147141
{
148142
MaxCpuCount = 0,
149-
Version = data.IsReleaseBranch ? data.GitVersion.MajorMinorPatch : data.GitVersion.NuGetVersion,
143+
Version = data.GitVersion.NuGetVersion,
150144
AssemblyVersion = data.GitVersion.AssemblySemVer,
151145
FileVersion = data.GitVersion.AssemblySemFileVer,
152146
InformationalVersion = data.GitVersion.InformationalVersion,
153-
ContinuousIntegrationBuild = data.IsReleaseBranch,
147+
ContinuousIntegrationBuild = true,
154148
ArgumentCustomization = args => args.Append("/m").Append("/nr:false") // The /nr switch tells msbuild to quite once it's done
155149
};
156150
// msbuildSettings.FileLoggers.Add(
@@ -182,7 +176,7 @@ Task("Pack")
182176
var msbuildSettings = new DotNetMSBuildSettings
183177
{
184178
MaxCpuCount = 0,
185-
Version = data.IsReleaseBranch ? data.GitVersion.MajorMinorPatch : data.GitVersion.NuGetVersion,
179+
Version = data.GitVersion.NuGetVersion,
186180
AssemblyVersion = data.GitVersion.AssemblySemVer,
187181
FileVersion = data.GitVersion.AssemblySemFileVer,
188182
InformationalVersion = data.GitVersion.InformationalVersion
@@ -306,6 +300,7 @@ Task("Tests")
306300
Configuration = data.Configuration,
307301
NoBuild = true,
308302
NoRestore = true,
303+
Loggers = new[] { "trx" },
309304
ResultsDirectory = testResultsDir,
310305
Verbosity = data.DotNetVerbosity
311306
};
@@ -338,7 +333,7 @@ Task("CreateRelease")
338333
GitReleaseManagerCreate(token, "MahApps", repoName, new GitReleaseManagerCreateSettings {
339334
Milestone = data.GitVersion.MajorMinorPatch,
340335
Name = data.GitVersion.AssemblySemFileVer,
341-
Prerelease = data.IsDevelopBranch,
336+
Prerelease = data.IsPrerelease,
342337
TargetCommitish = data.GitVersion.BranchName,
343338
WorkingDirectory = "."
344339
});

‎src/global.json ‎global.json

File renamed without changes.

‎src/Directory.packages.props

+40-34
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5-
</PropertyGroup>
6-
<ItemGroup Label="Build">
7-
<PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
8-
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
9-
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
11-
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
12-
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.0.0" />
13-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0" />
14-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.0.0" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0" />
17-
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
18-
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
19-
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
20-
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
21-
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
22-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
23-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
24-
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
25-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
26-
<PackageVersion Include="System.Memory" Version="4.5.5" />
27-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
28-
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
29-
</ItemGroup>
30-
<ItemGroup Label="Test">
31-
<PackageVersion Include="NUnit" Version="4.2.2" />
32-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
33-
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
34-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
35-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup Label="Build">
7+
<PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
8+
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
9+
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
11+
12+
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
13+
14+
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.0.1" />
15+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.1" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.0.1" />
17+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.0.1" />
18+
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.1" />
19+
20+
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
21+
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
22+
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
23+
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
24+
25+
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
26+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
27+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
28+
29+
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
30+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
31+
<PackageVersion Include="System.Memory" Version="4.5.5" />
32+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
33+
34+
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
35+
</ItemGroup>
36+
<ItemGroup Label="Test">
37+
<PackageVersion Include="NUnit" Version="4.2.2" />
38+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
39+
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
40+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
41+
</ItemGroup>
3642
</Project>

0 commit comments

Comments
 (0)