From fe0523b551e0f964c0020aaa59a49771bbacd2f3 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 25 Sep 2022 12:57:38 -0400
Subject: [PATCH] Remove version number from TGS service [TGSDeploy]

---
 README.md                                          | 4 ++--
 build/Version.props                                | 4 ++--
 src/Tgstation.Server.Host.Service/Program.cs       | 4 ++--
 src/Tgstation.Server.Host.Service/ServerService.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 448bf76ab0..d08a325c4f 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ Note that the ratio of application installations to databases is 1:1. Do not att
 
 ### Starting
 
-For the Windows service version start the `tgstation-server-4` service. If it fails to start, check the Windows event log under Windows/Application for entries from tgstation-server-4 for errors.
+For the Windows service version start the `tgstation-server` service. If it fails to start, check the Windows event log under Windows/Application for entries from tgstation-server for errors.
 
 For the console version run `dotnet Tgstation.Server.Host.Console.dll` in the installation directory. The `tgs.bat` and `tgs.sh` shell scripts are shortcuts for this. If on Windows, you must do this as admin to give the server permission to install the required DirectX dependency for certain 512 BYOND versions as well as create symlinks.
 
@@ -202,7 +202,7 @@ Test your server is running by visiting the local port in your browser. You shou
 
 Note that the live detach for DreamDaemon servers is only supported for updates or restarts via the API at this time. Stopping tgstation-server will TERMINATE ALL CHILD DREAMDAEMON SERVERS.
 
-For the Windows service version stop the `tgstation-server-4` service
+For the Windows service version stop the `tgstation-server` service
 
 For the console version press `Ctrl+C` or send a SIGQUIT to the ORIGINAL dotnet process
 
diff --git a/build/Version.props b/build/Version.props
index 8de33d0497..dbfecc172b 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,14 +3,14 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.0.2</TgsCoreVersion>
+    <TgsCoreVersion>5.0.3</TgsCoreVersion>
     <TgsConfigVersion>4.2.0</TgsConfigVersion>
     <TgsApiVersion>9.6.0</TgsApiVersion>
     <TgsApiLibraryVersion>9.6.1</TgsApiLibraryVersion>
     <TgsClientVersion>10.7.1</TgsClientVersion>
     <TgsDmapiVersion>6.0.5</TgsDmapiVersion>
     <TgsInteropVersion>5.3.0</TgsInteropVersion>
-    <TgsHostWatchdogVersion>1.1.2</TgsHostWatchdogVersion>
+    <TgsHostWatchdogVersion>1.2.0</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.0</TgsContainerScriptVersion>
     <TgsNetVersion>net6.0</TgsNetVersion>
   </PropertyGroup>
diff --git a/src/Tgstation.Server.Host.Service/Program.cs b/src/Tgstation.Server.Host.Service/Program.cs
index 4bd93e0d21..9056e67f70 100644
--- a/src/Tgstation.Server.Host.Service/Program.cs
+++ b/src/Tgstation.Server.Host.Service/Program.cs
@@ -123,7 +123,7 @@ namespace Tgstation.Server.Host.Service
 					{
 						processInstaller.Account = ServiceAccount.LocalSystem;
 
-						installer.Context = new InstallContext("tgs-4-install.log", new string[] { String.Format(CultureInfo.InvariantCulture, "/assemblypath={0}", Assembly.GetEntryAssembly().Location) });
+						installer.Context = new InstallContext("tgs-install.log", new string[] { String.Format(CultureInfo.InvariantCulture, "/assemblypath={0}", Assembly.GetEntryAssembly().Location) });
 						installer.Description = "/tg/station 13 server running as a windows service";
 						installer.DisplayName = "/tg/station server";
 						installer.DelayedAutoStart = true;
@@ -145,7 +145,7 @@ namespace Tgstation.Server.Host.Service
 				else if (Uninstall)
 					using (var installer = new ServiceInstaller())
 					{
-						installer.Context = new InstallContext("tgs-4-uninstall.log", null);
+						installer.Context = new InstallContext("tgs-uninstall.log", null);
 						installer.ServiceName = ServerService.Name;
 						installer.Uninstall(null);
 					}
diff --git a/src/Tgstation.Server.Host.Service/ServerService.cs b/src/Tgstation.Server.Host.Service/ServerService.cs
index 9eb504a6ae..a583c707ae 100644
--- a/src/Tgstation.Server.Host.Service/ServerService.cs
+++ b/src/Tgstation.Server.Host.Service/ServerService.cs
@@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Service
 		/// <summary>
 		/// The canonical windows service name.
 		/// </summary>
-		public const string Name = "tgstation-server-4";
+		public const string Name = "tgstation-server";
 
 		/// <summary>
 		/// The <see cref="IWatchdog"/> for the <see cref="ServerService"/>.