Update Version 7.18a + Merge remote-tracking branch 'origin/Rpc' into nick

prs.desktop/prsdesktop.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "7.18"
+#define MyAppVersion "7.18a"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

prs.server/Engines/Database/DatabaseEngine.cs

@@ -235,7 +235,7 @@ namespace PRSServer
             // New Style Socket Listenet
             if (Properties.RPCPort != 0)
             {
-                var sockettransport = new RpcServerSocketTransport(Properties.RPCPort, certificate);
+                var sockettransport = new RpcServerSocketTransport(Properties.RPCPort); //, certificate);
                 _socketserver = new RpcServer<RpcServerSocketTransport>(sockettransport);
                 _socketserver.OnLog += (type, userid, message, parameters) => Logger.Send(type, userid, $"[S] {message}", parameters);
                 _socketserver.Start();

prs.server/Engines/Engine.cs

@@ -50,7 +50,7 @@ namespace PRSServer
             MainLogger.AddLogger(new LogFileLogger(AppDataFolder));
             MainLogger.AddLogger(new NamedPipeLogger(server.Key));
             
-            _enginemanager = new RpcServerPipeTransport($"{ServiceName}$");
+            _enginemanager = new RpcServerPipeTransport($"{ServiceName}M");
             _enginemanager.AddHandler<IEngine, PortStatusCommand, PortStatusParameters, PortStatusResult>(new PortStatusHandler(this));
             _enginemanager.AfterMessage += (transport, args) => MainLogger.Send(LogType.Information,"",$"Engine Manager Message: {args.Message?.Command}");
             _enginemanager.Start();

prs.server/Forms/ServiceStatus.xaml.cs

@@ -118,7 +118,7 @@ namespace PRSServer
         {
             foreach (var server in servers)
             {
-                var manager = new RpcClientPipeTransport($"{server.Key}$");
+                var manager = new RpcClientPipeTransport($"{server.Key}M");
                 manager.OnOpen += (o,e) => Task.Run(() =>
                 {
                     Dispatcher.Invoke(() => { Messages.Items.Add("Connected to Server"); });

prs.server/PRSServer.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "7.18"
+#define MyAppVersion "7.18a"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"