diff --git a/TGCommandLine/RepoCommands.cs b/TGCommandLine/RepoCommands.cs index 1ad2101a4e..1b0aa88599 100644 --- a/TGCommandLine/RepoCommands.cs +++ b/TGCommandLine/RepoCommands.cs @@ -207,7 +207,7 @@ namespace TGCommandLine } protected override ExitCode Run(IList parameters) { - var result = Server.GetComponent().PushChangelog(); + var result = Server.GetComponent().SynchronizePush(); if(result != null) OutputProc(result); return result == null ? ExitCode.Normal : ExitCode.ServerError; diff --git a/TGCommandLine/RootCommands.cs b/TGCommandLine/RootCommands.cs index 9fba17ca44..e70c88014c 100644 --- a/TGCommandLine/RootCommands.cs +++ b/TGCommandLine/RootCommands.cs @@ -118,7 +118,7 @@ namespace TGCommandLine OutputProc(res); else { - res = Repo.PushChangelog(); + res = Repo.SynchronizePush(); if (res != null) OutputProc(res); } diff --git a/TGControlPanel/Login.cs b/TGControlPanel/Login.cs index c09f9ac8aa..e7ff2e1f53 100644 --- a/TGControlPanel/Login.cs +++ b/TGControlPanel/Login.cs @@ -4,10 +4,10 @@ using TGServiceInterface; namespace TGControlPanel { - public partial class Login : Form + partial class Login : Form { /// - /// Create a + /// Create a form /// public Login() { diff --git a/TGControlPanel/Main.cs b/TGControlPanel/Main.cs index 07e62f8b0a..d6bb808270 100644 --- a/TGControlPanel/Main.cs +++ b/TGControlPanel/Main.cs @@ -8,7 +8,7 @@ namespace TGControlPanel /// /// The main form /// - public partial class Main : Form + partial class Main : Form { /// /// Create the control panel. Requires the has had it's connection info setup diff --git a/TGControlPanel/ServerPage.cs b/TGControlPanel/ServerPage.cs index 0f001d3abc..41553f907a 100644 --- a/TGControlPanel/ServerPage.cs +++ b/TGControlPanel/ServerPage.cs @@ -388,7 +388,7 @@ namespace TGControlPanel { Repo.GenerateChangelog(out updateError); if (updateError == null) - updateError = Repo.PushChangelog(); + updateError = Repo.SynchronizePush(); updateError = DM.Compile(true) ? updateError : "Compilation failed!"; } break; @@ -398,7 +398,7 @@ namespace TGControlPanel { Repo.GenerateChangelog(out updateError); if (updateError == null) - updateError = Repo.PushChangelog(); + updateError = Repo.SynchronizePush(); updateError = Repo.MergePullRequest(testmergePR); if (updateError == null) { @@ -413,7 +413,7 @@ namespace TGControlPanel { Repo.GenerateChangelog(out updateError); if (updateError == null) - Repo.PushChangelog(); //not an error 99% of the time if this fails, just a dirty tree + Repo.SynchronizePush(); //not an error 99% of the time if this fails, just a dirty tree updateError = DM.Compile(true) ? updateError : "Compilation failed!"; } break; diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs index de713fcfb1..828712ef55 100644 --- a/TGInstallerWrapper/Main.cs +++ b/TGInstallerWrapper/Main.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace TGInstallerWrapper { - public partial class Main : Form + partial class Main : Form { const string DefaultInstallDir = "TG Station Server"; //keep this in sync with the msi installer diff --git a/TGServerService/Repository.cs b/TGServerService/Repository.cs index 9bfafeeebf..337b00f089 100644 --- a/TGServerService/Repository.cs +++ b/TGServerService/Repository.cs @@ -943,7 +943,7 @@ namespace TGServerService } } - public string PushChangelog() + public string SynchronizePush() { var Config = new RepoConfig(false); if (Config == null) diff --git a/TGServerService/ServerService.cs b/TGServerService/ServerService.cs index f277dfd2f9..95552baef5 100644 --- a/TGServerService/ServerService.cs +++ b/TGServerService/ServerService.cs @@ -8,7 +8,7 @@ using TGServiceInterface; namespace TGServerService { - public partial class TGServerService : ServiceBase + partial class TGServerService : ServiceBase { //only deprecate events, do not reuse them public enum EventID diff --git a/TGServiceInterface/ChatProvider.cs b/TGServiceInterface/ChatProvider.cs index 7daa52281b..d52a53a866 100644 --- a/TGServiceInterface/ChatProvider.cs +++ b/TGServiceInterface/ChatProvider.cs @@ -59,8 +59,21 @@ namespace TGServiceInterface const int GameChannelIndex = 5; const int ProviderIndex = 6; const int EnabledIndex = 7; + /// + /// Starting index of which child classes should use to write their custom data to + /// protected const int BaseIndex = 8; + /// + /// Set to if a child constructor should use the baseInfo parameter of to initialize it's property fields, otherwise + /// protected readonly bool InitializeFields; + + /// + /// Raw access to the underlying data + /// + [DataMember] + public IList DataFields { get; protected set; } + /// /// Constructs a from optional /// @@ -222,12 +235,6 @@ namespace TGServiceInterface get { return (TGChatProvider)Convert.ToInt32(DataFields[ProviderIndex]); } set { DataFields[ProviderIndex] = Convert.ToString((int)value); } } - - /// - /// Raw access to the underlying data - /// - [DataMember] - public IList DataFields { get; protected set; } } /// diff --git a/TGServiceInterface/Compiler.cs b/TGServiceInterface/Compiler.cs index dbf825268a..20a66b84ac 100644 --- a/TGServiceInterface/Compiler.cs +++ b/TGServiceInterface/Compiler.cs @@ -34,7 +34,7 @@ namespace TGServiceInterface /// /// Sets up the symlinks for hotswapping game code. This will reset everything in the Game folder. Requires the repository to be set up and locks it once the compilation stage starts. Runs asyncronously from this call /// - /// + /// if the operation began, if it could not start [OperationContract] bool Initialize(); diff --git a/TGServiceInterface/Server.cs b/TGServiceInterface/Server.cs index 07f8a91c76..835a04f992 100644 --- a/TGServiceInterface/Server.cs +++ b/TGServiceInterface/Server.cs @@ -80,8 +80,6 @@ namespace TGServiceInterface /// Sets the function called when a remote login fails due to the server having an invalid SSL cert /// /// The to be called when a remote login is attempted while the server posesses a bad certificate. Passed a of error information about the and should return if it the connection should be made anyway - /// - /// public static void SetBadCertificateHandler(Func handler) { ServicePointManager.ServerCertificateValidationCallback = (sender, cert, chain, error) =>