Write and read version to and from assembly

Author: NicoVIII

.github/workflows/cd.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Run tests
         run: dotnet run test
       - name: Run publishing script
-        run: dotnet run publish
+        run: dotnet run publish 0
       # For now I simply make a continuous build
       - name: Release files
         uses: marvinpinto/action-automatic-releases@latest

.github/workflows/publish.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Restore
         run: dotnet run restore
       - name: Publish
-        run: dotnet run publish
+        run: dotnet run publish ${{ steps.tag_name.outputs.current_version }}
       - name: Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.1] - 2022-03-03
+
+### Changed
+
+-   Add delivery as AppImage again
+-   Write version to assembly (0 for dev builds)
+-   Read version in bottom left corner from assembly
+
 ## [0.5.0] - 2022-03-03
 
 ### Added

run.fs

@@ -26,6 +26,28 @@ module Config =
 
 let httpClient = new HttpClient()
 
+module DotNet =
+    let publishSelfContained outDir project version os =
+        dotnet [
+            "publish"
+            "-r"
+            DotNetOS.toString os
+            "-v"
+            "minimal"
+            "-c"
+            DotNetConfig.toString Release
+            "-o"
+            outDir
+            "--self-contained"
+            "/p:PublishSingleFile=true"
+            "/p:PublishTrimmed=true"
+            "/p:EnableCompressionInSingleFile=true"
+            "/p:IncludeNativeLibrariesForSelfExtract=true"
+            "/p:DebugType=None"
+            $"/p:Version=%s{version}"
+            project
+        ]
+
 module Task =
     let restore () =
         job {
@@ -130,8 +152,9 @@ module Task =
 
         result
 
-    let publish () =
-        let publish = DotNet.publishSelfContained Config.publishPath Config.mainProject
+    let publish version =
+        let publish =
+            DotNet.publishSelfContained Config.publishPath Config.mainProject version
 
         Shell.mkdir Config.publishPath
         Shell.cleanDir Config.publishPath
@@ -175,11 +198,15 @@ let main args =
                 Task.restore ()
                 Task.runTest ()
             }
-        | [ "publish" ] ->
+        | [ "publish"; version ] ->
             job {
                 Task.restore ()
-                Task.publish ()
+                Task.publish version
             }
+        // Errors for missing arguments
+        | [ "publish" ] ->
+            let msg = [ "Missing version argument!" ]
+            Error(1, msg)
         | _ ->
             let msg =
                 [ "Usage: dotnet run [<command>]"

src/Andromeda/AvaloniaApp/Andromeda.AvaloniaApp.fsproj

@@ -7,6 +7,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
+  <PropertyGroup>
+    <Version>0</Version>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="../Core/Andromeda.Core.fsproj" />
@@ -15,7 +18,6 @@
   <ItemGroup>
     <AvaloniaResource Include="Assets\*" />
     <AvaloniaResource Include="Styles.xaml" />
-    <Compile Include="Config.fs" />
     <Compile Include="Logger.fs" />
     <Compile Include="Icons.fs" />
     <Compile Include="DomainTypes.fs" />

src/Andromeda/AvaloniaApp/Config.fs

@@ -12,6 +12,8 @@ open Andromeda.AvaloniaApp
 open Andromeda.AvaloniaApp.Components.Main
 open Andromeda.AvaloniaApp.Elements
 
+open System.Reflection
+
 module LeftBar =
     [<RequireQualifiedAccess>]
     module Menu =
@@ -132,6 +134,13 @@ module LeftBar =
         ]
 
     let private bottomBarView downloads =
+        let version =
+            let assemblyVersion = Assembly.GetEntryAssembly().GetName().Version
+
+            match assemblyVersion with
+            | v when v.Major > 0 -> $"v{v.Major}.{v.Minor}.{v.Build}"
+            | _ -> "development build"
+
         StackPanel.create [
             StackPanel.dock Dock.Bottom
             StackPanel.orientation Orientation.Vertical
@@ -140,7 +149,7 @@ module LeftBar =
                 TextBlock.create [
                     TextBlock.dock Dock.Bottom
                     TextBlock.fontSize 10.0
-                    TextBlock.text Config.version
+                    TextBlock.text version
                 ]
             ]
         ]