diff --git a/TGServerService/ProjectInstaller.Designer.cs b/TGServerService/ProjectInstaller.Designer.cs
deleted file mode 100644
index 82180bdcf6..0000000000
--- a/TGServerService/ProjectInstaller.Designer.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-namespace TGServerService
-{
- public partial class ProjectInstaller
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.serviceProcessInstaller1 = new System.ServiceProcess.ServiceProcessInstaller();
- this.serviceInstaller1 = new System.ServiceProcess.ServiceInstaller();
- //
- // serviceProcessInstaller1
- //
- this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
- this.serviceProcessInstaller1.Password = null;
- this.serviceProcessInstaller1.Username = null;
- //
- // serviceInstaller1
- //
- this.serviceInstaller1.Description = "/tg/station Server Service";
- this.serviceInstaller1.DisplayName = "TG Station Server";
- this.serviceInstaller1.ServiceName = "TG Station Server";
- this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
- //
- // ProjectInstaller
- //
- this.Installers.AddRange(new System.Configuration.Install.Installer[] {
- this.serviceProcessInstaller1,
- this.serviceInstaller1});
-
- }
-
- #endregion
-
- ///
- /// The project's
- ///
- private System.ServiceProcess.ServiceProcessInstaller serviceProcessInstaller1;
- ///
- /// The project's
- ///
- private System.ServiceProcess.ServiceInstaller serviceInstaller1;
- }
-}
\ No newline at end of file
diff --git a/TGServerService/ProjectInstaller.cs b/TGServerService/ProjectInstaller.cs
index 12a82fa238..2f4d75524d 100644
--- a/TGServerService/ProjectInstaller.cs
+++ b/TGServerService/ProjectInstaller.cs
@@ -1,10 +1,11 @@
using System.ComponentModel;
using System.Configuration.Install;
+using System.ServiceProcess;
namespace TGServerService
{
///
- /// This tells the .msi there is a Windows in this that needs installation
+ /// This tells the .msi there is a Windows in this that needs installation
///
[RunInstaller(true)]
public partial class ProjectInstaller : Installer
@@ -14,7 +15,21 @@ namespace TGServerService
///
public ProjectInstaller()
{
- InitializeComponent();
+ Installers.AddRange(new Installer[] {
+ new ServiceProcessInstaller
+ {
+ Account = ServiceAccount.LocalSystem,
+ Password = null,
+ Username = null
+ },
+ new ServiceInstaller
+ {
+ Description = "/tg/station Server Service",
+ DisplayName = "TG Station Server",
+ ServiceName = "TG Station Server",
+ StartType = ServiceStartMode.Automatic
+ }
+ });
}
}
}
diff --git a/TGServerService/ProjectInstaller.resx b/TGServerService/ProjectInstaller.resx
deleted file mode 100644
index 235f1b0bfb..0000000000
--- a/TGServerService/ProjectInstaller.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 56
-
-
- 196, 17
-
-
- False
-
-
\ No newline at end of file
diff --git a/TGServerService/Service.Designer.cs b/TGServerService/Service.Designer.cs
deleted file mode 100644
index 7c2721b451..0000000000
--- a/TGServerService/Service.Designer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-namespace TGServerService
-{
- sealed partial class Service
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- //
- // Service1
- //
- this.ServiceName = "TG Station Server";
-
- }
-
- #endregion
- }
-}
diff --git a/TGServerService/Service.cs b/TGServerService/Service.cs
index 58b52c11ab..b42b50dcdf 100644
--- a/TGServerService/Service.cs
+++ b/TGServerService/Service.cs
@@ -96,7 +96,7 @@ namespace TGServerService
Properties.Settings.Default.UpgradeRequired = false;
Properties.Settings.Default.Save();
}
- InitializeComponent();
+ ServiceName = "TG Station Server";
ActiveService = this;
Run(this);
}
diff --git a/TGServerService/Service.resx b/TGServerService/Service.resx
deleted file mode 100644
index e5858cc294..0000000000
--- a/TGServerService/Service.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- False
-
-
\ No newline at end of file
diff --git a/TGServerService/TGServerService.csproj b/TGServerService/TGServerService.csproj
index 73d9428b8f..4faf13f8c3 100644
--- a/TGServerService/TGServerService.csproj
+++ b/TGServerService/TGServerService.csproj
@@ -108,15 +108,9 @@
Component
-
- ProjectInstaller.cs
-
Component
-
- Service.cs
-
@@ -133,15 +127,6 @@
Settings.Designer.cs
-
-
- ProjectInstaller.cs
-
-
- Service.cs
- Designer
-
-
{ac4e7e8b-f83a-481c-a8b0-8fa4e8ae59ab}
@@ -152,6 +137,7 @@
+