Added Nerdbank.GitVersioning

Author: thesupersonic16

.github/workflows/build-project.yml

@@ -14,7 +14,6 @@ env:
   DOTNET_VERSION: 8
   DOTNET_CLI_HOME: /tmp/.dotnet
   FREEDESKTOP_VERSION: 24.08
-  APP_VERSION: 8.0.0.${{github.run_number}}
 
 jobs:
   build:
@@ -47,7 +46,7 @@ jobs:
         run: dotnet restore ${{ env.PROJECT_PATH }}
 
       - name: ${{ matrix.rid }} Build
-        run: dotnet publish -p:DefineConstants=AUTOBUILD -p:PublishProfile=${{ matrix.rid }} -p:AssemblyVersion=${{ env.APP_VERSION }} -p:FileVersion=${{ env.APP_VERSION}} -c Release -o ./output/${{ matrix.rid }} ${{ env.PROJECT_PATH }}
+        run: dotnet publish -p:DefineConstants=COMMITBUILD -p:PublishProfile=${{ matrix.rid }} -c Release -o ./output/${{ matrix.rid }} ${{ env.PROJECT_PATH }}
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

.github/workflows/build-release.yml

@@ -3,10 +3,6 @@ name: Build Release
 on:
   workflow_dispatch:
     inputs:
-      version: 
-        description: 'Version'
-        required: true
-        default: '8.0.0.4'
       tag: 
         description: 'Tag'
         required: true
@@ -73,12 +69,10 @@ jobs:
           python3 flatpak-dotnet-generator.py ./flatpak/nuget-sources.json ${{env.PROJECT_PATH}} --dotnet ${{env.DOTNET_VERSION}} --freedesktop ${{env.FREEDESKTOP_VERSION}}
       
       - name: win-x64 Build
-        run: dotnet publish -p:PublishProfile=win-x64 -c Release -p:AssemblyVersion=${{ github.event.inputs.version }} -p:FileVersion=${{ github.event.inputs.version }} -o ./output/win-x64 ${{env.PROJECT_PATH}}
+        run: dotnet publish -p:PublishProfile=win-x64 -c Release -o ./output/win-x64 ${{env.PROJECT_PATH}}
 
       - name: flatpak-x86_64 Build
-        env:
-          APP_VERSION: ${{ github.event.inputs.version }}
-        run: flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo builddir ./flatpak/${{ env.FLATPAK_ID }}.yml
+        run: flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo builddir ./flatpak/${{env.FLATPAK_ID}}.yml
 
       - name: Build Flatpak Bundle
         run: flatpak build-bundle repo ./flatpak/${{env.FLATPAK_ID}}.flatpak ${{env.FLATPAK_ID}}

Source/HedgeModManager.UI/Controls/Sidebar.axaml

@@ -71,7 +71,7 @@
           <c:SidebarButton Type="Normal" Click="OnRunClicked" Icon="{DynamicResource Geometry.Play}" IsEnabled="{Binding IsBusy, Converter={StaticResource InvertedBoolConverter}}" />
         </StackPanel>
         <TextBlock Text="{Binding AppVersion}"
-                   Margin="16,16,16,0" TextWrapping="Wrap"
+                   Margin="14,16,14,0" TextWrapping="Wrap"
                    TextAlignment="Center"
                    HorizontalAlignment="Center" />
       </StackPanel>

Source/HedgeModManager.UI/HedgeModManager.UI.csproj

@@ -7,8 +7,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">8.0.0.4</AssemblyVersion>
-    <FileVersion Condition="'$(FileVersion)' == ''">8.0.0.4</FileVersion>
   </PropertyGroup>
   <PropertyGroup Label="Avalonia">
     <AvaloniaXamlReportImportance>Low</AvaloniaXamlReportImportance>
@@ -40,6 +38,10 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Markdig" Version="0.40.0" />
     <PackageReference Include="Material.Icons.Avalonia" Version="2.2.0" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

Source/HedgeModManager.UI/Program.cs

@@ -178,26 +178,26 @@ static void installToRegistery(string schema, string args)
 
     public static string GetFormattedAppVersion()
     {
-        string unstableType = "beta";
-#if AUTOBUILD
-        unstableType = "dev";
+        string commitHash = ThisAssembly.GitCommitId[..7];
+        if (Version.TryParse(ThisAssembly.AssemblyFileVersion, out Version? version) && version != null)
+        {
+            string baseVersion = $"{version.Major}.{version.Minor}.{version.Build}";
+#if COMMITBUILD
+            return $"{baseVersion} {commitHash}";
+#else
+            if (version.Revision == 0)
+                return baseVersion;
+            return $"{baseVersion} beta {version.Revision}";
 #endif
-
-        var version = Assembly.GetExecutingAssembly().GetName().Version ?? Version.Parse("0");
-        if (version.Revision == 0)
-            return $"{version.Major}.{version.Minor}.{version.Build}";
-        return $"{version.Major}.{version.Minor}.{version.Build} {unstableType} {version.Revision}";
+        }
+        return commitHash;
     }
 
     public static string GetTagName()
     {
-        string unstableType = "beta";
-#if AUTOBUILD
-        unstableType = "dev";
-#endif
-
-        var version = Assembly.GetExecutingAssembly().GetName().Version ?? Version.Parse("0");
-        return $"{version.Major}.{version.Minor}.{version.Build}-{unstableType}{version.Revision}";
+        if (Version.TryParse(ThisAssembly.AssemblyFileVersion, out Version? version) && version != null)
+            return $"{version.Major}.{version.Minor}.{version.Build}-beta{version.Revision}";
+        return "0";
     }
 
     // Avalonia configuration, don't remove; also used by visual designer.

Source/HedgeModManager.UI/ViewModels/MainWindowViewModel.cs

@@ -102,8 +102,10 @@ public async Task OnStartUpAsync()
         if (Config.LastUpdateCheck.AddMinutes(20) < DateTime.Now &&
             !Design.IsDesignMode && !Program.IsDebugBuild)
         {
+#if !COMMITBUILD
             if (OperatingSystem.IsWindows())
                 await CheckForManagerUpdatesAsync();
+#endif
 
             try
             {

Source/HedgeModManager.UI/version.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "8.0.0.4",
+  "publicReleaseRefSpec": [
+    "^refs/heads/main",
+    "^refs/heads/rel/v\\d+\\.\\d+"
+  ],
+  "nugetPackageVersion": {
+    "semVer": 2
+  }
+}

flatpak/io.github.hedge_dev.hedgemodmanager-autobuild.yml

@@ -46,10 +46,8 @@ modules:
       - type: dir
         path: ../
       - ./nuget-sources.json
-    secret-env:
-      - APP_VERSION
     build-commands:
-      - dotnet publish Source/HedgeModManager.UI/HedgeModManager.UI.csproj -c Release -p:DefineConstants=AUTOBUILD -p:AssemblyVersion=${APP_VERSION} -p:FileVersion=${APP_VERSION} --no-self-contained --source ./nuget-sources
+      - dotnet publish Source/HedgeModManager.UI/HedgeModManager.UI.csproj -c Release -p:DefineConstants=COMMITBUILD --no-self-contained --source ./nuget-sources
       - mkdir -p ${FLATPAK_DEST}/bin
       - cp -r Source/HedgeModManager.UI/bin/Release/net8.0/publish/* ${FLATPAK_DEST}/bin
       - install -Dm644 flatpak/hedgemodmanager.png ${FLATPAK_DEST}/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png