From a64cc5a6836e579681c389612b27520be211f144 Mon Sep 17 00:00:00 2001
From: Codex CLI <codex@example.com>
Date: Mon, 1 Sep 2025 03:27:43 -0500
Subject: [PATCH] build: centralize app version in Directory.Build.props\n\n-
 Define AppVersion + PrereleaseLabel as single source of truth\n- Derive
 Version, AssemblyVersion, FileVersion, InformationalVersion\n- Map Android:
 ApplicationDisplayVersion (versionName) and ApplicationVersion
 (versionCode)\n- Remove version fields from Android csproj and manifest

---
 .../AdvancedCalculator.Android.csproj         |  3 +--
 .../Properties/AndroidManifest.xml            |  4 +--
 src/Directory.Build.props                     | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj b/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj
index ac130f0..6fd7207 100644
--- a/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj
+++ b/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj
@@ -5,8 +5,7 @@
 		<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
 		<Nullable>enable</Nullable>
 		<ApplicationId>com.jordanwages.advanced_calculator</ApplicationId>
-		<ApplicationVersion>2</ApplicationVersion>
-		<ApplicationDisplayVersion>1.1</ApplicationDisplayVersion>
+		<!-- Version info is centralized in src/Directory.Build.props -->
 		<AndroidPackageFormat>apk</AndroidPackageFormat>
 		<AndroidEnableProfiledAot>False</AndroidEnableProfiledAot>
 	</PropertyGroup>
diff --git a/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
index 4ebec14..f250a84 100644
--- a/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
+++ b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="com.jordanwages.advanced_calculator" android:versionCode="2" android:versionName="1.1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="com.jordanwages.advanced_calculator">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<application android:label="Advanced Calculator" android:icon="@drawable/icon" />
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 89dc443..2981a07 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -3,4 +3,30 @@
     <Nullable>enable</Nullable>
     <AvaloniaVersion>11.1.0</AvaloniaVersion>
   </PropertyGroup>
+
+  <!-- Centralized app versioning for all projects -->
+  <PropertyGroup Label="Versioning">
+    <!-- Single source of truth: update these -->
+    <AppVersion>1.1.0</AppVersion>
+    <PrereleaseLabel></PrereleaseLabel>
+
+    <!-- Derived semantic version pieces -->
+    <AppVersionMajor>$([System.Text.RegularExpressions.Regex]::Match('$(AppVersion)', '^(\d+)\.(\d+)\.(\d+)').Groups[1].Value)</AppVersionMajor>
+    <AppVersionMinor>$([System.Text.RegularExpressions.Regex]::Match('$(AppVersion)', '^(\d+)\.(\d+)\.(\d+)').Groups[2].Value)</AppVersionMinor>
+    <AppVersionPatch>$([System.Text.RegularExpressions.Regex]::Match('$(AppVersion)', '^(\d+)\.(\d+)\.(\d+)').Groups[3].Value)</AppVersionPatch>
+
+    <!-- Standard .NET version properties -->
+    <VersionPrefix>$(AppVersion)</VersionPrefix>
+    <VersionSuffix Condition=" '$(PrereleaseLabel)' != '' ">$(PrereleaseLabel)</VersionSuffix>
+    <Version Condition=" '$(PrereleaseLabel)' == '' ">$(VersionPrefix)</Version>
+    <Version Condition=" '$(PrereleaseLabel)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
+    <AssemblyVersion>$(AppVersionMajor).$(AppVersionMinor).0.0</AssemblyVersion>
+    <FileVersion>$(AppVersionMajor).$(AppVersionMinor).$(AppVersionPatch).0</FileVersion>
+    <InformationalVersion>$(Version)</InformationalVersion>
+
+    <!-- Android mapping: versionName + versionCode -->
+    <ApplicationDisplayVersion>$(Version)</ApplicationDisplayVersion>
+    <!-- VersionCode = major*10000 + minor*100 + patch (e.g., 1.2.3 -> 10203) -->
+    <ApplicationVersion>$([MSBuild]::Add($([MSBuild]::Multiply($(AppVersionMajor), 10000)),$([MSBuild]::Add($([MSBuild]::Multiply($(AppVersionMinor), 100)),$(AppVersionPatch)))))</ApplicationVersion>
+  </PropertyGroup>
 </Project>