Added automatic automatic build number/date display in the campaign e…

…ditor
REHERC · Apr 22, 2021 · 9e16338 · 9e16338
1 parent 3cc389d
commit 9e16338
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 24 deletions.
diff --git a/App.AdventureMaker.Core/App.AdventureMaker.Core.csproj b/App.AdventureMaker.Core/App.AdventureMaker.Core.csproj
@@ -2,41 +2,45 @@
 
   <PropertyGroup>
 	<TargetFramework>netcoreapp3.1</TargetFramework>
-	<Version>1.0.0</Version>
-	<AssemblyVersion>1.0.0.0</AssemblyVersion>
+	<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+	<Version>1.0.0.0</Version>
+	<AssemblyVersion>1.0.*</AssemblyVersion>
+	<Deterministic>false</Deterministic>
 	<NeutralLanguage>en</NeutralLanguage>
 	<RepositoryUrl>github.com/reherc/centrifuge.mods.distance</RepositoryUrl>
 	<Product>Campaign Editor for Distance</Product>
-	<Company />
+	 <Company />
 	<Authors>Reherc</Authors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 	<DefineConstants>TRACE;APP PREVIEW</DefineConstants>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	<NoWarn>1701;1702;CS7035</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 	<DefineConstants>TRACE;APP PREVIEW</DefineConstants>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	<NoWarn>1701;1702;CS7035</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Resources\Images\NoLevelImageFound.png" />
-    <None Remove="Resources\Images\sample thumbnail.bytes.png" />
-    <None Remove="Resources\Images\StatusError.png" />
-    <None Remove="Resources\Images\StatusInfo.png" />
-    <None Remove="Resources\Images\StatusWarning.png" />
-    <None Remove="Resources\Text\archive_readme.txt" />
+	<None Remove="Resources\Images\NoLevelImageFound.png" />
+	<None Remove="Resources\Images\sample thumbnail.bytes.png" />
+	<None Remove="Resources\Images\StatusError.png" />
+	<None Remove="Resources\Images\StatusInfo.png" />
+	<None Remove="Resources\Images\StatusWarning.png" />
+	<None Remove="Resources\Text\archive_readme.txt" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Resources\Images\NoLevelImageFound.png" />
-    <EmbeddedResource Include="Resources\Images\sample thumbnail.bytes.png" />
-    <EmbeddedResource Include="Resources\Images\StatusError.png" />
-    <EmbeddedResource Include="Resources\Images\StatusInfo.png" />
-    <EmbeddedResource Include="Resources\Images\StatusWarning.png" />
-    <EmbeddedResource Include="Resources\Text\archive_readme.txt" />
+	<EmbeddedResource Include="Resources\Images\NoLevelImageFound.png" />
+	<EmbeddedResource Include="Resources\Images\sample thumbnail.bytes.png" />
+	<EmbeddedResource Include="Resources\Images\StatusError.png" />
+	<EmbeddedResource Include="Resources\Images\StatusInfo.png" />
+	<EmbeddedResource Include="Resources\Images\StatusWarning.png" />
+	<EmbeddedResource Include="Resources\Text\archive_readme.txt" />
   </ItemGroup>
 
   <ItemGroup>
@@ -54,11 +58,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Resources\Images\NoLevelImageFound.png" />
-    <Resource Include="Resources\Images\sample thumbnail.bytes.png" />
-    <Resource Include="Resources\Images\StatusError.png" />
-    <Resource Include="Resources\Images\StatusInfo.png" />
-    <Resource Include="Resources\Images\StatusWarning.png" />
+	<Resource Include="Resources\Images\NoLevelImageFound.png" />
+	<Resource Include="Resources\Images\sample thumbnail.bytes.png" />
+	<Resource Include="Resources\Images\StatusError.png" />
+	<Resource Include="Resources\Images\StatusInfo.png" />
+	<Resource Include="Resources\Images\StatusWarning.png" />
   </ItemGroup>
 
   <Import Project="..\App.SharedResources\App.Icons.projitems" Label="Shared" />

