[fix] fix when parse 'prerelease' or 'build' version part

jxnkwlp · Jun 12, 2023 · 7368931 · 7368931
1 parent 3f164d8
commit 7368931
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Git-CI-Tools/Commands/VersionCommand.cs b/Git-CI-Tools/Commands/VersionCommand.cs
@@ -40,6 +40,9 @@ private Command VersionCurrentCommand()
                     { "GITCI_CURRENT_VERSION_BUILD", result.Version.Metadata },
                     { "GITCI_CURRENT_VERSION_PRERELEASE", result.Version.Prerelease },
                     { "GITCI_CURRENT_VERSION", result.Version.ToString() },
+                    { "GITCI_CURRENT_VERSION_LEGACY", result.Version.WithoutPrereleaseOrMetadata().ToString() },
+                    { "GITCI_CURRENT_VERSION_SEMANTIC", result.Version.ToString() },
+                    { "GITCI_CURRENT_NUGET_VERSION", result.Version.ToString() },
                 });
             }
         });
@@ -84,6 +87,8 @@ private Command VersionNextCommand()
                     { "GITCI_NEXT_VERSION_BUILD", result.Version.Metadata },
                     { "GITCI_NEXT_VERSION_PRERELEASE", result.Version.Prerelease },
                     { "GITCI_NEXT_VERSION", result.Version.ToString() },
+                    { "GITCI_NEXT_VERSION_LEGACY", result.Version.WithoutPrereleaseOrMetadata().ToString() },
+                    { "GITCI_NEXT_VERSION_SEMANTIC", result.Version.ToString() },
                     { "GITCI_NEXT_NUGET_VERSION", result.Version.ToString() },
                 });
             }

diff --git a/Git-CI-Tools/VersionGenerater.cs b/Git-CI-Tools/VersionGenerater.cs
@@ -5,7 +5,7 @@ namespace Git_CI_Tools;
 /// <summary>
 ///  version sample => 1.0.5-rc+027dfeea
 /// </summary>
-public class VersionGenerater
+public static class VersionGenerater
 {
     public static SemVersion Parse(string version)
     {
@@ -25,12 +25,12 @@ public static SemVersion Next(SemVersion current = null, bool major = false, boo
         if (patch) version = version.With(patch: version.Patch + 1);
 
         if (!string.IsNullOrEmpty(prerelease))
-            version = version.WithPrerelease(prerelease);
+            version = version.WithPrereleaseParsedFrom(prerelease);
         else
             version = version.WithoutPrerelease();
 
         if (!string.IsNullOrEmpty(build))
-            version = version.WithMetadata(build);
+            version = version.WithMetadataParsedFrom(build);
         else
             version = version.WithoutMetadata();