From 6a8ecd37326942c8dd629a8d73919b5217238033 Mon Sep 17 00:00:00 2001 From: Erick Kinnee Date: Fri, 8 Mar 2019 11:21:08 -0600 Subject: [PATCH] Add Service stubs. Remove Windows Form test app. --- SharpCAT.sln | 12 +- SharpCATForms/App.config | 6 - SharpCATForms/Form1.Designer.cs | 126 ------------------ SharpCATForms/Form1.cs | 17 --- SharpCATForms/Form1.resx | 120 ----------------- SharpCATForms/Program.cs | 22 --- .../Properties/Resources.Designer.cs | 71 ---------- SharpCATForms/Properties/Resources.resx | 117 ---------------- SharpCATForms/Properties/Settings.Designer.cs | 30 ----- SharpCATForms/Properties/Settings.settings | 7 - SharpCATService/App.config | 6 + SharpCATService/Client.cs | 12 ++ SharpCATService/Program.cs | 25 ++++ .../Properties/AssemblyInfo.cs | 9 +- SharpCATService/Server.cs | 12 ++ SharpCATService/Service1.Designer.cs | 37 +++++ SharpCATService/Service1.cs | 28 ++++ .../SharpCATService.csproj | 52 ++------ 18 files changed, 141 insertions(+), 568 deletions(-) delete mode 100644 SharpCATForms/App.config delete mode 100644 SharpCATForms/Form1.Designer.cs delete mode 100644 SharpCATForms/Form1.cs delete mode 100644 SharpCATForms/Form1.resx delete mode 100644 SharpCATForms/Program.cs delete mode 100644 SharpCATForms/Properties/Resources.Designer.cs delete mode 100644 SharpCATForms/Properties/Resources.resx delete mode 100644 SharpCATForms/Properties/Settings.Designer.cs delete mode 100644 SharpCATForms/Properties/Settings.settings create mode 100644 SharpCATService/App.config create mode 100644 SharpCATService/Client.cs create mode 100644 SharpCATService/Program.cs rename {SharpCATForms => SharpCATService}/Properties/AssemblyInfo.cs (83%) create mode 100644 SharpCATService/Server.cs create mode 100644 SharpCATService/Service1.Designer.cs create mode 100644 SharpCATService/Service1.cs rename SharpCATForms/SharpCATForms.csproj => SharpCATService/SharpCATService.csproj (56%) diff --git a/SharpCAT.sln b/SharpCAT.sln index 6233c7a..f6d995c 100644 --- a/SharpCAT.sln +++ b/SharpCAT.sln @@ -3,22 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.421 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCATForms", "SharpCATForms\SharpCATForms.csproj", "{3483B368-338A-4BE3-AEB9-460E374B2C99}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpCATLib", "SharpCAT\SharpCATLib.csproj", "{DAD3E7BE-905A-4768-A695-0BCF96171E35}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCATConsole", "SharpCATConsole\SharpCATConsole.csproj", "{C0C9250E-EFCE-4F8F-8249-345647440EB9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpCATService", "SharpCATService\SharpCATService.csproj", "{8075C09F-03EE-40B2-A7DF-22F39AFCD40F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3483B368-338A-4BE3-AEB9-460E374B2C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3483B368-338A-4BE3-AEB9-460E374B2C99}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3483B368-338A-4BE3-AEB9-460E374B2C99}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3483B368-338A-4BE3-AEB9-460E374B2C99}.Release|Any CPU.Build.0 = Release|Any CPU {DAD3E7BE-905A-4768-A695-0BCF96171E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DAD3E7BE-905A-4768-A695-0BCF96171E35}.Debug|Any CPU.Build.0 = Debug|Any CPU {DAD3E7BE-905A-4768-A695-0BCF96171E35}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -27,6 +23,10 @@ Global {C0C9250E-EFCE-4F8F-8249-345647440EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0C9250E-EFCE-4F8F-8249-345647440EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {C0C9250E-EFCE-4F8F-8249-345647440EB9}.Release|Any CPU.Build.0 = Release|Any CPU + {8075C09F-03EE-40B2-A7DF-22F39AFCD40F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8075C09F-03EE-40B2-A7DF-22F39AFCD40F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8075C09F-03EE-40B2-A7DF-22F39AFCD40F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8075C09F-03EE-40B2-A7DF-22F39AFCD40F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SharpCATForms/App.config b/SharpCATForms/App.config deleted file mode 100644 index 0f3b743..0000000 --- a/SharpCATForms/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/SharpCATForms/Form1.Designer.cs b/SharpCATForms/Form1.Designer.cs deleted file mode 100644 index c65228a..0000000 --- a/SharpCATForms/Form1.Designer.cs +++ /dev/null @@ -1,126 +0,0 @@ -namespace SharpCATForms -{ - partial class Form1 - { - /// - /// 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 Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.ComPort1Tab = new System.Windows.Forms.TabPage(); - this.ComPort2Tab = new System.Windows.Forms.TabPage(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.ComPortListBox = new System.Windows.Forms.ListBox(); - this.tabControl1.SuspendLayout(); - this.ComPort1Tab.SuspendLayout(); - this.ComPort2Tab.SuspendLayout(); - this.SuspendLayout(); - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.ComPort1Tab); - this.tabControl1.Controls.Add(this.ComPort2Tab); - this.tabControl1.Location = new System.Drawing.Point(12, 12); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(364, 410); - this.tabControl1.TabIndex = 0; - // - // ComPort1Tab - // - this.ComPort1Tab.Controls.Add(this.textBox1); - this.ComPort1Tab.Location = new System.Drawing.Point(4, 22); - this.ComPort1Tab.Name = "ComPort1Tab"; - this.ComPort1Tab.Padding = new System.Windows.Forms.Padding(3); - this.ComPort1Tab.Size = new System.Drawing.Size(356, 384); - this.ComPort1Tab.TabIndex = 0; - this.ComPort1Tab.Text = "Port 1"; - this.ComPort1Tab.UseVisualStyleBackColor = true; - // - // ComPort2Tab - // - this.ComPort2Tab.Controls.Add(this.textBox2); - this.ComPort2Tab.Location = new System.Drawing.Point(4, 22); - this.ComPort2Tab.Name = "ComPort2Tab"; - this.ComPort2Tab.Padding = new System.Windows.Forms.Padding(3); - this.ComPort2Tab.Size = new System.Drawing.Size(356, 384); - this.ComPort2Tab.TabIndex = 1; - this.ComPort2Tab.Text = "Port 2"; - this.ComPort2Tab.UseVisualStyleBackColor = true; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(7, 7); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(340, 371); - this.textBox1.TabIndex = 0; - // - // textBox2 - // - this.textBox2.Location = new System.Drawing.Point(7, 7); - this.textBox2.Multiline = true; - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(340, 371); - this.textBox2.TabIndex = 1; - // - // ComPortListBox - // - this.ComPortListBox.FormattingEnabled = true; - this.ComPortListBox.Location = new System.Drawing.Point(462, 48); - this.ComPortListBox.Name = "ComPortListBox"; - this.ComPortListBox.Size = new System.Drawing.Size(120, 95); - this.ComPortListBox.TabIndex = 1; - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.ComPortListBox); - this.Controls.Add(this.tabControl1); - this.Name = "Form1"; - this.Text = "Form1"; - this.tabControl1.ResumeLayout(false); - this.ComPort1Tab.ResumeLayout(false); - this.ComPort1Tab.PerformLayout(); - this.ComPort2Tab.ResumeLayout(false); - this.ComPort2Tab.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage ComPort1Tab; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TabPage ComPort2Tab; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.ListBox ComPortListBox; - } -} - diff --git a/SharpCATForms/Form1.cs b/SharpCATForms/Form1.cs deleted file mode 100644 index b24ac0e..0000000 --- a/SharpCATForms/Form1.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Windows.Forms; -using SharpCATLib; - -namespace SharpCATForms -{ - public partial class Form1 : Form - { - public Form1() - { - SharpCAT sharpCAT = new SharpCAT(); - - InitializeComponent(); - - ComPortListBox.DataSource = sharpCAT.PortNames; - } - } -} \ No newline at end of file diff --git a/SharpCATForms/Form1.resx b/SharpCATForms/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/SharpCATForms/Form1.resx +++ /dev/null @@ -1,120 +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 - - \ No newline at end of file diff --git a/SharpCATForms/Program.cs b/SharpCATForms/Program.cs deleted file mode 100644 index 7f8c0a1..0000000 --- a/SharpCATForms/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Windows.Forms; -using SharpCATLib; - -namespace SharpCATForms -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - private static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - - - } - } -} \ No newline at end of file diff --git a/SharpCATForms/Properties/Resources.Designer.cs b/SharpCATForms/Properties/Resources.Designer.cs deleted file mode 100644 index f6f77d6..0000000 --- a/SharpCATForms/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SharpCATForms.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SharpCATForms.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/SharpCATForms/Properties/Resources.resx b/SharpCATForms/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/SharpCATForms/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SharpCATForms/Properties/Settings.Designer.cs b/SharpCATForms/Properties/Settings.Designer.cs deleted file mode 100644 index c8be944..0000000 --- a/SharpCATForms/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace SharpCATForms.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/SharpCATForms/Properties/Settings.settings b/SharpCATForms/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/SharpCATForms/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SharpCATService/App.config b/SharpCATService/App.config new file mode 100644 index 0000000..56efbc7 --- /dev/null +++ b/SharpCATService/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SharpCATService/Client.cs b/SharpCATService/Client.cs new file mode 100644 index 0000000..becf21d --- /dev/null +++ b/SharpCATService/Client.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SharpCATService +{ + class Client + { + } +} diff --git a/SharpCATService/Program.cs b/SharpCATService/Program.cs new file mode 100644 index 0000000..bcfd883 --- /dev/null +++ b/SharpCATService/Program.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.ServiceProcess; +using System.Text; +using System.Threading.Tasks; + +namespace SharpCATService +{ + static class Program + { + /// + /// The main entry point for the application. + /// + static void Main() + { + ServiceBase[] ServicesToRun; + ServicesToRun = new ServiceBase[] + { + new Service1() + }; + ServiceBase.Run(ServicesToRun); + } + } +} diff --git a/SharpCATForms/Properties/AssemblyInfo.cs b/SharpCATService/Properties/AssemblyInfo.cs similarity index 83% rename from SharpCATForms/Properties/AssemblyInfo.cs rename to SharpCATService/Properties/AssemblyInfo.cs index 7e1f3f3..17d08cf 100644 --- a/SharpCATForms/Properties/AssemblyInfo.cs +++ b/SharpCATService/Properties/AssemblyInfo.cs @@ -1,14 +1,15 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SharpCATForms")] +[assembly: AssemblyTitle("SharpCATService")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SharpCATForms")] +[assembly: AssemblyProduct("SharpCATService")] [assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -19,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3483b368-338a-4be3-aeb9-460e374b2c99")] +[assembly: Guid("8075c09f-03ee-40b2-a7df-22f39afcd40f")] // Version information for an assembly consists of the following four values: // @@ -32,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SharpCATService/Server.cs b/SharpCATService/Server.cs new file mode 100644 index 0000000..8749a5f --- /dev/null +++ b/SharpCATService/Server.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SharpCATService +{ + class Server + { + } +} diff --git a/SharpCATService/Service1.Designer.cs b/SharpCATService/Service1.Designer.cs new file mode 100644 index 0000000..b8e1e2d --- /dev/null +++ b/SharpCATService/Service1.Designer.cs @@ -0,0 +1,37 @@ +namespace SharpCATService +{ + partial class Service1 + { + /// + /// 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() + { + components = new System.ComponentModel.Container(); + this.ServiceName = "Service1"; + } + + #endregion + } +} diff --git a/SharpCATService/Service1.cs b/SharpCATService/Service1.cs new file mode 100644 index 0000000..3a0093c --- /dev/null +++ b/SharpCATService/Service1.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Linq; +using System.ServiceProcess; +using System.Text; +using System.Threading.Tasks; + +namespace SharpCATService +{ + public partial class Service1 : ServiceBase + { + public Service1() + { + InitializeComponent(); + } + + protected override void OnStart(string[] args) + { + } + + protected override void OnStop() + { + } + } +} diff --git a/SharpCATForms/SharpCATForms.csproj b/SharpCATService/SharpCATService.csproj similarity index 56% rename from SharpCATForms/SharpCATForms.csproj rename to SharpCATService/SharpCATService.csproj index bbad6ca..d05108c 100644 --- a/SharpCATForms/SharpCATForms.csproj +++ b/SharpCATService/SharpCATService.csproj @@ -4,10 +4,10 @@ Debug AnyCPU - {3483B368-338A-4BE3-AEB9-460E374B2C99} + {8075C09F-03EE-40B2-A7DF-22F39AFCD40F} WinExe - SharpCATForms - SharpCATForms + SharpCATService + SharpCATService v4.7.2 512 true @@ -22,7 +22,6 @@ DEBUG;TRACE prompt 4 - false AnyCPU @@ -33,10 +32,6 @@ prompt 4 - - - - @@ -44,51 +39,24 @@ - - - + - - Form + + + + Component - - Form1.cs + + Service1.cs - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - {dad3e7be-905a-4768-a695-0bcf96171e35} - SharpCATLib - - \ No newline at end of file