Only display version/commit for clean builds and if tag matches

Author: initsu

CrossPlatformUI/App.axaml.cs

@@ -25,16 +25,21 @@ public override void Initialize()
         AvaloniaXamlLoader.Load(this);
 
         var version = Assembly.GetExecutingAssembly().GetName().Version;
+        var versionString = version?.ToString(version.Revision > 0 ? 4 : 3);
 
 #pragma warning disable CS0162 // Unreachable code detected
-        if (Z2Randomizer.GitInfo.Branch == "main")
+        if (versionString == Z2Randomizer.GitInfo.Tag && !Z2Randomizer.GitInfo.IsDirty)
         {
-            Version = $"v{version?.ToString(version.Revision > 0 ? 4 : 3)}";
+            Version = $"v{versionString}";
         }
-        else
+        else if (!Z2Randomizer.GitInfo.IsDirty)
         {
             Version = $"[{Z2Randomizer.GitInfo.Branch}:{Z2Randomizer.GitInfo.Commit}]";
         }
+        else
+        {
+            Version = $"[{Z2Randomizer.GitInfo.Branch}]";
+        }
 #pragma warning restore CS0162 // Unreachable code detected
 #if DEBUG
         Version += " (Debug)";

CrossPlatformUI/CrossPlatformUI.csproj

@@ -48,17 +48,20 @@
         <MakeDir Directories="$(IntermediateOutputPath)" />
         <Exec Command="git rev-parse --short HEAD > $(IntermediateOutputPath)git-hash.txt" />
         <Exec Command="git rev-parse --abbrev-ref HEAD > $(IntermediateOutputPath)git-branch.txt" />
+        <Exec Command="git tag --points-at HEAD > $(IntermediateOutputPath)git-tag.txt" />
         <Exec Command="git diff --quiet || echo dirty > $(IntermediateOutputPath)git-dirty.txt" IgnoreExitCode="true" />
 
         <ReadLinesFromFile File="$(IntermediateOutputPath)git-hash.txt"><Output TaskParameter="Lines" PropertyName="GitHash" /></ReadLinesFromFile>
         <ReadLinesFromFile File="$(IntermediateOutputPath)git-branch.txt"><Output TaskParameter="Lines" PropertyName="GitBranch" /></ReadLinesFromFile>
-        <ReadLinesFromFile File="$(IntermediateOutputPath)git-dirty.txt" Condition="Exists('$(IntermediateOutputPath)gitdirty.txt')"><Output TaskParameter="Lines" PropertyName="GitDirty" /></ReadLinesFromFile>
+        <ReadLinesFromFile File="$(IntermediateOutputPath)git-tag.txt"><Output TaskParameter="Lines" ItemName="GitTag" /></ReadLinesFromFile>
+        <ReadLinesFromFile File="$(IntermediateOutputPath)git-dirty.txt" Condition="Exists('$(IntermediateOutputPath)git-dirty.txt')"><Output TaskParameter="Lines" PropertyName="GitDirty" /></ReadLinesFromFile>
         <PropertyGroup><IsDirtyValue>false</IsDirtyValue></PropertyGroup>
         <PropertyGroup Condition="'$(GitDirty)' != ''"><IsDirtyValue>true</IsDirtyValue></PropertyGroup>
     </Target>
 
     <Target Name="WriteGitInfoFile" DependsOnTargets="GenerateGitInfo" BeforeTargets="BeforeBuild">
         <PropertyGroup>
+            <GitTagsJoined>@(GitTag->'%(Identity)', ',')</GitTagsJoined>
             <GitInfoText>
                 // (auto-generated from .csproj)
                 namespace Z2Randomizer;
@@ -69,6 +72,7 @@
                     {
                         Commit = "$(GitHash)";
                         Branch = "$(GitBranch)";
+                        Tag = "$(GitTagsJoined)";
                         IsDirty = $(IsDirtyValue);
                     }
                 }

CrossPlatformUI/GitInfo.cs

@@ -3,6 +3,7 @@
 public static partial class GitInfo
 {
     public static string Commit { get; } = "n/a";
-    public static string Branch { get; } = "n/a";
+    public static string Branch { get; } = "unknown";
+    public static string Tag { get; } = "";
     public static bool IsDirty { get; }
 }