Update to alpha2. Fix version error for single file publishing/net6; …

…Set SatelliteResourceLanguages and NeutralLanguage
BobLd · Nov 25, 2021 · 4f2ef1f · 4f2ef1f
1 parent 680b022
commit 4f2ef1f
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 25 deletions.
diff --git a/Panoptes.Model.Mock/Panoptes.Model.Mock.csproj b/Panoptes.Model.Mock/Panoptes.Model.Mock.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Version>0.0.0.1-alpha2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Panoptes.Model.MongoDB/Panoptes.Model.MongoDB.csproj b/Panoptes.Model.MongoDB/Panoptes.Model.MongoDB.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <Version>0.0.0.1-alpha2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Panoptes.Model.MongoDB/Sessions/MongoSession.cs b/Panoptes.Model.MongoDB/Sessions/MongoSession.cs
@@ -29,7 +29,7 @@ public MongoSession(ISessionHandler sessionHandler, IResultConverter resultConve
             {
                 Credential = MongoCredential.CreateCredential(null, parameters.UserName, parameters.Password),
                 Server = new MongoServerAddress(_host, _port),
-                ApplicationName = $"{Global.AppName} {Global.AppVersion}",
+                ApplicationName = $"{Global.AppName} {Global.AppVersion} {Global.MachineName} {Global.OSVersion}",
                 HeartbeatInterval = TimeSpan.FromSeconds(5),
                 HeartbeatTimeout = TimeSpan.FromSeconds(40)
             });

diff --git a/Panoptes.Model.Tests/Panoptes.Model.Tests.csproj b/Panoptes.Model.Tests/Panoptes.Model.Tests.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <Version>0.0.0.1-alpha2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Panoptes.Model/Global.cs b/Panoptes.Model/Global.cs
@@ -1,12 +1,16 @@
-using System.Diagnostics;
-using System.Reflection;
+using System;
+using System.Diagnostics;
 
 namespace Panoptes.Model
 {
     public static class Global
     {
         public const string AppName = "Panoptes";
 
+        public static string MachineName => Environment.MachineName;
+
+        public static string OSVersion => Environment.OSVersion.VersionString;
+
         private static string _appVersion;
         public static string AppVersion
         {
@@ -22,22 +26,29 @@ public static string AppVersion
 
         private static string GetVersion()
         {
-            var assembly = Assembly.GetExecutingAssembly();
-            var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
-#pragma warning disable CS8603 // Possible null reference return.
-            if (fvi != null)
+            try
             {
-                if (fvi.FileVersion == fvi.ProductVersion)
-                {
-                    return fvi.FileVersion;
-                }
-                else
+                // https://docs.microsoft.com/en-us/dotnet/core/deploying/single-file
+                var fvi = FileVersionInfo.GetVersionInfo(Environment.ProcessPath);
+#pragma warning disable CS8603 // Possible null reference return.
+                if (fvi != null)
                 {
-                    return $"{fvi.FileVersion} ({fvi.ProductVersion})";
+                    if (fvi.FileVersion == fvi.ProductVersion)
+                    {
+                        return fvi.FileVersion;
+                    }
+                    else
+                    {
+                        return $"{fvi.FileVersion} ({fvi.ProductVersion})";
+                    }
                 }
-            }
-            return null;
+                return null;
 #pragma warning restore CS8603 // Possible null reference return.
+            }
+            catch (System.Exception e)
+            {
+                return $"ERROR in version: {e.Message}";
+            }
         }
     }
 }
diff --git a/Panoptes.Model/Panoptes.Model.csproj b/Panoptes.Model/Panoptes.Model.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <Version>0.0.0.1-alpha2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Panoptes.ViewModels/Panoptes.ViewModels.csproj b/Panoptes.ViewModels/Panoptes.ViewModels.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <Version>0.0.0.1-alpha2</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Panoptes.Model.Mock\Panoptes.Model.Mock.csproj" />
     <ProjectReference Include="..\Panoptes.Model.MongoDB\Panoptes.Model.MongoDB.csproj" />
     <ProjectReference Include="..\Panoptes.Model\Panoptes.Model.csproj" />
   </ItemGroup>

