Some improvements to versioning, build-script and auto-updater

haefele · Oct 15, 2023 · 4ef6944 · 4ef6944
1 parent 2fbf30a
commit 4ef6944
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,4 +49,4 @@ jobs:
       uses: ncipollo/[email protected]
       with:
         artifacts: "${{ env.output_path }}/Chat Prisma.zip"
-        tag: "v${{ env.GitBuildVersionSimple }}"
+        tag: "v${{ env.GitBuildVersion }}"
diff --git a/src/ChatPrisma/App.xaml.cs b/src/ChatPrisma/App.xaml.cs
@@ -88,7 +88,8 @@ private IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Ho
                 .Configure(o =>
                 {
                     o.ApplicationName = "Chat Prisma";
-                    o.ApplicationVersion = ThisAssembly.AssemblyInformationalVersion;
+                    o.ApplicationVersion = ThisAssembly.AssemblyFileVersion;
+                    o.CommitId = ThisAssembly.GitCommitId;
                     o.ContactName = "Daniel Häfele";
                     o.ContactEmailAddress = "[email protected]";
                 })

diff --git a/src/ChatPrisma/Options/ApplicationOptions.cs b/src/ChatPrisma/Options/ApplicationOptions.cs
@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace ChatPrisma.Options;
 
@@ -9,7 +9,9 @@ public class ApplicationOptions
     [Required]
     public string ApplicationVersion { get; set; } = default!;
     [Required]
+    public string CommitId { get; set; } = default!;
+    [Required]
     public string ContactName { get; set; } = default!;
     [Required]
     public string ContactEmailAddress { get; set; } = default!;
-}
+}
diff --git a/src/ChatPrisma/Views/About/AboutView.xaml b/src/ChatPrisma/Views/About/AboutView.xaml
@@ -23,7 +23,14 @@
                     <TextBlock Text="{Binding ApplicationName}" />
                     <TextBlock>
                         <Run Text="Version" />
-                        <Run Text="{Binding ApplicationVersion}" />
+                        <Run Text="{Binding ApplicationVersion}">
+                            <Run.ToolTip>
+                                <TextBlock>
+                                    <Run Text="Commit-ID:" />
+                                    <Run Text="{Binding CommitId}" />
+                                </TextBlock>
+                            </Run.ToolTip>
+                        </Run>
                     </TextBlock>
                 </StackPanel>
             </StackPanel>

diff --git a/src/ChatPrisma/Views/About/AboutViewModel.cs b/src/ChatPrisma/Views/About/AboutViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using ChatPrisma.Options;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.Extensions.Options;
@@ -13,6 +13,9 @@ public partial class AboutViewModel(IOptions<ApplicationOptions> options) : Obse
     [ObservableProperty]
     private string _applicationVersion = options.Value.ApplicationVersion;
 
+    [ObservableProperty]
+    private string _commitId = options.Value.CommitId;
+
     [ObservableProperty]
     private string _contactName = options.Value.ContactName;