diff --git a/App.AdventureMaker.Core/Forms/AboutWindow.cs b/App.AdventureMaker.Core/Forms/AboutWindow.cs
@@ -14,8 +14,8 @@ private void InitializeComponent()
 			Content = new StackLayout()
 			{
 				Style = "vertical",
-				Spacing = 20,
-				Padding = new Padding(24),
+				Spacing = 12,
+				Padding = new Padding(16),
 
 				//Spacing = new Size(15, 15),
 				Items =
@@ -42,6 +42,11 @@ private void InitializeComponent()
 						Text = "Community content making tool for Distance",
 						TextAlignment = TextAlignment.Center
 					},
+					new Label()
+					{
+						Text = Main.GetVersionString(),
+						TextAlignment = TextAlignment.Center
+					},
 					//new StackLayout()
 					//{
 					//	Orientation = Orientation.Vertical,

diff --git a/App.AdventureMaker.Core/Main.cs b/App.AdventureMaker.Core/Main.cs
@@ -23,5 +23,10 @@ public static void Start()
 
 			new Eto.Forms.Application(Platform.Detect).Run(new MainWindow());
 		}
+
+		public static string GetVersionString()
+		{
+			return $"V.{typeof(Main).Assembly.GetName().Version} - Built on {typeof(Main).Assembly.GetBuildDate():g}";
+		}
 	}
 }
diff --git a/App.AdventureMaker.Core/Views/EditorStartView.cs b/App.AdventureMaker.Core/Views/EditorStartView.cs
@@ -5,6 +5,7 @@
 using Eto.Forms;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 
 namespace App.AdventureMaker.Core.Views
 {
@@ -68,8 +69,13 @@ public EditorStartView(MainView editor)
 									TextAlignment = TextAlignment.Center,
 									Font = new Font(SystemFont.Bold),
 									TextColor = Colors.Red
-								}, new Padding(8), centered: true)
+								}, new Padding(8), centered: true),
 								#endif
+								TableLayout.AutoSized(new Label()
+								{
+									Text = Main.GetVersionString(),
+									TextAlignment = TextAlignment.Center,
+								}, new Padding(8), centered: true),
 							}
 						}
 					}, false),

diff --git a/App.AdventureMaker.Core/Views/EditorTabView.cs b/App.AdventureMaker.Core/Views/EditorTabView.cs
@@ -2,7 +2,6 @@
 using App.AdventureMaker.Core.Interfaces;
 using Distance.AdventureMaker.Common.Models;
 using Eto.Forms;
-using System;
 using System.Collections.Generic;
 
 namespace App.AdventureMaker.Core.Views

diff --git a/Common.Extensions/Common.Extensions.projitems b/Common.Extensions/Common.Extensions.projitems
@@ -12,6 +12,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\IO\FileInfoEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\IO\DirectoryInfoEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\IO\IO.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\Reflection\AssemblyEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\StringEx.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)mscorlib\System\VersionEx.cs" />
   </ItemGroup>
 </Project>
diff --git a/Common.Extensions/mscorlib/System/Reflection/AssemblyEx.cs b/Common.Extensions/mscorlib/System/Reflection/AssemblyEx.cs
@@ -0,0 +1,11 @@
+#pragma warning disable RCS1110
+using System;
+using System.Reflection;
+
+public static class AssemblyEx
+{
+	public static DateTime GetBuildDate(this Assembly assembly)
+	{
+		return assembly.GetName().Version.ToDate();
+	}
+}
diff --git a/Common.Extensions/mscorlib/System/VersionEx.cs b/Common.Extensions/mscorlib/System/VersionEx.cs
@@ -0,0 +1,11 @@
+#pragma warning disable RCS1110, RCS1123
+using System;
+
+public static class VersionEx
+{
+	public static DateTime ToDate(this Version version)
+	{
+		long ticks = TimeSpan.TicksPerDay * version.Build + TimeSpan.TicksPerSecond * 2 * version.Revision;
+		return new DateTime(2000, 1, 1).Add(new TimeSpan(ticks));
+	}
+}