From 1b924ab8af2018af5d47acd9173d775a4c7cfa73 Mon Sep 17 00:00:00 2001 From: RobinsonD Date: Wed, 6 Dec 2017 14:44:21 +0000 Subject: [PATCH] Update from packages Rx.Core etc (assemblies System.Reactive.Core etc. version 2.2.5) to packages System.Reactive.Core etc. version 3.1.1 Update from .Net 4.0/4.5 to 4.6.1 Update from Visual Studio 2012 to 2017 , tools version 4.0 to 12.0 --- .gitignore | 1 + .../ReactiveSockets.Tests.csproj | 20 +++++------ ReactiveSockets.Tests/SampleProtocolTests.cs | 13 ++++--- ReactiveSockets.Tests/packages.config | 9 +++-- ReactiveSockets.sln | 7 ++-- .../Properties/Resources.Designer.cs | 4 +-- ReactiveSockets/ReactiveClient.cs | 7 ++-- ReactiveSockets/ReactiveSocket.cs | 2 +- ReactiveSockets/ReactiveSockets.csproj | 26 ++++++-------- ReactiveSockets/app.config | 23 +++---------- ReactiveSockets/packages.config | 8 ++--- Sample/ReactiveClient/App.config | 34 +++---------------- Sample/ReactiveClient/Program.cs | 8 ++--- Sample/ReactiveClient/ReactiveClient.csproj | 23 +++++++------ Sample/ReactiveClient/packages.config | 9 +++-- .../ReactiveProtocol/ReactiveProtocol.csproj | 26 +++++++------- Sample/ReactiveProtocol/StringChannel.cs | 9 ++--- Sample/ReactiveProtocol/packages.config | 8 ++--- Sample/ReactiveServer/App.config | 34 +++---------------- Sample/ReactiveServer/Program.cs | 11 ++---- Sample/ReactiveServer/ReactiveServer.csproj | 20 +++++------ Sample/ReactiveServer/packages.config | 8 ++--- 22 files changed, 114 insertions(+), 196 deletions(-) diff --git a/.gitignore b/.gitignore index f0cd98a..6c7fb7d 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ UpgradeLog*.XML /out40 /out45 +.vs/ diff --git a/ReactiveSockets.Tests/ReactiveSockets.Tests.csproj b/ReactiveSockets.Tests/ReactiveSockets.Tests.csproj index cc7dea8..1046958 100644 --- a/ReactiveSockets.Tests/ReactiveSockets.Tests.csproj +++ b/ReactiveSockets.Tests/ReactiveSockets.Tests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ReactiveSockets.Tests ReactiveSockets.Tests - v4.5 + v4.6.1 512 ..\ @@ -41,17 +41,17 @@ - - ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll + + ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll - - ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll + + ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll + + ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll - - ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll + + ..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll ..\packages\xunit.1.9.1\lib\net20\xunit.dll diff --git a/ReactiveSockets.Tests/SampleProtocolTests.cs b/ReactiveSockets.Tests/SampleProtocolTests.cs index 727fc78..488fb3b 100644 --- a/ReactiveSockets.Tests/SampleProtocolTests.cs +++ b/ReactiveSockets.Tests/SampleProtocolTests.cs @@ -1,16 +1,15 @@ namespace ReactiveSockets.Tests { - using System; - using System.Linq; - using System.Reactive.Subjects; - using System.Threading; using Moq; using ReactiveProtocol; using ReactiveSockets; - using Xunit; - using System.Reactive.Linq; - using System.Reactive.Concurrency; + using System; using System.Collections.Concurrent; + using System.Linq; + using System.Reactive.Concurrency; + using System.Reactive.Linq; + using System.Threading; + using Xunit; public class SampleProtocolTests { diff --git a/ReactiveSockets.Tests/packages.config b/ReactiveSockets.Tests/packages.config index 44a3fd1..ff67415 100644 --- a/ReactiveSockets.Tests/packages.config +++ b/ReactiveSockets.Tests/packages.config @@ -1,10 +1,9 @@  - - - - - + + + + \ No newline at end of file diff --git a/ReactiveSockets.sln b/ReactiveSockets.sln index f6c1b01..5f8d754 100644 --- a/ReactiveSockets.sln +++ b/ReactiveSockets.sln @@ -1,6 +1,7 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveSockets", "ReactiveSockets\ReactiveSockets.csproj", "{3B854D2F-1BC1-4080-A47A-9B53BA2F995D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveSockets.Tests", "ReactiveSockets.Tests\ReactiveSockets.Tests.csproj", "{0502F800-A9AC-41D6-A789-78B78A38CBB6}" diff --git a/ReactiveSockets/Properties/Resources.Designer.cs b/ReactiveSockets/Properties/Resources.Designer.cs index b10ca72..4283253 100644 --- a/ReactiveSockets/Properties/Resources.Designer.cs +++ b/ReactiveSockets/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18033 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace ReactiveSockets.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/ReactiveSockets/ReactiveClient.cs b/ReactiveSockets/ReactiveClient.cs index 4bcda7b..6c88a1f 100644 --- a/ReactiveSockets/ReactiveClient.cs +++ b/ReactiveSockets/ReactiveClient.cs @@ -1,8 +1,7 @@ -using System; -using System.IO; - -namespace ReactiveSockets +namespace ReactiveSockets { + using System; + using System.IO; using System.Net.Sockets; using System.Threading.Tasks; using Diagnostics; diff --git a/ReactiveSockets/ReactiveSocket.cs b/ReactiveSockets/ReactiveSocket.cs index 0bd0f1d..caeb370 100644 --- a/ReactiveSockets/ReactiveSocket.cs +++ b/ReactiveSockets/ReactiveSocket.cs @@ -263,7 +263,7 @@ private void BeginRead() this.readSubscription = Observable.Defer(() => { var buffer = new byte[this.ReceiveBufferSize]; - return Observable.FromAsyncPattern(stream.BeginRead, stream.EndRead)(buffer, 0, buffer.Length) + return Observable.FromAsync(() => stream.ReadAsync(buffer, 0, buffer.Length)) .Select(x => buffer.Take(x).ToArray()); }) .Repeat() diff --git a/ReactiveSockets/ReactiveSockets.csproj b/ReactiveSockets/ReactiveSockets.csproj index f5f1ca7..2f8cdcf 100644 --- a/ReactiveSockets/ReactiveSockets.csproj +++ b/ReactiveSockets/ReactiveSockets.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ReactiveSockets ReactiveSockets - v4.0 + v4.6.1 512 ..\ @@ -36,17 +36,17 @@ - - False - ..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll + + ..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll - - False - ..\packages\Rx-Interfaces.2.2.5\lib\net40\System.Reactive.Interfaces.dll + + ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - False - ..\packages\Rx-Linq.2.2.5\lib\net40\System.Reactive.Linq.dll + + ..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll + + + ..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll @@ -56,10 +56,6 @@ - - False - ..\packages\Rx-PlatformServices.2.2.5\lib\net40\System.Reactive.PlatformServices.dll - diff --git a/ReactiveSockets/app.config b/ReactiveSockets/app.config index 06e6567..fd3b410 100644 --- a/ReactiveSockets/app.config +++ b/ReactiveSockets/app.config @@ -1,19 +1,6 @@ - + - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/ReactiveSockets/packages.config b/ReactiveSockets/packages.config index abd71d3..031e153 100644 --- a/ReactiveSockets/packages.config +++ b/ReactiveSockets/packages.config @@ -2,10 +2,10 @@ - - - - + + + + \ No newline at end of file diff --git a/Sample/ReactiveClient/App.config b/Sample/ReactiveClient/App.config index e291ba7..55e5dcf 100644 --- a/Sample/ReactiveClient/App.config +++ b/Sample/ReactiveClient/App.config @@ -1,40 +1,16 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/Sample/ReactiveClient/Program.cs b/Sample/ReactiveClient/Program.cs index e1006ab..c5c088e 100644 --- a/Sample/ReactiveClient/Program.cs +++ b/Sample/ReactiveClient/Program.cs @@ -1,14 +1,14 @@ namespace ReactiveClient { + using ReactiveProtocol; + using ReactiveSockets; using System; using System.Reactive.Concurrency; using System.Reactive.Linq; - using ReactiveProtocol; - using ReactiveSockets; - class Program + internal class Program { - static void Main(string[] args) + private static void Main(string[] args) { try { diff --git a/Sample/ReactiveClient/ReactiveClient.csproj b/Sample/ReactiveClient/ReactiveClient.csproj index 34366f2..68bb792 100644 --- a/Sample/ReactiveClient/ReactiveClient.csproj +++ b/Sample/ReactiveClient/ReactiveClient.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties ReactiveClient ReactiveClient - v4.5 + v4.6.1 512 ..\..\ true + AnyCPU @@ -36,18 +37,18 @@ - - ..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll + + + ..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll - - ..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll + + ..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - ..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll + + ..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll - - - ..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll + + ..\..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll diff --git a/Sample/ReactiveClient/packages.config b/Sample/ReactiveClient/packages.config index f4b776c..6ee4cf0 100644 --- a/Sample/ReactiveClient/packages.config +++ b/Sample/ReactiveClient/packages.config @@ -1,8 +1,7 @@  - - - - - + + + + \ No newline at end of file diff --git a/Sample/ReactiveProtocol/ReactiveProtocol.csproj b/Sample/ReactiveProtocol/ReactiveProtocol.csproj index 3526214..885787e 100644 --- a/Sample/ReactiveProtocol/ReactiveProtocol.csproj +++ b/Sample/ReactiveProtocol/ReactiveProtocol.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,10 +9,11 @@ Properties ReactiveProtocol ReactiveProtocol - v4.5 + v4.6.1 512 ..\..\ true + true @@ -34,17 +35,14 @@ - - ..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll + + ..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll - - ..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll + + ..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll - - ..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll - - - ..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll + + ..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll @@ -57,15 +55,15 @@ - - - {3b854d2f-1bc1-4080-a47a-9b53ba2f995d} ReactiveSockets + + +