From 04a676af26c7a15b3b93f2e4234f410cb50239be Mon Sep 17 00:00:00 2001
From: burlakov <u01@asv.me>
Date: Thu, 30 Nov 2023 10:41:07 +0300
Subject: [PATCH] fix (core): fix version number display

Asana: https://app.asana.com/0/1203851531040615/1205906196019654/f
---
 src/Asv.Drones.Gui.Core/CorePlugin.cs    | 2 +-
 src/Asv.Drones.Gui.Custom.props          | 2 +-
 src/Asv.Drones.Gui/Asv.Drones.Gui.csproj | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Asv.Drones.Gui.Core/CorePlugin.cs b/src/Asv.Drones.Gui.Core/CorePlugin.cs
index f01cd6d9..f3748f65 100644
--- a/src/Asv.Drones.Gui.Core/CorePlugin.cs
+++ b/src/Asv.Drones.Gui.Core/CorePlugin.cs
@@ -63,7 +63,7 @@ private IAppPathInfo GetAppPathInfo()
     private IAppInfo GetAppInfo()
     {
         var assm = _applicationDataTemplateHost.GetType().Assembly.GetName(); // hack - to get application assembly
-        var version = assm.Version?.ToString() ?? "0.0.0";
+        var version = assm.Version != null ? $"{assm.Version.Major}.{assm.Version.Minor}.{assm.Version.Build}" : "0.0.0";
         var name = assm.Name ?? "Asv.Drones";
         const string author = "https://asv.me/";
         const string appUrl = "https://docs.asv.me/";
diff --git a/src/Asv.Drones.Gui.Custom.props b/src/Asv.Drones.Gui.Custom.props
index 7512df13..f46a7d29 100644
--- a/src/Asv.Drones.Gui.Custom.props
+++ b/src/Asv.Drones.Gui.Custom.props
@@ -4,7 +4,7 @@
   </ItemGroup>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <ProductVersion>0.1.0</ProductVersion>
+    <ProductVersion>0.2.1</ProductVersion>
     <AvaloniaVersion>11.0.0</AvaloniaVersion>
     <AsvCommonVersion>1.13.1</AsvCommonVersion>
     <AsvMavlinkVersion>3.6.0-alpha08</AsvMavlinkVersion>
diff --git a/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj b/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
index 410f628e..642c0a55 100644
--- a/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
+++ b/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
@@ -5,10 +5,11 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <AssemblyVersion>$(ProductStrongVersion)</AssemblyVersion>
-        <FileVersion>$(ProductExtendedVersion)</FileVersion>
+        <AssemblyVersion>$(ProductVersion)</AssemblyVersion>
+        <FileVersion>$(ProductVersion)</FileVersion>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
+        <Version>$(ProductVersion)</Version>
     </PropertyGroup>
 
     <ItemGroup>