- Version -> 1.1.16

theRainbird · theRainbird · commit 26fe781504ff · 2023-10-12T21:19:23.000+02:00
- Fixed client freeze on server disconnect
- Updated dependencies (Castle.Windsor, WatsonTCP, ...)
- Cleaned up source code
diff --git a/CoreRemoting.Authentication.GenericOsAuthProvider/CoreRemoting.Authentication.GenericOsAuthProvider.csproj b/CoreRemoting.Authentication.GenericOsAuthProvider/CoreRemoting.Authentication.GenericOsAuthProvider.csproj
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CoreRemoting" Version="1.1.13" />
+      <PackageReference Include="CoreRemoting" Version="1.1.15" />
       <PackageReference Include="CoreRemoting.Authentication.LinuxPamAuthProvider" Version="1.1.7" />
       <PackageReference Include="CoreRemoting.Authentication.WindowsAuthProvider" Version="1.1.7" />
       <PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
diff --git a/CoreRemoting.Authentication.LinuxPamAuthProvider/CoreRemoting.Authentication.LinuxPamAuthProvider.csproj b/CoreRemoting.Authentication.LinuxPamAuthProvider/CoreRemoting.Authentication.LinuxPamAuthProvider.csproj
@@ -20,7 +20,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CoreRemoting" Version="1.1.13" />
+      <PackageReference Include="CoreRemoting" Version="1.1.15" />
       <PackageReference Include="Npam" Version="1.0.2" />
     </ItemGroup>
 
diff --git a/CoreRemoting.Authentication.WindowsAuthProvider/CoreRemoting.Authentication.WindowsAuthProvider.csproj b/CoreRemoting.Authentication.WindowsAuthProvider/CoreRemoting.Authentication.WindowsAuthProvider.csproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreRemoting" Version="1.1.13" />
-    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="6.0.0" />
+    <PackageReference Include="CoreRemoting" Version="1.1.15" />
+    <PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/CoreRemoting.Tests/CallContextTests.cs b/CoreRemoting.Tests/CallContextTests.cs
@@ -1,5 +1,4 @@
 using System.Threading;
-using CoreRemoting.DependencyInjection;
 using CoreRemoting.Tests.Tools;
 using Xunit;
 
diff --git a/CoreRemoting.Tests/CoreRemoting.Tests.csproj b/CoreRemoting.Tests/CoreRemoting.Tests.csproj
@@ -7,14 +7,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/CoreRemoting.Tests/LinqExpressionTests.cs b/CoreRemoting.Tests/LinqExpressionTests.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using CoreRemoting.DependencyInjection;
 using CoreRemoting.Tests.Tools;
 using Xunit;
 
diff --git a/CoreRemoting.Tests/ReturnAsProxyTests.cs b/CoreRemoting.Tests/ReturnAsProxyTests.cs
@@ -1,9 +1,7 @@
 using Xunit;
-using CoreRemoting;
 using System;
 using System.Threading;
 using CoreRemoting.ClassicRemotingApi;
-using CoreRemoting.DependencyInjection;
 using CoreRemoting.Tests.Tools;
 using Xunit.Abstractions;
 
diff --git a/CoreRemoting.Tests/RpcTests.cs b/CoreRemoting.Tests/RpcTests.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using CoreRemoting.Serialization.Binary;
 using CoreRemoting.Tests.ExternalTypes;
 using CoreRemoting.Tests.Tools;
 using Xunit;
