Merge branch 'master' into feature/f2

juanonsoftware · juanonsoftware · commit cc567c1c05cf · 2025-07-20T14:50:22.000+07:00
diff --git a/Scripts/VersionManager.ps1 b/Scripts/VersionManager.ps1
@@ -14,17 +14,16 @@ function New-Tag
 		
 	if ($Branch -eq "release")
 	{
-		$version = ([decimal]$currentVersion + 0.1).ToString()
+		$version = ([decimal]$version + 0.1).ToString()
 		$prefix = "Beta-"
 	}
 	if ($Branch -eq "develop")
 	{
-		$version = ([decimal]$currentVersion + 0.1).ToString()
+		$version = ([decimal]$version + 0.1).ToString()
 		$prefix = "Dev-"
 	}
 	if ($Branch -eq "hotfix")
 	{
-		$version = ([decimal]$currentVersion + 0.1).ToString()
 		$prefix = "HF-"
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,16 @@ function New-Tag`
`14`	`14`
`15`	`15`	`if ($Branch -eq "release")`
`16`	`16`	`{`
`17`		`- $version = ([decimal]$currentVersion + 0.1).ToString()`
	`17`	`+ $version = ([decimal]$version + 0.1).ToString()`
`18`	`18`	`$prefix = "Beta-"`
`19`	`19`	`}`
`20`	`20`	`if ($Branch -eq "develop")`
`21`	`21`	`{`
`22`		`- $version = ([decimal]$currentVersion + 0.1).ToString()`
	`22`	`+ $version = ([decimal]$version + 0.1).ToString()`
`23`	`23`	`$prefix = "Dev-"`
`24`	`24`	`}`
`25`	`25`	`if ($Branch -eq "hotfix")`
`26`	`26`	`{`
`27`		`- $version = ([decimal]$currentVersion + 0.1).ToString()`
`28`	`27`	`$prefix = "HF-"`
`29`	`28`	`}`
`30`	`29`