[fix] fix build version not auto detect

jxnkwlp · Dec 6, 2021 · 699b5ab · 699b5ab
1 parent 1c0b0dd
commit 699b5ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Git-CI-Tools/CommandExecutor.cs b/Git-CI-Tools/CommandExecutor.cs
@@ -243,17 +243,23 @@ public VersionNextCommandResult VersionNext(VersionNextCommandOptions options)
 
             // nextVersion = VersionGenerater.Next(nextVersion, prerelease: options.PrereleaseVer ?? "", build: options.BuildVer ?? "");
 
-            if (options.AutoDetectBuildVer && string.IsNullOrEmpty(options.BuildVer))
+            if (options.AutoDetectBuildVer && options.BuildVer == null)
             {
                 var latestCommit = resolverVersionResult.Commits.FirstOrDefault();
                 if (latestCommit != null)
                 {
                     nextVersion = VersionGenerater.Next(nextVersion, build: latestCommit.Sha.Substring(0, 8));
                 }
+                else
+                {
+                    // use current commit
+                    var commit = git.Commits[0];
+                    nextVersion = VersionGenerater.Next(nextVersion, build: commit.Sha[..8]);
+                }
             }
             else
             {
-                nextVersion = VersionGenerater.Next(nextVersion, build: options.BuildVer ?? "");
+                nextVersion = VersionGenerater.Next(nextVersion, build: options.BuildVer);
             }
 
             if (options.AutoDetect)

diff --git a/Git-CI-Tools/GitContext.cs b/Git-CI-Tools/GitContext.cs
@@ -13,6 +13,8 @@ public class GitContext
         public string Project => _repository.Info.WorkingDirectory; //new DirectoryInfo(_path).Parent.FullName;
         public string Git => _path;
 
+        public IReadOnlyList<GitCommit> Commits => GetCommits();
+
         public GitContext(string path)
         {
             if (string.IsNullOrWhiteSpace(path))