From 5354d1d0828ff70902feb20c31e889f4d31cebe3 Mon Sep 17 00:00:00 2001 From: Dieter Lunn Date: Tue, 2 Jul 2024 08:32:43 -0500 Subject: [PATCH] chore: update gitversion config --- GitVersion.yml | 1 + build/Build.cs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 05e9ac4..ed16160 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,3 +2,4 @@ mode: ContinuousDelivery branches: {} ignore: sha: [] +merge-message-formats: {} diff --git a/build/Build.cs b/build/Build.cs index 6b9b2de..0b8237f 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -29,7 +29,7 @@ FetchDepth = 0)] [GitHubActions( "continuous", - GitHubActionsImage.WindowsLatest, + GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest, GitHubActionsImage.MacOsLatest, OnPushBranchesIgnore = [MasterBranch, ReleaseBranchPrefix + "/*"], @@ -50,9 +50,9 @@ class Build : NukeBuild [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release; - [Required] [GitRepository] readonly GitRepository GitRepository; - [Required] [GitVersion] readonly GitVersion GitVersion; - [Required] [Solution] readonly Solution Solution; + [Required][GitRepository] readonly GitRepository GitRepository; + [Required][GitVersion] readonly GitVersion GitVersion; + [Required][Solution] readonly Solution Solution; AbsolutePath SourceDirectory => RootDirectory / "src"; AbsolutePath TestsDirectory => RootDirectory / "tests"; @@ -106,7 +106,7 @@ class Build : NukeBuild SonarScannerBegin(_ => _ .SetProjectKey(SonarProjectKey) .SetServer("https://sonarcloud.io") - .SetVersion(GitVersion.NuGetVersionV2) + .SetVersion(GitVersion.NuGetVersion) .SetOpenCoverPaths(ArtifactsDirectory / "coverage.opencover.xml") .SetProcessArgumentConfigurator(args => args.Add("/o:ubiety")) .SetFramework("net8.0")); @@ -124,7 +124,7 @@ class Build : NukeBuild }); [Parameter] readonly bool Cover = true; - Project TestProject => Solution.GetProject("Ubiety.Stringprep.Tests"); + Project TestProject => Solution.GetProject("Ubiety.Stringprep.Tests"); Target Test => _ => _ .DependsOn(Compile) @@ -142,7 +142,7 @@ class Build : NukeBuild }); string ChangelogFile => RootDirectory / "CHANGELOG.md"; - + Target Pack => _ => _ .DependsOn(Compile) .After(Test) @@ -153,7 +153,7 @@ class Build : NukeBuild .SetNoBuild(InvokedTargets.Contains(Compile)) .SetConfiguration(Configuration) .SetOutputDirectory(ArtifactsDirectory) - .SetVersion(GitVersion.NuGetVersionV2) + .SetVersion(GitVersion.NuGetVersion) .SetPackageReleaseNotes(GetNuGetReleaseNotes(ChangelogFile, GitRepository))); }); @@ -179,7 +179,7 @@ class Build : NukeBuild .SetUsername(GitHubActions.Actor) .SetPassword(GitHubToken)); } - + DotNetNuGetPush(_ => _ .SetApiKey(NuGetKey) .SetSource(Source)