Fix AOT linking and fix app version access on Linux and bump version

Author: BobLd

Caly.Core/Utilities/CalyExtensions.cs

@@ -22,6 +22,7 @@
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
@@ -30,22 +31,25 @@ namespace Caly.Core.Utilities
 {
     internal static class CalyExtensions
     {
-        private static readonly int[] _versionParts = new int[4];
-
+        public static readonly string CalyVersion;
+        
         static CalyExtensions()
         {
-            var assemblyName = Process.GetCurrentProcess().MainModule.FileName;
-            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assemblyName);
-
-            _versionParts[0] = fvi.ProductMajorPart;
-            _versionParts[1] = fvi.ProductMinorPart;
-            _versionParts[2] = fvi.ProductBuildPart;
-            _versionParts[3] = fvi.ProductPrivatePart;
-        }
+            var assembly = Assembly.GetEntryAssembly();
+            if (assembly is null)
+            {
+                assembly = Assembly.GetExecutingAssembly();
+            }
 
-        public static string GetCalyVersion()
-        {
-            return string.Join('.', _versionParts);
+            string? version = assembly.GetName().Version?.ToString().Trim();
+            if (!string.IsNullOrEmpty(version))
+            {
+                CalyVersion = version;
+            }
+            else
+            {
+                CalyVersion = @"n/a";
+            }
         }
 
         public static bool IsMobilePlatform()

Caly.Core/ViewModels/MainViewModel.cs

@@ -48,7 +48,7 @@ public sealed partial class MainViewModel : ViewModelBase
 
         [ObservableProperty] private bool _isPaneOpen;
 
-        [ObservableProperty] private string _version = CalyExtensions.GetCalyVersion();
+        public string Version => CalyExtensions.CalyVersion;
 
         partial void OnSelectedDocumentIndexChanged(int oldValue, int newValue)
         {

Caly.Desktop/Caly.Desktop.csproj

@@ -8,7 +8,7 @@
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<AssemblyName>Caly</AssemblyName>
-		<Version>0.0.1</Version>
+		<Version>0.1.0.0</Version>
 		<JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
 	</PropertyGroup>
 
@@ -17,14 +17,13 @@
 	<!--https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trimming-options?pivots=dotnet-8-0-->
 
 	<ItemGroup>
-		<DirectPInvoke Include="libSkiaSharp" />
+		<DirectPInvoke Include="libSkiaSharp" Condition="$(RuntimeIdentifier.StartsWith('win'))" />
 		<NativeLibrary Include="..\native\skia.lib" Condition="$(RuntimeIdentifier.StartsWith('win'))" />
 		<NativeLibrary Include="..\native\SkiaSharp.lib" Condition="$(RuntimeIdentifier.StartsWith('win'))" />
-		<NativeLibrary Include="TBD.a" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
+		<!--<NativeLibrary Include="TBD.a" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />-->
 
-		<DirectPInvoke Include="libHarfBuzzSharp" />
+		<DirectPInvoke Include="libHarfBuzzSharp" Condition="$(RuntimeIdentifier.StartsWith('win'))" />
 		<NativeLibrary Include="..\native\libHarfBuzzSharp.lib" Condition="$(RuntimeIdentifier.StartsWith('win'))" />
-		<NativeLibrary Include="TBD.a" Condition="!$(RuntimeIdentifier.StartsWith('win'))" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -48,13 +47,11 @@
 
 		<StripSymbols>true</StripSymbols>
 
-		<!--
 		<XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
 		<UseSystemResourceKeys>true</UseSystemResourceKeys>
 		<DebuggerSupport>false</DebuggerSupport>
 		<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
 		<StackTraceSupport>false</StackTraceSupport>
-		-->
 	</PropertyGroup>
 
 	<PropertyGroup>