From a4e66954e58857fbc1e21bfca5eaee8e87be74b2 Mon Sep 17 00:00:00 2001
From: Rafael Vuijk <r.vuijk@sownet.nl>
Date: Fri, 2 Oct 2026 10:09:31 +0000
Subject: [PATCH] The assemblies carry the release's version, not 2.3.0

Nuget.yml passed the release's version as PackageVersion, which names a package but not the
assemblies in it, and those took Version and FileVersion from Package.Build.props, which said
2.3.0. Both release workflows now pass Version and FileVersion, and the props name 2.6.0, the
version under development, for a local build.

Closes #1678.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012sonx8iAspMiwRwokT1Ura
---
 .github/workflows/Nuget.yml                   | 19 +++++++++++--------
 Sources/Package.Build.props                   | 11 ++++++-----
 .../Terminal/AngouriMath.Terminal/publish.sh  | 11 ++++++++++-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/Nuget.yml b/.github/workflows/Nuget.yml
index 57962370e..4138de1db 100644
--- a/.github/workflows/Nuget.yml
+++ b/.github/workflows/Nuget.yml
@@ -43,12 +43,15 @@ jobs:
 
           echo "version=$version" >> $GITHUB_OUTPUT
 
+          # Four numbers: the version without its prerelease or build suffix, and a zero.
+          echo "file_version=${version%%[-+]*}.0" >> $GITHUB_OUTPUT
+
       - name: 'Pack and publish AngouriMath'
         run: |
           cd Sources/AngouriMath
           dotnet restore AngouriMath.csproj
-          dotnet build AngouriMath.csproj -c release
-          dotnet pack AngouriMath.csproj -c release -p:PackageVersion=${{ steps.version.outputs.version }}
+          dotnet build AngouriMath.csproj -c release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
+          dotnet pack AngouriMath.csproj -c release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
           cd bin/release
           dotnet nuget push AngouriMath.${{ steps.version.outputs.version }}.nupkg --api-key ${{ secrets.NUGET_KEY }} --source nuget.org
           
@@ -56,8 +59,8 @@ jobs:
         run: |
           cd Sources/Wrappers/AngouriMath.FSharp
           dotnet restore
-          dotnet build -c Release
-          dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }}
+          dotnet build -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
+          dotnet pack -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
           cd bin/Release
           dotnet nuget push AngouriMath.FSharp.${{ steps.version.outputs.version }}.nupkg --api-key ${{ secrets.NUGET_KEY }} --source nuget.org
           
@@ -65,8 +68,8 @@ jobs:
         run: |
           cd Sources/Wrappers/AngouriMath.Interactive
           dotnet restore
-          dotnet build -c Release
-          dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }}
+          dotnet build -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
+          dotnet pack -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
           cd bin/Release
           dotnet nuget push AngouriMath.Interactive.${{ steps.version.outputs.version }}.nupkg --api-key ${{ secrets.NUGET_KEY }} --source nuget.org
           
@@ -74,7 +77,7 @@ jobs:
         run: |
           cd Sources/Terminal/AngouriMath.Terminal
           dotnet restore
-          dotnet build -c Release
-          dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }}
+          dotnet build -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
+          dotnet pack -c Release -p:Version=${{ steps.version.outputs.version }} -p:FileVersion=${{ steps.version.outputs.file_version }}
           cd bin/Release
           dotnet nuget push AngouriMath.Terminal.${{ steps.version.outputs.version }}.nupkg --api-key ${{ secrets.NUGET_KEY }} --source nuget.org
diff --git a/Sources/Package.Build.props b/Sources/Package.Build.props
index c8f7cf00c..71a3c3c81 100644
--- a/Sources/Package.Build.props
+++ b/Sources/Package.Build.props
@@ -13,11 +13,12 @@
   
   <PropertyGroup>
     <!--
-    The version under development. The NuGet workflow overrides PackageVersion from the
-    release tag, so what ships is named by the tag; this is what a local build and the
-    assembly metadata carry.
+    The version under development, which a local build carries. The NuGet and terminal release
+    workflows pass the release tag's version as Version and FileVersion, so what ships carries
+    the tag in its assemblies as well as in its package's name.
+    https://github.com/asc-community/AngouriMath/issues/1678
     -->
-    <Version>2.3.0</Version>
+    <Version>2.6.0</Version>
 
     <!--
     Pinned to the major for the whole of 2.x, and deliberately not tracking Version.
@@ -36,7 +37,7 @@
     can express that. FileVersion carries the release for anyone reading file properties.
     -->
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.3.0.0</FileVersion>
+    <FileVersion>2.6.0.0</FileVersion>
 
     <Authors>WhiteBlackGoose and contributors</Authors>
     <Company>Angouri</Company>
diff --git a/Sources/Terminal/AngouriMath.Terminal/publish.sh b/Sources/Terminal/AngouriMath.Terminal/publish.sh
index 61e3df126..0e863343d 100755
--- a/Sources/Terminal/AngouriMath.Terminal/publish.sh
+++ b/Sources/Terminal/AngouriMath.Terminal/publish.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 
 
+# The release's version, which the workflow passes as TERMINAL_VERSION, goes into the assemblies
+# as well as the package names: FileVersion is four numbers, the version without its suffix and
+# a zero. https://github.com/asc-community/AngouriMath/issues/1678
+version_properties=()
+if [ -n "${TERMINAL_VERSION:-}" ]; then
+    version_properties=(-p:Version="$TERMINAL_VERSION" -p:FileVersion="${TERMINAL_VERSION%%[-+]*}.0")
+fi
+
 # Portable runtime identifiers: since .NET 8 a versioned one such as osx.12-arm64 is not
 # recognised, and the publish fails with NETSDK1083.
 for arch in linux-x64 linux-arm linux-arm64 win-x64 win-x86 osx-x64 osx-arm64
@@ -9,6 +17,7 @@ do
     -r $arch \
     -c Release \
     -o ./publish-output/$arch \
-    --self-contained
+    --self-contained \
+    "${version_properties[@]}"
 done