From c24ec3076ffc9637dab8c664b2309fb8287c3ff7 Mon Sep 17 00:00:00 2001 From: sheychen Date: Sun, 30 Oct 2016 15:15:27 +0100 Subject: [PATCH] Add Common project and AssemblyInfo --- AssemblyInfoCommon.cs | 23 +++++++ Galactic Colors Control Common/Common.cs | 13 ++++ .../Galactic Colors Control Common.csproj | 61 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 21 +++++++ .../Galactic Colors Control Console.csproj | 3 + .../Properties/AssemblyInfo.cs | 15 ----- .../Galactic Colors Control GUI.csproj | 3 + .../Properties/AssemblyInfo.cs | 15 ----- .../Commands/ConnectCommand.cs | 9 +-- .../Commands/ExitCommand.cs | 5 +- .../Commands/KickCommand.cs | 7 ++- .../Galactic Colors Control Server.csproj | 9 +++ Galactic Colors Control Server/Program.cs | 19 +++--- .../Properties/AssemblyInfo.cs | 15 ----- Galactic Colors Control Server/Utilities.cs | 15 +++-- Galactic Colors Control.sln | 21 +++++++ .../Galactic Colors Control.csproj | 9 +++ Galactic Colors Control/Program.cs | 21 +++---- .../Properties/AssemblyInfo.cs | 17 +----- 19 files changed, 203 insertions(+), 98 deletions(-) create mode 100644 AssemblyInfoCommon.cs create mode 100644 Galactic Colors Control Common/Common.cs create mode 100644 Galactic Colors Control Common/Galactic Colors Control Common.csproj create mode 100644 Galactic Colors Control Common/Properties/AssemblyInfo.cs diff --git a/AssemblyInfoCommon.cs b/AssemblyInfoCommon.cs new file mode 100644 index 0000000..611a11f --- /dev/null +++ b/AssemblyInfoCommon.cs @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +//Common AssemblyInfo +// Les informations générales relatives à un assembly dépendent de +// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations +// associées à un assembly. +[assembly: AssemblyCompany("sheychen")] +[assembly: AssemblyCopyright("Copyright © 2016")] + +// Les informations de version pour un assembly se composent des quatre valeurs suivantes : +// +// Version principale +// Version secondaire +// Numéro de build +// Révision +// +// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut +// en utilisant '*', comme indiqué ci-dessous : +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.1.1")] +[assembly: AssemblyFileVersion("1.0.1.1")] \ No newline at end of file diff --git a/Galactic Colors Control Common/Common.cs b/Galactic Colors Control Common/Common.cs new file mode 100644 index 0000000..97708c3 --- /dev/null +++ b/Galactic Colors Control Common/Common.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Galactic_Colors_Control_Common +{ + public static class Common + { + public enum dataType { message, data }; + } +} diff --git a/Galactic Colors Control Common/Galactic Colors Control Common.csproj b/Galactic Colors Control Common/Galactic Colors Control Common.csproj new file mode 100644 index 0000000..1c29985 --- /dev/null +++ b/Galactic Colors Control Common/Galactic Colors Control Common.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {022A69CE-22B5-4934-BE9F-A9C6DF9557ED} + Library + Properties + Galactic_Colors_Control_Common + Galactic Colors Control Common + v4.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + Properties\AssemblyInfoCommon.cs + + + + + + + \ No newline at end of file diff --git a/Galactic Colors Control Common/Properties/AssemblyInfo.cs b/Galactic Colors Control Common/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..93e8d18 --- /dev/null +++ b/Galactic Colors Control Common/Properties/AssemblyInfo.cs @@ -0,0 +1,21 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Les informations générales relatives à un assembly dépendent de +// l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations +// associées à un assembly. +[assembly: AssemblyTitle("Galactic Colors Control Common")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyProduct("Galactic Colors Control Common")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// L'affectation de la valeur false à ComVisible rend les types invisibles dans cet assembly +// aux composants COM. Si vous devez accéder à un type dans cet assembly à partir de +// COM, affectez la valeur true à l'attribut ComVisible sur ce type. +[assembly: ComVisible(false)] + +// Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM +[assembly: Guid("022a69ce-22b5-4934-be9f-a9c6df9557ed")] diff --git a/Galactic Colors Control Console/Galactic Colors Control Console.csproj b/Galactic Colors Control Console/Galactic Colors Control Console.csproj index 276d774..7f677b3 100644 --- a/Galactic Colors Control Console/Galactic Colors Control Console.csproj +++ b/Galactic Colors Control Console/Galactic Colors Control Console.csproj @@ -44,6 +44,9 @@ + + Properties\AssemblyInfoCommon.cs + diff --git a/Galactic Colors Control Console/Properties/AssemblyInfo.cs b/Galactic Colors Control Console/Properties/AssemblyInfo.cs index 4a2e9d8..c85bccf 100644 --- a/Galactic Colors Control Console/Properties/AssemblyInfo.cs +++ b/Galactic Colors Control Console/Properties/AssemblyInfo.cs @@ -8,9 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Galactic Colors Control Console")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("sheychen")] [assembly: AssemblyProduct("Galactic Colors Control Console")] -[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -21,16 +19,3 @@ using System.Runtime.InteropServices; // Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM [assembly: Guid("5d6a09d1-dcab-4fd8-b4e6-62d9f41ae8f0")] - -// Les informations de version pour un assembly se composent des quatre valeurs suivantes : -// -// Version principale -// Version secondaire -// Numéro de build -// Révision -// -// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut -// en utilisant '*', comme indiqué ci-dessous : -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.1")] -[assembly: AssemblyFileVersion("1.0.1.1")] diff --git a/Galactic Colors Control GUI/Galactic Colors Control GUI.csproj b/Galactic Colors Control GUI/Galactic Colors Control GUI.csproj index 8a5784c..fb69eef 100644 --- a/Galactic Colors Control GUI/Galactic Colors Control GUI.csproj +++ b/Galactic Colors Control GUI/Galactic Colors Control GUI.csproj @@ -41,6 +41,9 @@ + + Properties\AssemblyInfoCommon.cs + diff --git a/Galactic Colors Control GUI/Properties/AssemblyInfo.cs b/Galactic Colors Control GUI/Properties/AssemblyInfo.cs index 66c2d21..1ad66d6 100644 --- a/Galactic Colors Control GUI/Properties/AssemblyInfo.cs +++ b/Galactic Colors Control GUI/Properties/AssemblyInfo.cs @@ -9,8 +9,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyProduct("Galactic Colors Control GUI")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyDescription("")] -[assembly: AssemblyCompany("sheychen")] -[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -21,16 +19,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("606d35be-02e8-4a7e-978e-04c2aca6ccd7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.1")] -[assembly: AssemblyFileVersion("1.0.1.1")] diff --git a/Galactic Colors Control Server/Commands/ConnectCommand.cs b/Galactic Colors Control Server/Commands/ConnectCommand.cs index 03e36ce..a23009c 100644 --- a/Galactic Colors Control Server/Commands/ConnectCommand.cs +++ b/Galactic Colors Control Server/Commands/ConnectCommand.cs @@ -1,6 +1,7 @@ using System; using System.Net; using System.Net.Sockets; +using Galactic_Colors_Control_Common; namespace Galactic_Colors_Control_Server.Commands { @@ -31,18 +32,18 @@ namespace Galactic_Colors_Control_Server.Commands Program.clients[soc].status = 0; //args[1] = args[1][0].ToString().ToUpper()[0] + args[1].Substring(1); Program.clients[soc].pseudo = args[1]; - Utilities.Send(soc, "/connected", Utilities.dataType.message); - Utilities.Broadcast(args[1] + " joined the server", Utilities.dataType.message); + Utilities.Send(soc, "/connected", Common.dataType.message); + Utilities.Broadcast(args[1] + " joined the server", Common.dataType.message); Logger.Write("Identified as " + Utilities.GetName(soc) + " form " + ((IPEndPoint)soc.LocalEndPoint).Address.ToString(), Logger.logType.info); } else { - Utilities.Send(soc, "/allreadytaken", Utilities.dataType.message); + Utilities.Send(soc, "/allreadytaken", Common.dataType.message); } } else { - Utilities.Send(soc, "You are allready " + Utilities.GetName(soc), Utilities.dataType.message); + Utilities.Send(soc, "You are allready " + Utilities.GetName(soc), Common.dataType.message); } } } diff --git a/Galactic Colors Control Server/Commands/ExitCommand.cs b/Galactic Colors Control Server/Commands/ExitCommand.cs index 55be0bb..7c9e617 100644 --- a/Galactic Colors Control Server/Commands/ExitCommand.cs +++ b/Galactic Colors Control Server/Commands/ExitCommand.cs @@ -1,4 +1,5 @@ -using System; +using Galactic_Colors_Control_Common; +using System; using System.Net.Sockets; namespace Galactic_Colors_Control_Server.Commands @@ -30,7 +31,7 @@ namespace Galactic_Colors_Control_Server.Commands bool connected = Program.clients[soc].status != -1; soc.Close(); Program.clients.Remove(soc); - if (connected) { Utilities.Broadcast(username + " leave the server", Utilities.dataType.message); } + if (connected) { Utilities.Broadcast(username + " leave the server", Common.dataType.message); } Logger.Write("Size: " + Program.clients.Count + "/" + Program.config.size, Logger.logType.debug); } } diff --git a/Galactic Colors Control Server/Commands/KickCommand.cs b/Galactic Colors Control Server/Commands/KickCommand.cs index ac7a75b..2c3e0f7 100644 --- a/Galactic Colors Control Server/Commands/KickCommand.cs +++ b/Galactic Colors Control Server/Commands/KickCommand.cs @@ -1,4 +1,5 @@ -using System; +using Galactic_Colors_Control_Common; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Sockets; @@ -29,11 +30,11 @@ namespace Galactic_Colors_Control_Server.Commands Logger.Write(args[1] + " was kick by server.", Logger.logType.info); if (args.Length > 2) { - Utilities.Send(target, "/kick " + args[2], Utilities.dataType.message); + Utilities.Send(target, "/kick " + args[2], Common.dataType.message); Logger.Write("because" + args[1], Logger.logType.debug); } else { - Utilities.Send(target, "/kick", Utilities.dataType.message); + Utilities.Send(target, "/kick", Common.dataType.message); } } else diff --git a/Galactic Colors Control Server/Galactic Colors Control Server.csproj b/Galactic Colors Control Server/Galactic Colors Control Server.csproj index 3845bbe..5fab29b 100644 --- a/Galactic Colors Control Server/Galactic Colors Control Server.csproj +++ b/Galactic Colors Control Server/Galactic Colors Control Server.csproj @@ -53,6 +53,9 @@ + + Properties\AssemblyInfoCommon.cs + @@ -94,6 +97,12 @@ false + + + {022a69ce-22b5-4934-be9f-a9c6df9557ed} + Galactic Colors Control Common + +