Skip to content

Commit 4055269

Browse files
adamralphadamralph
authored
Merge pull request #783 from adamralph/refactor
refactor: align ignoreHeight parameter
2 parents d916c09 + bb5e768 commit 4055269

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

‎MinVer.Lib/Versioner.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace MinVer.Lib;
77

88
public static class Versioner
99
{
10-
public static Version GetVersion(string workDir, string tagPrefix, MajorMinor minMajorMinor, string buildMeta, VersionPart autoIncrement, string defaultPreReleasePhase, ILogger log, bool ignoreHeight = false)
10+
public static Version GetVersion(string workDir, string tagPrefix, MajorMinor minMajorMinor, string buildMeta, VersionPart autoIncrement, string defaultPreReleasePhase, bool ignoreHeight, ILogger log)
1111
{
1212
log = log ?? throw new ArgumentNullException(nameof(log));
1313

‎MinVerTests.Lib/AutoIncrement.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static async Task RtmVersionIncrement(string tag, VersionPart autoIncreme
2323
await Commit(path);
2424

2525
// act
26-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", autoIncrement, "", NullLogger.Instance);
26+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", autoIncrement, "", false, NullLogger.Instance);
2727

2828
// assert
2929
Assert.Equal(expectedVersion, actualVersion.ToString());

‎MinVerTests.Lib/BuildMetadata.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static async Task NoCommits(string buildMetadata, string expectedVersion)
2020
await EnsureEmptyRepository(path);
2121

2222
// act
23-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
23+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
2424

2525
// assert
2626
Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -36,7 +36,7 @@ public static async Task NoTag(string buildMetadata, string expectedVersion)
3636
await EnsureEmptyRepositoryAndCommit(path);
3737

3838
// act
39-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
39+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
4040

4141
// assert
4242
Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -57,7 +57,7 @@ public static async Task CurrentTag(string tag, string buildMetadata, string exp
5757
await Tag(path, tag);
5858

5959
// act
60-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
60+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
6161

6262
// assert
6363
Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -79,7 +79,7 @@ public static async Task PreviousTag(string tag, string buildMetadata, string ex
7979
await Commit(path);
8080

8181
// act
82-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", NullLogger.Instance);
82+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, buildMetadata, default, "", false, NullLogger.Instance);
8383

8484
// assert
8585
Assert.Equal(expectedVersion, actualVersion.ToString());

‎MinVerTests.Lib/DefaultPreReleasePhases.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static async Task DefaultPreReleasePhase(string phase, string expectedVer
2020
await EnsureEmptyRepositoryAndCommit(path);
2121

2222
// act
23-
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, phase, NullLogger.Instance);
23+
var actualVersion = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, phase, false, NullLogger.Instance);
2424

2525
// assert
2626
Assert.Equal(expectedVersion, actualVersion.ToString());

‎MinVerTests.Lib/LogMessages.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ git checkout main
6868
var log = new TestLogger();
6969

7070
// act
71-
_ = Versioner.GetVersion(path, "", minMajorMinor, "", default, "", log);
71+
_ = Versioner.GetVersion(path, "", minMajorMinor, "", default, "", false, log);
7272

7373
// assert
7474
var logMessages = log.ToString();

‎MinVerTests.Lib/MinMajorMinor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static async Task NoCommits()
1919
await EnsureEmptyRepository(path);
2020

2121
// act
22-
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 2), "", default, "", NullLogger.Instance);
22+
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 2), "", default, "", false, NullLogger.Instance);
2323

2424
// assert
2525
Assert.Equal("1.2.0-alpha.0", actualVersion.ToString());
@@ -38,7 +38,7 @@ public static async Task Tagged(string tag, int major, int minor, string expecte
3838
var logger = new TestLogger();
3939

4040
// act
41-
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(major, minor), "", default, "", logger);
41+
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(major, minor), "", default, "", false, logger);
4242

4343
// assert
4444
Assert.Equal(expectedVersion, actualVersion.ToString());
@@ -57,7 +57,7 @@ public static async Task NotTagged()
5757
await EnsureEmptyRepositoryAndCommit(path);
5858

5959
// act
60-
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 0), "", default, "", NullLogger.Instance);
60+
var actualVersion = Versioner.GetVersion(path, "", new MajorMinor(1, 0), "", default, "", false, NullLogger.Instance);
6161

6262
// assert
6363
Assert.Equal("1.0.0-alpha.0", actualVersion.ToString());

‎MinVerTests.Lib/TagPrefixes.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static async Task TagPrefix(string tag, string prefix, string expectedVer
2222
await Tag(path, tag);
2323

2424
// act
25-
var actualVersion = Versioner.GetVersion(path, prefix, MajorMinor.Zero, "", default, "", NullLogger.Instance);
25+
var actualVersion = Versioner.GetVersion(path, prefix, MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
2626

2727
// assert
2828
Assert.Equal(expectedVersion, actualVersion.ToString());

‎MinVerTests.Lib/Versions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ git tag 1.1.0 -a -m '.'
8585
{
8686
await Checkout(path, sha);
8787

88-
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", log);
88+
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, log);
8989
var versionString = version.ToString();
9090
var tagName = $"v/{versionString}";
9191

@@ -114,7 +114,7 @@ public static async Task EmptyRepo()
114114
await EnsureEmptyRepository(path);
115115

116116
// act
117-
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", NullLogger.Instance);
117+
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
118118

119119
// assert
120120
Assert.Equal("0.0.0-alpha.0", version.ToString());
@@ -128,7 +128,7 @@ public static void NoRepo()
128128
EnsureEmptyDirectory(path);
129129

130130
// act
131-
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", NullLogger.Instance);
131+
var version = Versioner.GetVersion(path, "", MajorMinor.Zero, "", default, "", false, NullLogger.Instance);
132132

133133
// assert
134134
Assert.Equal("0.0.0-alpha.0", version.ToString());

‎minver-cli/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private static int Main(string[] args)
7878
return 0;
7979
}
8080

81-
var version = Versioner.GetVersion(workDir, options.TagPrefix ?? "", options.MinMajorMinor ?? MajorMinor.Zero, options.BuildMeta ?? "", options.AutoIncrement ?? default, options.DefaultPreReleasePhase ?? "", log, options.IgnoreHeight ?? false);
81+
var version = Versioner.GetVersion(workDir, options.TagPrefix ?? "", options.MinMajorMinor ?? MajorMinor.Zero, options.BuildMeta ?? "", options.AutoIncrement ?? default, options.DefaultPreReleasePhase ?? "", options.IgnoreHeight ?? false, log);
8282

8383
Console.Out.WriteLine(version);
8484

0 commit comments

Comments
 (0)