Merge branch 'dev' into 1169-DMAPISeparation

README.md

@@ -30,6 +30,8 @@ Older server versions can be found in the V# branches of this repository. Note t
 
 If you wish to install the TGS as a service, run `Tgstation.Server.Host.Service.exe`. It should prompt you to install it. Click `Yes` and accept a potential UAC elevation prompt and the setup wizard should run.
 
+Should you want a clean start, be sure to first uninstall the service by running `Tgstation.Server.Host.Service.exe -u` from the command line.
+
 #### Linux (Native)
 
 We recommend using Docker for Linux installations, see below. The content of this parent section may be skipped if you choose to do so.

build/Version.props

@@ -9,7 +9,7 @@
     <TgsClientVersion>9.1.2</TgsClientVersion>
     <TgsDmapiVersion>6.0.0</TgsDmapiVersion>
     <TgsInteropVersion>5.3.0</TgsInteropVersion>
-    <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
+    <TgsHostWatchdogVersion>1.1.1</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.0</TgsContainerScriptVersion>
   </PropertyGroup>
 </Project>

src/Tgstation.Server.Host.Service/Program.cs

@@ -1,4 +1,4 @@
-using McMaster.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Specialized;
@@ -20,12 +20,10 @@ namespace Tgstation.Server.Host.Service
 	/// </summary>
 	sealed class Program
 	{
-#pragma warning disable SA1401 // Fields should be private
 		/// <summary>
 		/// The <see cref="IWatchdogFactory"/> for the <see cref="Program"/>
 		/// </summary>
 		internal static IWatchdogFactory WatchdogFactory = new WatchdogFactory();
-#pragma warning restore SA1401 // Fields should be private
 
 		/// <summary>
 		/// The --uninstall or -u option
@@ -151,6 +149,10 @@ namespace Tgstation.Server.Host.Service
 
 				if (Configure)
 				{
+#pragma warning disable CS0618 // Type or member is obsolete
+					loggerFactory.AddConsole();
+#pragma warning restore CS0618 // Type or member is obsolete
+
 					// DCT: None available
 					await WatchdogFactory.CreateWatchdog(loggerFactory).RunAsync(true, Array.Empty<string>(), default).ConfigureAwait(false);
 				}

src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj

@@ -30,6 +30,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Tgstation.Server.Host/Program.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tgstation.Server.Host.Core;
+using Tgstation.Server.Host.Properties;
 using Tgstation.Server.Host.System;
 
 namespace Tgstation.Server.Host
@@ -17,7 +18,7 @@ namespace Tgstation.Server.Host
 		/// <summary>
 		/// The expected host watchdog <see cref="Version"/>.
 		/// </summary>
-		internal static readonly Version HostWatchdogVersion = new Version(1, 1, 0);
+		internal static Version HostWatchdogVersion => Version.Parse(MasterVersionsAttribute.Instance.RawHostWatchdogVersion);
 
 		/// <summary>
 		/// The <see cref="IServerFactory"/> to use.

src/Tgstation.Server.Host/Properties/MasterVersionsAttribute.cs

@@ -31,20 +31,28 @@ namespace Tgstation.Server.Host.Properties
 		/// </summary>
 		public string RawControlPanelVersion { get; }
 
+		/// <summary>
+		/// The <see cref="Version"/> <see cref="string"/> of the control panel version built.
+		/// </summary>
+		public string RawHostWatchdogVersion { get; }
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MasterVersionsAttribute"/> <see langword="class"/>.
 		/// </summary>
 		/// <param name="rawConfigurationVersion">The value of <see cref="RawConfigurationVersion"/>.</param>
 		/// <param name="rawInteropVersion">The value of <see cref="RawInteropVersion"/>.</param>
 		/// <param name="rawControlPanelVersion">The value of <see cref="RawControlPanelVersion"/>.</param>
+		/// <param name="rawHostWatchdogVersion">The value of <see cref="RawHostWatchdogVersion"/>.</param>
 		public MasterVersionsAttribute(
 			string rawConfigurationVersion,
 			string rawInteropVersion,
-			string rawControlPanelVersion)
+			string rawControlPanelVersion,
+			string rawHostWatchdogVersion)
 		{
 			RawConfigurationVersion = rawConfigurationVersion ?? throw new ArgumentNullException(nameof(rawConfigurationVersion));
 			RawInteropVersion = rawInteropVersion ?? throw new ArgumentNullException(nameof(rawInteropVersion));
 			RawControlPanelVersion = rawControlPanelVersion ?? throw new ArgumentNullException(nameof(rawControlPanelVersion));
+			RawHostWatchdogVersion = rawHostWatchdogVersion ?? throw new ArgumentNullException(nameof(rawHostWatchdogVersion));
 		}
 	}
 }

src/Tgstation.Server.Host/Tgstation.Server.Host.csproj

@@ -51,6 +51,7 @@
         <_Parameter1>$(TgsConfigVersion)</_Parameter1>
         <_Parameter2>$(TgsInteropVersion)</_Parameter2>
         <_Parameter3>$(TgsControlPanelVersion)</_Parameter3>
+        <_Parameter4>$(TgsHostWatchdogVersion)</_Parameter4>
       </AssemblyAttributes>
     </ItemGroup>