update version

Author: actions-user

src/GetLastVersion.csx

@@ -24,5 +24,5 @@ public int GetLastVersion(string versionMajor)
         .Distinct()
         .Max();
 
-    return version + 1;
+    return version;
 }

src/RunNewVersion.csx

@@ -25,11 +25,11 @@ public (string versionPack, string versionRelease) RunNewVersion(string packageF
         prefixBranch = branch;
     }
 
-    var numberPatchVersion = GetLastVersion($"{prefixBranch}/{versionMajor}");
+    var numberPatchVersion = GetLastVersion($"{prefixBranch}/{versionMajor}") + 1;
 
     string versionPatch = GenerateVersionPatch(packageFlow, branch_part[0]);
 
-    GenerateTag($"{prefixBranch}/{versionMajor}.{numberPatchVersion}");
+    // GenerateTag($"{prefixBranch}/{versionMajor}.{numberPatchVersion}");
 
     var versionPack = $"{versionMajor}{versionPatch}.{numberPatchVersion}";
     var versionRelease = $"{versionMajor}.{numberPatchVersion}";

src/RunUpdateVersion.csx

@@ -3,22 +3,39 @@
 #load "GetLastVersion.csx"
 #load "GenerateTag.csx"
 using System;
+using System.Text.RegularExpressions;
 
 public (string versionPack, string versionRelease) RunUpdateVersion(string version, string packageFlow)
 {
+    string versionMajor = "0.0";
+    string versionRevision = "0";
+    string prefixBranch = "";
 
-    var versionPart = version.Split("/") ;
-    var versionPartPart = versionPart[^1].Split(".");
+    string branch = RunCommand("git", "rev-parse --abbrev-ref HEAD");
+    var branch_part = branch.Split("/");
 
-    string versionMajor = string.Join(".", versionPartPart[..^1]);
-    string numberPatchVersion = versionPartPart[^1];
+    var version_split = version.Split(".");
 
-    string versionPatch = GenerateVersionPatch(packageFlow, versionPart[0]);
+    var regex = new Regex(@"^\d+(\.\d+)*$");
+    if(branch_part.Count() > 0 && regex.IsMatch(branch_part[^1]))
+    {
+        prefixBranch = string.Join("", branch_part[..^1]);
+    }
+    else
+    {
+        prefixBranch = branch;
+    }
 
-    version = $"{versionMajor}{versionPatch}";
+    if(version_split.Count() > 0)
+    {
+        versionMajor = string.Join(".", version_split[..^1]);
+        versionRevision = version_split[^1];
+    }
 
-    var versionPack = $"{versionMajor}{versionPatch}.{numberPatchVersion}";
-    var versionRelease = $"{versionMajor}.{numberPatchVersion}";
+    string versionPatch = GenerateVersionPatch(packageFlow, branch_part[0]);
+
+    var versionPack = $"{versionMajor}{versionPatch}.{versionRevision}";
+    var versionRelease = $"{versionMajor}.{versionRevision}";
 
     return (versionPack, versionRelease);
 }