version

Author: actions-user

src/RunNewVersion.csx

@@ -29,10 +29,8 @@ public (string versionPack, string versionRelease) RunNewVersion(string packageF
 
     string versionPatch = GenerateVersionPatch(packageFlow, branch_part[0]);
 
-    // GenerateTag($"{prefixBranch}/{versionMajor}.{numberPatchVersion}");
-
     var versionPack = $"{versionMajor}{versionPatch}.{numberPatchVersion}";
-    var versionRelease = $"{versionMajor}.{numberPatchVersion}";
+    var versionRelease = $"{prefixBranch}/{versionMajor}.{numberPatchVersion}";
 
     return (versionPack, versionRelease);
 }

src/RunUpdateVersion.csx

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