@@ -12,9 +11,9 @@ namespace CoreRemoting.Tests
     [Collection("CoreRemoting")]
     public class RpcTests : IClassFixture<ServerFixture>
     {
-        private ServerFixture _serverFixture;
+        private readonly ServerFixture _serverFixture;
         private readonly ITestOutputHelper _testOutputHelper;
-        private bool _remoteServiceCalled = false;
+        private bool _remoteServiceCalled;
         
         public RpcTests(ServerFixture serverFixture, ITestOutputHelper testOutputHelper)
         {
@@ -233,7 +232,7 @@ public void Events_should_work_remotly()
                 serviceEventResetEvent.Set();
             };
 
-            proxy.CustomDelegateEvent += s =>
+            proxy.CustomDelegateEvent += _ =>
             {
                 customDelegateEventCalled = true;
                 customDelegateEventResetEvent.Set();
diff --git a/CoreRemoting.Tests/ServerFixture.cs b/CoreRemoting.Tests/ServerFixture.cs
@@ -1,9 +1,7 @@
 using System;
 using CoreRemoting.DependencyInjection;
-using CoreRemoting.Serialization.Binary;
 using CoreRemoting.Tests.Tools;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace CoreRemoting.Tests;
 
@@ -53,7 +51,7 @@ public ServerFixture()
             
         Server = new RemotingServer(serverConfig);
         
-        Server.Error += (s , e)  =>
+        Server.Error += (_ , _)  =>
         {
             ServerErrorCount++;
         };
diff --git a/CoreRemoting.Tests/SessionTests.cs b/CoreRemoting.Tests/SessionTests.cs
@@ -3,12 +3,9 @@
 using System.Linq;
 using System.Security;
 using System.Threading;
-using System.Threading.Tasks;
 using CoreRemoting.Authentication;
-using CoreRemoting.DependencyInjection;
 using CoreRemoting.Tests.Tools;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace CoreRemoting.Tests
 {
@@ -17,13 +14,11 @@ namespace CoreRemoting.Tests
     [SuppressMessage("ReSharper", "CoVariantArrayConversion")]
     public class SessionTests : IClassFixture<ServerFixture>
     {
-        private ServerFixture _serverFixture;
-        private readonly ITestOutputHelper _testOutputHelper;
-        
-        public SessionTests(ServerFixture serverFixture, ITestOutputHelper testOutputHelper)
+        private readonly ServerFixture _serverFixture;
+
+        public SessionTests(ServerFixture serverFixture)
         {
             _serverFixture = serverFixture;
-            _testOutputHelper = testOutputHelper;
         }
         
         [Fact]
@@ -144,7 +139,7 @@ public void Client_Connect_should_throw_exception_on_invalid_auth_credentials()
         [Fact]
         public void RemotingSession_Dispose_should_disconnect_client()
         {
-            _serverFixture.TestService.TestMethodFake = arg =>
+            _serverFixture.TestService.TestMethodFake = _ =>
             {
                 RemotingSession.Current.Close();
                 return null;
diff --git a/CoreRemoting.Tests/Tools/FactoryService.cs b/CoreRemoting.Tests/Tools/FactoryService.cs
@@ -1,7 +1,5 @@
 namespace CoreRemoting.Tests.Tools
 {
-    using CoreRemoting;
-    
     public class FactoryService : IFactoryService
     {
         public ITestService GetTestService()
diff --git a/CoreRemoting.Tests/Tools/TestService.cs b/CoreRemoting.Tests/Tools/TestService.cs
@@ -5,7 +5,7 @@ namespace CoreRemoting.Tests.Tools
 {
     public class TestService : ITestService
     {
-        private int _counter = 0;
+        private int _counter;
         
         public Func<object, object> TestMethodFake { get; set; }
 
diff --git a/CoreRemoting/Channels/Tcp/TcpClientChannel.cs b/CoreRemoting/Channels/Tcp/TcpClientChannel.cs
@@ -60,12 +60,12 @@ public void Connect()
         _tcpClient.Events.ServerDisconnected += OnDisconnected;
         _tcpClient.Connect();
 
-        _tcpClient.Send(new byte[1] { 0x0 }, _handshakeMetadata);
+        _tcpClient.Send(new byte[] { 0x0 }, _handshakeMetadata);
     }
 
     private void OnDisconnected(object o, DisconnectionEventArgs disconnectionEventArgs)
     {
-        Disconnected.Invoke();
+        Disconnected?.Invoke();
     }
 
     /// <summary>
@@ -107,8 +107,9 @@ public void Disconnect()
             {
                 _tcpClient.Disconnect();
             }
-            catch 
+            catch
             {
+                // ignored
             }
         }
 
diff --git a/CoreRemoting/Channels/Websocket/WebsocketClientChannel.cs b/CoreRemoting/Channels/Websocket/WebsocketClientChannel.cs
@@ -98,7 +98,7 @@ public void Connect()
 
         private void OnDisconnected(object o, CloseEventArgs closeEventArgs)
         {
-            Disconnected.Invoke();
+            Disconnected?.Invoke();
         }
 
         /// <summary>
diff --git a/CoreRemoting/ClassicRemotingApi/RemotingServices.cs b/CoreRemoting/ClassicRemotingApi/RemotingServices.cs
@@ -61,7 +61,7 @@ public static string Marshal(
             var genericFunc = typeof(Func<>);
             var factoryFunc = genericFunc.MakeGenericType(interfaceType);
             var factoryFuncProxy =
-                new DelegateProxy(factoryFunc, delegateArgs => serviceInstance);
+                new DelegateProxy(factoryFunc, _ => serviceInstance);
             
             registerServiceMethod.Invoke(container, new object[]
             {
diff --git a/CoreRemoting/CoreRemoting.csproj b/CoreRemoting/CoreRemoting.csproj
@@ -9,15 +9,16 @@
         <Copyright>2023 Hagen Siegel</Copyright>
         <PackageTags>Remoting RPC Network</PackageTags>
         <Company>Hagen Siegel</Company>
-        <AssemblyVersion>1.1.15</AssemblyVersion>
+        <AssemblyVersion>1.1.16</AssemblyVersion>
         <TargetFramework>netstandard2.0</TargetFramework>
         <PackageProjectUrl>https://github.com/theRainbird/CoreRemoting</PackageProjectUrl>
         <PackageLicenseUrl></PackageLicenseUrl>
         <RepositoryUrl>https://github.com/theRainbird/CoreRemoting.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageVersion>1.1.15</PackageVersion>
-        <PackageReleaseNotes>- Fixed memory leaks
-- Fixed calling inherited interface methods</PackageReleaseNotes>
+        <PackageVersion>1.1.16</PackageVersion>
+        <PackageReleaseNotes>- Fixed client freeze on server disconnect
+- Updated dependencies (Castle.Windsor, WatsonTCP, ...)
+</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -29,21 +30,21 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Castle.Windsor" Version="5.1.2" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Castle.Windsor" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
       <PackageReference Include="Serialize.Linq" Version="2.0.0" />
       <PackageReference Include="stakx.DynamicProxy.AsyncInterceptor" Version="0.1.0" />
-      <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
       <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
       <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
       <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
       <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
       <PackageReference Include="System.Security.Cryptography.OpenSsl" Version="5.0.0" />
       <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-      <PackageReference Include="WatsonTcp" Version="5.1.0" />
+      <PackageReference Include="WatsonTcp" Version="5.1.7" />
       <PackageReference Include="websocketsharp.core" Version="1.0.0" />
     </ItemGroup>
     
diff --git a/CoreRemoting/DependencyInjection/MicrosoftDependencyInjectionContainer.cs b/CoreRemoting/DependencyInjection/MicrosoftDependencyInjectionContainer.cs
@@ -125,10 +125,10 @@ public void RegisterService<TServiceInterface>(Func<TServiceInterface> factoryDe
             switch (lifetime)
             {
                 case ServiceLifetime.Singleton:
-                    _container.AddSingleton(serviceInterfaceType, provider => factoryDelegate());
+                    _container.AddSingleton(serviceInterfaceType, _ => factoryDelegate());
                     break;
                 case ServiceLifetime.SingleCall:
-                    _container.AddTransient(serviceInterfaceType, provider => factoryDelegate());
+                    _container.AddTransient(serviceInterfaceType, _ => factoryDelegate());
                     break;
             }
             
diff --git a/CoreRemoting/Encryption/RsaSignature.cs b/CoreRemoting/Encryption/RsaSignature.cs
@@ -50,7 +50,8 @@ public static bool VerifySignature(int keySize, byte[] sendersPublicKeyBlob, byt
             var hash = sha256.ComputeHash(rawData);
             
             // Import the sender's public key
-            using var sendersPublicKey = new RSACryptoServiceProvider(keySize) { PersistKeyInCsp = false };
+            using var sendersPublicKey = new RSACryptoServiceProvider(keySize);
+            sendersPublicKey.PersistKeyInCsp = false;
             sendersPublicKey.ImportCspBlob(sendersPublicKeyBlob);
 
             // Create an RSAPKCS1SignatureDeformatter object and pass it the RSA instance to transfer the public key.
diff --git a/CoreRemoting/RemoteDelegates/ClientDelegateRegistry.cs b/CoreRemoting/RemoteDelegates/ClientDelegateRegistry.cs
@@ -76,7 +76,7 @@ from pair in _registry
         /// <returns>Client delegate</returns>
         public Delegate GetDelegateByHandlerKey(Guid handlerKey)
         {
-            return _registry.ContainsKey(handlerKey) ? _registry[handlerKey].ClientDelegate : null;
+            return _registry.TryGetValue(handlerKey, out var value) ? value.ClientDelegate : null;
         }
 
         /// <summary>
diff --git a/CoreRemoting/RemotingClient.cs b/CoreRemoting/RemotingClient.cs
@@ -103,8 +103,8 @@ public RemotingClient(ClientConfig config) : this()
 
             _clientInstances.AddOrUpdate(
                 key: config.UniqueClientInstanceName,
-                addValueFactory: uniqueInstanceName => this,
-                updateValueFactory: (uniqueInstanceName, oldClient) =>
+                addValueFactory: _ => this,
+                updateValueFactory: (_, oldClient) =>
                 {
                     oldClient?.Dispose();
                     return this;
diff --git a/CoreRemoting/RemotingServer.cs b/CoreRemoting/RemotingServer.cs
@@ -44,8 +44,8 @@ public RemotingServer(ServerConfig config = null)
             
             _serverInstances.AddOrUpdate(
                 key: _config.UniqueServerInstanceName,
-                addValueFactory: uniqueInstanceName => this,
-                updateValueFactory: (uniqueInstanceName, oldServer) =>
+                addValueFactory: _ => this,
+                updateValueFactory: (_, oldServer) =>
                 {
                     oldServer?.Dispose();
                     return this;
diff --git a/CoreRemoting/RemotingSession.cs b/CoreRemoting/RemotingSession.cs
@@ -120,7 +120,7 @@ internal RemotingSession(int keySize, byte[] clientPublicKey, IRemotingServer se
             }
 
             _remoteDelegateInvocationEventAggregator.RemoteDelegateInvocationNeeded +=
-                (delegateType, uniqueCallKey, handlerKey, arguments) =>
+                (_, uniqueCallKey, handlerKey, arguments) =>
                 {
                     var sharedSecret =
                         MessageEncryption
@@ -628,9 +628,9 @@ private bool MapDelegateArgument(object argument, out object mappedArgument)
                 return false;
             }
 
-            if (_delegateProxyCache.ContainsKey(remoteDelegateInfo.HandlerKey))
+            if (_delegateProxyCache.TryGetValue(remoteDelegateInfo.HandlerKey, out var value))
             {
-                mappedArgument = _delegateProxyCache[remoteDelegateInfo.HandlerKey].ProxiedDelegate;
+                mappedArgument = value.ProxiedDelegate;
                 return true;
             }
 
diff --git a/Examples/HelloWorld/HelloWorld.Client/HelloWorldClient.cs b/Examples/HelloWorld/HelloWorld.Client/HelloWorldClient.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using CoreRemoting;
 using CoreRemoting.Serialization.Binary;
-using CoreRemoting.Serialization.Bson;
 using HelloWorld.Shared;
 
 namespace HelloWorld.Client
diff --git a/Examples/HelloWorld/HelloWorld.Server/HelloWorldServer.cs b/Examples/HelloWorld/HelloWorld.Server/HelloWorldServer.cs
@@ -1,9 +1,7 @@
 ﻿using System;
-using System.Runtime.InteropServices;
 using CoreRemoting;
 using CoreRemoting.DependencyInjection;
 using CoreRemoting.Serialization.Binary;
-using CoreRemoting.Serialization.Bson;
 using HelloWorld.Shared;
 
 namespace HelloWorld.Server

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Threading;`
`2`		`-using CoreRemoting.DependencyInjection;`
`3`	`2`	`using CoreRemoting.Tests.Tools;`
`4`	`3`	`using Xunit;`
`5`	`4`