From 9ab30727e30961ecb9e4acd8f8055b6c25283ead Mon Sep 17 00:00:00 2001
From: Pierre-Luc Roy-Allard <pierre-luc.roy-allard@ubisoft.com>
Date: Wed, 16 Aug 2023 10:02:33 -0400
Subject: [PATCH] Adding support for Manual version bumping.

---
 Private/Step-Version.ps1 | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/Private/Step-Version.ps1 b/Private/Step-Version.ps1
index 467cc868..a71165b6 100644
--- a/Private/Step-Version.ps1
+++ b/Private/Step-Version.ps1
@@ -50,7 +50,7 @@
                     $CurrentVersion = [version] $ModuleGallery.Version
                 } catch {
                     #throw "Couldn't find module $Module to asses version information. Terminating."
-                    $CurrentVersion = $null
+                    $CurrentVersion = [version] $null
                 }
             } else {
                 if (Test-Path -LiteralPath $LocalPSD1) {
@@ -84,25 +84,22 @@
                 break
             }
         }
+
         if ($null -eq $CurrentVersion) {
-            $VersionToUpgrade = ''
+            $PreparedVersion.$StepType = 1
         } else {
-            $VersionToUpgrade = $CurrentVersion.$StepType
+            $PreparedVersion.$StepType = $CurrentVersion.$StepType
         }
 
-        if ($VersionToUpgrade -eq '') {
-            $ExpectedVersion = 1
-        } else {
-            $ExpectedVersion = $CurrentVersion.$StepType + 1
+        if([version] (($PreparedVersion.Values | Where-Object {$null -ne $_ }) -join '.') -gt $CurrentVersion) {
+            $PreparedVersion.$StepType = 0
         }
 
-        $PreparedVersion.$StepType = $ExpectedVersion
-        $Numbers = foreach ($Key in $PreparedVersion.Keys) {
-            if ($PreparedVersion[$Key]) {
-                $PreparedVersion[$Key]
-            }
+        while ([version] (($PreparedVersion.Values | Where-Object {$null -ne $_ }) -join '.') -le $CurrentVersion) {
+            $PreparedVersion.$StepType = $PreparedVersion.$StepType + 1
         }
-        $ProposedVersion = $Numbers -join '.'
+
+        $ProposedVersion = ([version] (($PreparedVersion.Values | Where-Object {$null -ne $_ }) -join '.')).ToString()
 
         $FinalVersion = $null
         $VersionCheck = [version]::TryParse($ProposedVersion, [ref] $FinalVersion)