diff --git a/Panoptes/App.axaml b/Panoptes/App.axaml
@@ -4,8 +4,7 @@
 			 xmlns:local="clr-namespace:Panoptes"
 			 xmlns:charts="clr-namespace:Panoptes.Views.Charts"
 			 xmlns:converters="clr-namespace:Panoptes.Views.Converters"
-			 xmlns:panels="clr-namespace:Panoptes.Views.Panels">
-
+			 xmlns:panels="clr-namespace:Panoptes.Views.Panels">	
 
 	<Application.Styles>
 		<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>

diff --git a/Panoptes/MainWindow.axaml b/Panoptes/MainWindow.axaml
@@ -78,8 +78,10 @@
 				</MenuItem>
 			</Menu>
 
+			<!--
 			<Label DockPanel.Dock="Right" Content="{Binding CurrentDateTimeLocal}" HorizontalAlignment="Right" ToolTip.Tip="Local time."/>
 			<Label DockPanel.Dock="Right" Content=" Local:" HorizontalAlignment="Right" ToolTip.Tip="Local time."/>
+			-->
 			<Label DockPanel.Dock="Right" Content="{Binding CurrentDateTimeUtc}" HorizontalAlignment="Right" ToolTip.Tip="UTC time."/>
 			<Label DockPanel.Dock="Right" Content="UTC:" HorizontalAlignment="Right" ToolTip.Tip="UTC time."/>
 		</DockPanel>

diff --git a/Panoptes/Panoptes.csproj b/Panoptes/Panoptes.csproj
@@ -1,10 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ApplicationIcon>Resources\icon\halloween53_109170.ico</ApplicationIcon>
-    <Version>0.0.0.1-alpha1</Version>
+    <Version>0.0.0.1-alpha2</Version>
+	<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+	<NeutralLanguage>en</NeutralLanguage>
+	<DebugType>embedded</DebugType>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Resources\icon\halloween53_109170.ico" />
@@ -14,14 +17,15 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.10.10" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.10" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" Condition=" '$(Configuration)' == 'Debug' " />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="OxyPlot.Avalonia" Version="2.1.0-20210915.2" />
     <PackageReference Include="QuantConnect.Common" Version="2.5.13230" />
    </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Panoptes.Model.Mock\Panoptes.Model.Mock.csproj" />
+    <ProjectReference Include="..\Panoptes.Model.Mock\Panoptes.Model.Mock.csproj" Condition=" '$(Configuration)' == 'Debug' "/>
     <ProjectReference Include="..\Panoptes.Model.MongoDB\Panoptes.Model.MongoDB.csproj" />
     <ProjectReference Include="..\Panoptes.Model\Panoptes.Model.csproj" />
     <ProjectReference Include="..\Panoptes.ViewModels\Panoptes.ViewModels.csproj" />

diff --git a/Panoptes/Program.cs b/Panoptes/Program.cs
@@ -7,9 +7,19 @@ class Program
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
-        public static void Main(string[] args) => BuildAvaloniaApp()
-            .StartWithClassicDesktopLifetime(args);
+        public static void Main(string[] args)
+        {
+            try
+            {
+                BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+            }
+            catch (System.Exception ex)
+            {
+                System.IO.File.WriteAllText("ERROR.txt", ex.ToString());
+            }
+        }
 
+        // Might be optimised https://github.com/ahopper/Avalonia.IconPacks/blob/no-avalonia-desktop/src/Avalonia.IconPacks/Program.cs
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()

diff --git a/Panoptes/ViewModels/MainWindowViewModel.cs b/Panoptes/ViewModels/MainWindowViewModel.cs
@@ -91,7 +91,7 @@ public MainWindowViewModel(ISessionService resultService, IMessenger messenger,
             CashBookPane = cashBookPane;
             OxyPlotSelectionPane = oxyPlotSelectionViewModel;
 
-            Title = $"{Global.AppName} - LEAN Algorithm Monitor - {Global.AppVersion}";
+            Title = $"{Global.AppName} - LEAN Algorithm Monitor - {Global.AppVersion} - {Global.MachineName} ({Global.OSVersion})";
 
 #if DEBUG
             Title = "[DEBUG] " + Title;