From 22088602c51bfc9e0e42c68991753a0db3b5d1b6 Mon Sep 17 00:00:00 2001 From: David Eberhardt <44290340+DEberhardt@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:47:23 +0000 Subject: [PATCH 1/5] Update Step-Version.ps1 Separated Build and Revision --- BuildHelpers/Public/Step-Version.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BuildHelpers/Public/Step-Version.ps1 b/BuildHelpers/Public/Step-Version.ps1 index 7aca28c..b3889fb 100644 --- a/BuildHelpers/Public/Step-Version.ps1 +++ b/BuildHelpers/Public/Step-Version.ps1 @@ -54,6 +54,7 @@ function Step-Version { $major = $Version.Major $minor = $Version.Minor $build = $Version.Build + $patch = $Version.Revision switch ($By) { "Major" { $major++ @@ -63,8 +64,12 @@ function Step-Version { "Minor" { $minor++ $build = 0 break } - Default { $build++ + "Build" { $build++ break } + Default { + if ($patch -lt 0) { $patch = 1 } else { $patch++ } + Write-Output (New-Object Version -ArgumentList $major, $minor, $build, $patch).ToString() + return } } Write-Output (New-Object Version -ArgumentList $major, $minor, $build).ToString() From 68496b0d2c63277310afad7a90229db9122e83fd Mon Sep 17 00:00:00 2001 From: David Eberhardt <44290340+DEberhardt@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:12:41 +0000 Subject: [PATCH 2/5] Update BuildHelpers.Tests.ps1 Update Tests to be in line with changes to Step-Version --- Tests/BuildHelpers.Tests.ps1 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Tests/BuildHelpers.Tests.ps1 b/Tests/BuildHelpers.Tests.ps1 index a5b261d..9f29e64 100644 --- a/Tests/BuildHelpers.Tests.ps1 +++ b/Tests/BuildHelpers.Tests.ps1 @@ -74,11 +74,21 @@ Describe "Get-ProjectName PS$PSVersion" { Describe 'Step-Version' { Context 'By Param' { + It 'Should increment the Revision level' { + $result = Step-Version @Verbose 1.1.1 Revision + $result | Should Be 1.1.1.1 + } + It 'Should increment the Patch level' { $result = Step-Version @Verbose 1.1.1 $result | Should Be 1.1.2 } - + + It 'Should increment the Build level' { + $result = Step-Version @Verbose 1.1.1 + $result | Should Be 1.1.2 + } + It 'Should increment the Minor level and set Patch level to 0' { $result = Step-Version @Verbose 1.1.1 Minor $result | Should Be 1.2.0 @@ -91,6 +101,16 @@ Describe 'Step-Version' { } Context 'By Pipeline' { + It 'Should increment the Revision level' { + $result = [version]"1.1.1" | Step-Version @Verbose Revision + $result | Should Be 1.1.1.1 + } + + It 'Should increment the Patch level' { + $result = [version]"1.1.1" | Step-Version @Verbose + $result | Should Be 1.1.2 + } + It 'Should increment the Patch level' { $result = [version]"1.1.1" | Step-Version @Verbose $result | Should Be 1.1.2 From 2313647493546f5dd688d9fd3db7ca33e13b19e9 Mon Sep 17 00:00:00 2001 From: David Eberhardt <44290340+DEberhardt@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:13:04 +0000 Subject: [PATCH 3/5] Update Step-Version.ps1 Update after reading and expanding upon the tests --- BuildHelpers/Public/Step-Version.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BuildHelpers/Public/Step-Version.ps1 b/BuildHelpers/Public/Step-Version.ps1 index b3889fb..7296e0d 100644 --- a/BuildHelpers/Public/Step-Version.ps1 +++ b/BuildHelpers/Public/Step-Version.ps1 @@ -43,7 +43,7 @@ function Step-Version { # Version section to step [Parameter(Position=1)] - [ValidateSet("Major", "Minor", "Build","Patch")] + [ValidateSet("Major", "Minor", "Build", "Patch", "Revision")] [Alias("Type")] [string] $By = "Patch" @@ -54,7 +54,7 @@ function Step-Version { $major = $Version.Major $minor = $Version.Minor $build = $Version.Build - $patch = $Version.Revision + $revision = $Version.Revision switch ($By) { "Major" { $major++ @@ -64,11 +64,11 @@ function Step-Version { "Minor" { $minor++ $build = 0 break } - "Build" { $build++ + default { $build++ break } - Default { - if ($patch -lt 0) { $patch = 1 } else { $patch++ } - Write-Output (New-Object Version -ArgumentList $major, $minor, $build, $patch).ToString() + "Revison" { + if ($revision -lt 0) { $revision = 1 } else { $revision++ } + Write-Output (New-Object Version -ArgumentList $major, $minor, $build, $revision).ToString() return } } From bf65cce38297482c134fd5e9a5b878205f208fb5 Mon Sep 17 00:00:00 2001 From: David Eberhardt <44290340+DEberhardt@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:19:13 +0000 Subject: [PATCH 4/5] Update Step-Version.ps1 Typo :( --- BuildHelpers/Public/Step-Version.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildHelpers/Public/Step-Version.ps1 b/BuildHelpers/Public/Step-Version.ps1 index 7296e0d..f750b6b 100644 --- a/BuildHelpers/Public/Step-Version.ps1 +++ b/BuildHelpers/Public/Step-Version.ps1 @@ -66,7 +66,7 @@ function Step-Version { break } default { $build++ break } - "Revison" { + "Revision" { if ($revision -lt 0) { $revision = 1 } else { $revision++ } Write-Output (New-Object Version -ArgumentList $major, $minor, $build, $revision).ToString() return } From 6c2d31b66f83f032352d2774ed18b9238a3ba151 Mon Sep 17 00:00:00 2001 From: David Eberhardt <44290340+DEberhardt@users.noreply.github.com> Date: Sat, 30 Nov 2024 21:21:40 +0000 Subject: [PATCH 5/5] Update BuildHelpers.Tests.ps1 Last update using Parameter -By for Pipeline checks --- Tests/BuildHelpers.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/BuildHelpers.Tests.ps1 b/Tests/BuildHelpers.Tests.ps1 index 9f29e64..9055928 100644 --- a/Tests/BuildHelpers.Tests.ps1 +++ b/Tests/BuildHelpers.Tests.ps1 @@ -102,7 +102,7 @@ Describe 'Step-Version' { Context 'By Pipeline' { It 'Should increment the Revision level' { - $result = [version]"1.1.1" | Step-Version @Verbose Revision + $result = [version]"1.1.1" | Step-Version @Verbose -By Revision $result | Should Be 1.1.1.1 }