From e91161584581637281b7cfc8e9ad0abf7546d92b Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Mon, 1 Sep 2025 04:12:36 -0500
Subject: [PATCH] Fixing Version Number Display

---
 src/AdvancedCalculator.sln                    |  1 +
 .../ViewModels/MainViewModel.cs               | 23 +++++++++++--------
 src/Directory.Build.props                     |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/AdvancedCalculator.sln b/src/AdvancedCalculator.sln
index 5e98a69..4febb7e 100644
--- a/src/AdvancedCalculator.sln
+++ b/src/AdvancedCalculator.sln
@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
 	ProjectSection(SolutionItems) = preProject
 		build.ps1 = build.ps1
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global
diff --git a/src/AdvancedCalculator/ViewModels/MainViewModel.cs b/src/AdvancedCalculator/ViewModels/MainViewModel.cs
index f5fe371..e8c8cba 100644
--- a/src/AdvancedCalculator/ViewModels/MainViewModel.cs
+++ b/src/AdvancedCalculator/ViewModels/MainViewModel.cs
@@ -50,15 +50,20 @@ public partial class MainViewModel : ViewModelBase
             .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
             .InformationalVersion ?? "0.0.0";
 
-    private static readonly string s_appVersionShort =
-        (() => {
-            var m = Regex.Match(s_appVersion, @"^(\d+)\.(\d+)(?:\.(\d+))?");
-            if (!m.Success) return s_appVersion;
-            var major = m.Groups[1].Value;
-            var minor = m.Groups[2].Value;
-            var patch = m.Groups[3].Success ? m.Groups[3].Value : "0";
-            return $"{major}.{minor}.{patch}";
-        })();
+    private static string s_appVersionShort
+    {
+        get
+        {
+            var m = Regex.Match(
+                s_appVersion?.Trim() ?? "",
+                @"^(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?=$|\+)"
+            );
+            if (!m.Success) return s_appVersion ?? "Unknown Version";
+
+            // Return exactly what’s present (major | major.minor | major.minor.patch)
+            return m.Value;
+        }
+    }
 
     public string AppVersion => s_appVersion;
     public string AppVersionShort => s_appVersionShort;
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2981a07..732823f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -7,7 +7,7 @@
   <!-- Centralized app versioning for all projects -->
   <PropertyGroup Label="Versioning">
     <!-- Single source of truth: update these -->
-    <AppVersion>1.1.0</AppVersion>
+    <AppVersion>1.2.0</AppVersion>
     <PrereleaseLabel></PrereleaseLabel>
 
     <!-- Derived semantic version pieces -->