From db53131571a77db6cd4a86eb971edf6b40a3aee8 Mon Sep 17 00:00:00 2001 From: punker76 Date: Tue, 15 Oct 2024 22:18:50 +0200 Subject: [PATCH 1/3] chore: update cake to 3.2.0 and build deps --- .config/dotnet-tools.json | 2 +- build.cake | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index dd76b6d..c33ff7c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.3.0", + "version": "3.2.0", "commands": [ "dotnet-cake" ] diff --git a/build.cake b/build.cake index 5d092c3..1edbbb2 100644 --- a/build.cake +++ b/build.cake @@ -5,12 +5,11 @@ #tool dotnet:?package=NuGetKeyVaultSignTool&version=3.2.3 #tool dotnet:?package=AzureSignTool&version=4.0.1 #tool dotnet:?package=GitReleaseManager.Tool&version=0.17.0 -#tool dotnet:?package=XamlStyler.Console&version=3.2206.4 +#tool dotnet:?package=XamlStyler.Console&version=3.2404.2 #tool vswhere&version=2.8.4 #tool nuget:?package=GitVersion.CommandLine&version=5.12.0 -#addin nuget:?package=Cake.Figlet&version=2.0.1 /////////////////////////////////////////////////////////////////////////////// // ARGUMENTS @@ -47,11 +46,10 @@ if (isLocal == false || verbosity == Verbosity.Verbose) GitVersion gitVersion = GitVersion(new GitVersionSettings { OutputType = GitVersionOutput.Json }); -var isPullRequest = (isAppVeyorBuild && AppVeyor.Environment.PullRequest.IsPullRequest) || (isGitHubActionsBuild && GitHubActions.Environment.PullRequest.IsPullRequest); - +var isPrerelease = gitVersion.NuGetVersion.Contains("-"); var branchName = gitVersion.BranchName; -var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName); -var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("main", branchName); + +var isPullRequest = (isAppVeyorBuild && AppVeyor.Environment.PullRequest.IsPullRequest) || (isGitHubActionsBuild && GitHubActions.Environment.PullRequest.IsPullRequest); var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = false }); var msBuildPath = latestInstallationPath.Combine("./MSBuild/Current/Bin"); @@ -75,9 +73,9 @@ Setup(ctx => { throw new NotImplementedException($"{repoName} will only build on Windows because it's not possible to target WPF and Windows Forms from UNIX."); } - - Information(Figlet("MahApps.Metro")); - Information(Figlet("IconPacks")); + + Spectre.Console.AnsiConsole.Write(new Spectre.Console.FigletText("MahApps.Metro")); + Spectre.Console.AnsiConsole.Write(new Spectre.Console.FigletText("IconPacks")); Information("Informational Version: {0}", gitVersion.InformationalVersion); Information("SemVer Version: {0}", gitVersion.SemVer); @@ -85,6 +83,7 @@ Setup(ctx => Information("MajorMinorPatch Version: {0}", gitVersion.MajorMinorPatch); Information("NuGet Version: {0}", gitVersion.NuGetVersion); Information("IsLocalBuild : {0}", isLocal); + Information("IsPrerelease : {0}", isPrerelease); Information("Branch : {0}", branchName); Information("Configuration : {0}", configuration); Information("MSBuildPath : {0}", msBuildPath); @@ -135,11 +134,11 @@ Task("Build") .WithProperty("PackageOutputPath", MakeAbsolute(PACKAGE_DIR).ToString()) .WithProperty("RepositoryBranch", branchName) .WithProperty("RepositoryCommit", gitVersion.Sha) - .WithProperty("Version", isReleaseBranch ? gitVersion.MajorMinorPatch : gitVersion.NuGetVersion) + .WithProperty("Version", gitVersion.NuGetVersion) .WithProperty("AssemblyVersion", gitVersion.AssemblySemVer) .WithProperty("FileVersion", gitVersion.AssemblySemFileVer) .WithProperty("InformationalVersion", gitVersion.InformationalVersion) - .WithProperty("ContinuousIntegrationBuild", isReleaseBranch ? "true" : "false") + .WithProperty("ContinuousIntegrationBuild", "true") ); }); @@ -309,7 +308,7 @@ Task("CreateRelease") GitReleaseManagerCreate(token, "MahApps", repoName, new GitReleaseManagerCreateSettings { Milestone = gitVersion.MajorMinorPatch, Name = gitVersion.AssemblySemFileVer, - Prerelease = isDevelopBranch, + Prerelease = isPrerelease, TargetCommitish = branchName, WorkingDirectory = "." }); From f6c493c5f953b7b0847abbf8d58ad3ed45756903 Mon Sep 17 00:00:00 2001 From: punker76 Date: Tue, 15 Oct 2024 22:26:17 +0200 Subject: [PATCH 2/3] chore: set minimum sdk to 8.0.403 --- README.md | 8 ++++---- appveyor.yml | 6 +++--- build.cake | 2 +- global.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 44bf482..c381c69 100644 --- a/README.md +++ b/README.md @@ -79,13 +79,13 @@ It's not necessary, but you can use these Icons together with [MahApps.Metro](ht ## Want to say thanks? -This framework is free and can be used for free, open source and commercial applications. +This library is free and can be used in open source and commercial applications. -It's tested and contributed by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...). +It's tested, contributed and used by many people... So mainly hit the :star: button, that's all... thx :squirrel: (:dollar:, :euro:, :beer: or some other gifts are also being accepted...). -Please give also a star to all available icon repositories. +Please don't forget to give also a star to all available icon repositories. -[Become a sponsor](https://github.com/sponsors/punker76) and show your support to this open source project. + ## IconPacks Browser diff --git a/appveyor.yml b/appveyor.yml index 0eb8eeb..8a5c441 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,11 +23,11 @@ skip_tags: true image: Visual Studio 2022 test: false -# install: +install: + - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' + - ps: ./dotnet-install.ps1 -Version 8.0.403 -InstallDir "C:\Program Files\dotnet" # Install Windows SDK 10.0.18362 # - ps: .\build\Install-WindowsSDK.ps1 -# - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' -# - ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet" pull_requests: do_not_increment_build_number: false diff --git a/build.cake b/build.cake index 1edbbb2..a0b6e4f 100644 --- a/build.cake +++ b/build.cake @@ -138,7 +138,7 @@ Task("Build") .WithProperty("AssemblyVersion", gitVersion.AssemblySemVer) .WithProperty("FileVersion", gitVersion.AssemblySemFileVer) .WithProperty("InformationalVersion", gitVersion.InformationalVersion) - .WithProperty("ContinuousIntegrationBuild", "true") + .WithProperty("ContinuousIntegrationBuild", isLocal ? "false": "true") ); }); diff --git a/global.json b/global.json index 9e64d40..35b7887 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.403", "rollForward": "feature" }, "msbuild-sdks": { From c5b5b68277b904c610016b62ea85df49fbdd7733 Mon Sep 17 00:00:00 2001 From: punker76 Date: Tue, 15 Oct 2024 22:27:12 +0200 Subject: [PATCH 3/3] fix: update package refs because of vulnerable dependencies --- src/Directory.build.props | 2 +- .../MahApps.Metro.IconPacks.Core.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 53c7863..77b1e2e 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -63,7 +63,7 @@ - + diff --git a/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj b/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj index 6576236..17c1e0a 100644 --- a/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj +++ b/src/MahApps.Metro.IconPacks.Core/MahApps.Metro.IconPacks.Core.csproj @@ -12,8 +12,8 @@ - - + +