Forráskód Böngészése

Standardised PipeTransports to use MessagePack communication

frogsoftware 3 napja
szülő
commit
0d5bb5058d

+ 1 - 1
prs.desktop/Integrations/Logikal/LogikalClient.cs

@@ -75,7 +75,7 @@ public class LogikalClient : IDisposable
             Process.Start(_info);
         }
 
-        _client = new PipeClient<LogikalMessage>("$logikal", formatter: new NewtonsoftJsonFormatter());
+        _client = new PipeClient<LogikalMessage>("$logikal", new MessagePackFormatter<LogikalMessage>());
         
         _client.Connected += Client_Connected;
         _client.Disconnected += Client_Disconnected;

+ 1 - 1
prs.desktop/PRSDesktop.csproj

@@ -908,7 +908,7 @@
       <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
       <PackageReference Include="Fluent.Ribbon" Version="10.1.0" />
       <PackageReference Include="gmaps-api-net" Version="0.33.0" />
-      <PackageReference Include="H.Formatters.Newtonsoft.Json" Version="13.0.59" />
+      <PackageReference Include="H.Formatters.Newtonsoft.Json" Version="15.0.0" />
       <PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1004" />
       <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
       <PackageReference Include="MotorolaCoreScannerNetStandard" Version="1.1.5" />

+ 1 - 1
prs.licensing/GUI/Console.xaml.cs

@@ -171,7 +171,7 @@ public partial class Console : Window, INotifyPropertyChanged
 
         _creatingClient = true;
 
-        var client = new PipeClient<string>(GetPipeName(), ".", formatter:new BinaryFormatter());
+        var client = new PipeClient<string>(GetPipeName(), new MessagePackFormatter<string>());
         client.MessageReceived += (o, args) =>
         {
             Dispatcher.BeginInvoke(() =>

+ 1 - 1
prs.licensing/GUI/ServerConsole.cs

@@ -38,7 +38,7 @@ public class LicensingConsole : InABox.Wpf.Console.Console
     {
         base.OnLoaded();
 
-        _client = new PipeClient<string>(ServiceName, ".", formatter:new BinaryFormatter());
+        _client = new PipeClient<string>(ServiceName, new MessagePackFormatter<string>());
         _client.MessageReceived += (o, args) =>
         {
             Dispatcher.BeginInvoke(() =>

+ 1 - 1
prs.logikal/LogikalListener.cs

@@ -37,7 +37,7 @@ namespace PRSLogikal
                 { LogikalMethod.BOM, new LogikalMethodInfo<LogikalBOMRequest>(GetBOM) },
             };
             
-            _server = new PipeServer<LogikalMessage>("$logikal", formatter: new NewtonsoftJsonFormatter());
+            _server = new PipeServer<LogikalMessage>("$logikal", new MessagePackFormatter<LogikalMessage>());
             
             _server.ClientConnected += (o, args) =>
             {

+ 7 - 3
prs.logikal/PRSLogikal.csproj

@@ -46,6 +46,9 @@
     <Reference Include="H.Formatters, Version=2.0.59.0, Culture=neutral, PublicKeyToken=155b585918bc2f0b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\H.Formatters.2.0.59\lib\net451\H.Formatters.dll</HintPath>
     </Reference>
+    <Reference Include="H.Formatters.MessagePack">
+      <HintPath>..\..\..\Users\frank.vandenbos\.nuget\packages\h.formatters.messagepack\15.0.0\lib\netstandard2.0\H.Formatters.MessagePack.dll</HintPath>
+    </Reference>
     <Reference Include="H.Formatters.Newtonsoft.Json">
       <HintPath>..\..\..\Users\frank.vandenbos\.nuget\packages\h.formatters.newtonsoft.json\13.0.59\lib\netstandard2.0\H.Formatters.Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -130,10 +133,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="H.Formatters" Version="2.0.59" />
-    <PackageReference Include="H.Pipes" Version="2.0.59" />
+    <PackageReference Include="H.Formatters" Version="15.0.0" />
+    <PackageReference Include="H.Formatters.MessagePack" Version="15.0.0" />
+    <PackageReference Include="H.Pipes" Version="15.0.0" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Ofcas.Lk.Api.Client.Core" Version="3.0.2.10" />
     <PackageReference Include="Ofcas.Lk.Api.Client.Ui" Version="3.0.2.10" />

+ 1 - 1
prs.server/Forms/Console/ServerConsole.cs

@@ -37,7 +37,7 @@ public class ServerConsole : Console
     {
         base.OnLoaded();
 
-        _client = new PipeClient<string>(ServiceName, ".", formatter:new BinaryFormatter());
+        _client = new PipeClient<string>(ServiceName, new MessagePackFormatter<string>());
         _client.MessageReceived += (o, args) =>
         {
             Dispatcher.BeginInvoke(() =>