Update the Project To Use the new Libraries in .NET Core 3.0 Preview 7 (#43)

* Update the Project To Use the new Libraries in .NET Core 3.0 Preview 7

* Fix Warnini related with naming conventions

* Revert "Fix Warnini related with naming conventions"

This reverts commit a580678.

* Correct Warning related with naming conventions

* Update the yml file to intall the preview7

* Update o te correct version SDK 3.0.100-preview7-012821

* Point Global.Json to the corect version of Preview7 and Update HubConnectionManager to use the new library @microsoft/signalr

* Set up CI with Azure Pipelines2

[skip ci]

* Revert "Set up CI with Azure Pipelines2"

This reverts commit 54a2e3d.

Author: wiworowa

.vsts-ci.yml

@@ -8,7 +8,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: '3.0.100-preview6-012264'
+      version: '3.0.100-preview7-012821'
 
   - task: DotNetCoreCLI@2
     inputs:

.vsts-release.yml

@@ -8,7 +8,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: '3.0.100-preview6-012264'
+      version: '3.0.0-preview7.19365.7'
 
   - task: DotNetCoreCLI@2
     inputs:

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-      "version": "3.0.100-preview6-012264"
+      "version": "3.0.100-preview7-012821"
   }
 }

src/Blazor.Extensions.SignalR.JS/package-lock.json

@@ -8,14 +8,14 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@types/emscripten": "0.0.31",
-    "ts-loader": "^4.4.2",
-    "typescript": "^2.9.2",
-    "webpack": "^4.16.3",
-    "webpack-cli": "^3.1.0"
+    "@types/emscripten": "0.0.34",
+    "ts-loader": "6.0.4",
+    "typescript": "3.5.3",
+    "webpack": "4.37.0",
+    "webpack-cli": "3.3.6"
   },
   "dependencies": {
-    "@aspnet/signalr": "^1.0.4",
-    "@aspnet/signalr-protocol-msgpack": "^1.0.4"
+    "@microsoft/signalr": "3.0.0-preview7.19365.7",
+    "@microsoft/signalr-protocol-msgpack": "3.0.0-preview7.19365.7"
   }
 }

src/Blazor.Extensions.SignalR.JS/package.json

@@ -1,6 +1,6 @@
-import * as signalR from "@aspnet/signalr";
-import * as sianglRMessagePack from "@aspnet/signalr-protocol-msgpack";
-import { HttpTransportType, LogLevel } from "@aspnet/signalr";
+import * as signalR from "@microsoft/signalr";
+import * as sianglRMessagePack from "@microsoft/signalr-protocol-msgpack";
+import { HttpTransportType, LogLevel } from "@microsoft/signalr";
 
 type DotNetType = {
   invokeMethod<T>(assemblyName: string, methodIdentifier: string, ...args: any[]): T,

src/Blazor.Extensions.SignalR.JS/src/HubConnectionManager.ts

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview6.19307.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
   </ItemGroup>
 
   <ItemGroup>

src/Blazor.Extensions.SignalR/Blazor.Extensions.SignalR.csproj

@@ -1,6 +1,7 @@
 using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
@@ -104,43 +105,43 @@ public IDisposable On<TResult1, TResult2, TResult3, TResult4, TResult5, TResult6
 
                      if (payloads.Length > 0)
                      {
-                         t1 = JsonSerializer.Parse<TResult1>(payloads[0]);
+                         t1 = JsonSerializer.Deserialize<TResult1>(payloads[0]);
                      }
                      if (payloads.Length > 1)
                      {
-                         t2 = JsonSerializer.Parse<TResult2>(payloads[1]);
+                         t2 = JsonSerializer.Deserialize<TResult2>(payloads[1]);
                      }
                      if (payloads.Length > 2)
                      {
-                         t3 = JsonSerializer.Parse<TResult3>(payloads[2]);
+                         t3 = JsonSerializer.Deserialize<TResult3>(payloads[2]);
                      }
                      if (payloads.Length > 3)
                      {
-                         t4 = JsonSerializer.Parse<TResult4>(payloads[3]);
+                         t4 = JsonSerializer.Deserialize<TResult4>(payloads[3]);
                      }
                      if (payloads.Length > 4)
                      {
-                         t5 = JsonSerializer.Parse<TResult5>(payloads[4]);
+                         t5 = JsonSerializer.Deserialize<TResult5>(payloads[4]);
                      }
                      if (payloads.Length > 5)
                      {
-                         t6 = JsonSerializer.Parse<TResult6>(payloads[5]);
+                         t6 = JsonSerializer.Deserialize<TResult6>(payloads[5]);
                      }
                      if (payloads.Length > 6)
                      {
-                         t7 = JsonSerializer.Parse<TResult7>(payloads[6]);
+                         t7 = JsonSerializer.Deserialize<TResult7>(payloads[6]);
                      }
                      if (payloads.Length > 7)
                      {
-                         t8 = JsonSerializer.Parse<TResult8>(payloads[7]);
+                         t8 = JsonSerializer.Deserialize<TResult8>(payloads[7]);
                      }
                      if (payloads.Length > 8)
                      {
-                         t9 = JsonSerializer.Parse<TResult9>(payloads[8]);
+                         t9 = JsonSerializer.Deserialize<TResult9>(payloads[8]);
                      }
                      if (payloads.Length > 9)
                      {
-                         t10 = JsonSerializer.Parse<TResult10>(payloads[9]);
+                         t10 = JsonSerializer.Deserialize<TResult10>(payloads[9]);
                      }
 
                      return handler(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10);

src/Blazor.Extensions.SignalR/HubConnection.cs

@@ -10,8 +10,8 @@
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

test/Blazor.Extensions.SignalR.Test.Client/Blazor.Extensions.SignalR.Test.Client.csproj

@@ -23,14 +23,14 @@ public class ChatComponent : ComponentBase
 
         private IDisposable objectHandle;
         private IDisposable listHandle;
-        private IDisposable _multiArgsHandle;
-        private IDisposable _multiArgsComplexHandle;
-        private IDisposable _byteArrayHandle;
-        private HubConnection _connection;
+        private IDisposable multiArgsHandle;
+        private IDisposable multiArgsComplexHandle;
+        private IDisposable byteArrayHandle;
+        private HubConnection connection;
 
         protected override async Task OnInitAsync()
         {
-            this._connection = this._hubConnectionBuilder
+            this.connection = this._hubConnectionBuilder
                 .WithUrl("/chathub",
                 opt =>
                 {
@@ -47,13 +47,13 @@ protected override async Task OnInitAsync()
                 //.AddMessagePackProtocol()
                 .Build();
 
-            this._connection.On<string>("Send", this.Handle);
-            this._connection.OnClose(exc =>
+            this.connection.On<string>("Send", this.Handle);
+            this.connection.OnClose(exc =>
             {
                 Console.WriteLine("Connection was closed! " + exc.ToString());
                 return Task.CompletedTask;
             });
-            await this._connection.StartAsync();
+            await this.connection.StartAsync();
         }
 
         public Task DemoMethodObject(object data)
@@ -77,23 +77,23 @@ public Task DemoMethodList(object data)
         public Task DemoMultipleArgs(string arg1, int arg2, string arg3, int arg4)
         {
             Console.WriteLine("Got Multiple Args!");
-            this._multiArgsHandle.Dispose();
+            this.multiArgsHandle.Dispose();
 
             return this.HandleArgs(arg1, arg2, arg3, arg4);
         }
 
         public Task DemoMultipleArgsComplex(object arg1, object arg2)
         {
             Console.WriteLine("Got Multiple Args Complex!");
-            this._multiArgsComplexHandle.Dispose();
+            this.multiArgsComplexHandle.Dispose();
 
             return this.HandleArgs(arg1, arg2);
         }
 
         public Task DemoByteArrayArg(byte[] array)
         {
             Console.WriteLine("Got byte array!");
-            this._byteArrayHandle.Dispose();
+            this.byteArrayHandle.Dispose();
 
             return this.HandleArgs(BitConverter.ToString(array));
         }
@@ -125,65 +125,65 @@ private Task HandleArgs(params object[] args)
 
         internal async Task Broadcast()
         {
-            await this._connection.InvokeAsync("Send", this.ToEverybody);
+            await this.connection.InvokeAsync("Send", this.ToEverybody);
         }
 
         internal async Task SendToOthers()
         {
-            await this._connection.InvokeAsync("SendToOthers", this.ToEverybody);
+            await this.connection.InvokeAsync("SendToOthers", this.ToEverybody);
         }
 
         internal async Task SendToConnection()
         {
-            await this._connection.InvokeAsync("SendToConnection", this.ConnectionId, this.ToConnection);
+            await this.connection.InvokeAsync("SendToConnection", this.ConnectionId, this.ToConnection);
         }
 
         internal async Task SendToMe()
         {
-            await this._connection.InvokeAsync("Echo", this.ToMe);
+            await this.connection.InvokeAsync("Echo", this.ToMe);
         }
 
         internal async Task SendToGroup()
         {
-            await this._connection.InvokeAsync("SendToGroup", this.GroupName, this.ToGroup);
+            await this.connection.InvokeAsync("SendToGroup", this.GroupName, this.ToGroup);
         }
 
         internal async Task SendToOthersInGroup()
         {
-            await this._connection.InvokeAsync("SendToOthersInGroup", this.GroupName, this.ToGroup);
+            await this.connection.InvokeAsync("SendToOthersInGroup", this.GroupName, this.ToGroup);
         }
 
         internal async Task JoinGroup()
         {
-            await this._connection.InvokeAsync("JoinGroup", this.GroupName);
+            await this.connection.InvokeAsync("JoinGroup", this.GroupName);
         }
 
         internal async Task LeaveGroup()
         {
-            await this._connection.InvokeAsync("LeaveGroup", this.GroupName);
+            await this.connection.InvokeAsync("LeaveGroup", this.GroupName);
         }
 
         internal async Task DoMultipleArgs()
         {
-            this._multiArgsHandle = this._connection.On<string, int, string, int>("DemoMultiArgs", this.DemoMultipleArgs);
-            this._multiArgsComplexHandle = this._connection.On<DemoData, DemoData[]>("DemoMultiArgs2", this.DemoMultipleArgsComplex);
-            await this._connection.InvokeAsync("DoMultipleArgs");
-            await this._connection.InvokeAsync("DoMultipleArgsComplex");
+            this.multiArgsHandle = this.connection.On<string, int, string, int>("DemoMultiArgs", this.DemoMultipleArgs);
+            this.multiArgsComplexHandle = this.connection.On<DemoData, DemoData[]>("DemoMultiArgs2", this.DemoMultipleArgsComplex);
+            await this.connection.InvokeAsync("DoMultipleArgs");
+            await this.connection.InvokeAsync("DoMultipleArgsComplex");
         }
 
         internal async Task DoByteArrayArg()
         {
-            this._byteArrayHandle = this._connection.On<byte[]>("DemoByteArrayArg", this.DemoByteArrayArg);
-            var array = await this._connection.InvokeAsync<byte[]>("DoByteArrayArg");
+            this.byteArrayHandle = this.connection.On<byte[]>("DemoByteArrayArg", this.DemoByteArrayArg);
+            var array = await this.connection.InvokeAsync<byte[]>("DoByteArrayArg");
 
             Console.WriteLine("Got byte returned from hub method array: {0}", BitConverter.ToString(array));
         }
 
         internal async Task TellHubToDoStuff()
         {
-            this.objectHandle = this._connection.On<DemoData>("DemoMethodObject", this.DemoMethodObject);
-            this.listHandle = this._connection.On<DemoData[]>("DemoMethodList", this.DemoMethodList);
-            await this._connection.InvokeAsync("DoSomething");
+            this.objectHandle = this.connection.On<DemoData>("DemoMethodObject", this.DemoMethodObject);
+            this.listHandle = this.connection.On<DemoData[]>("DemoMethodList", this.DemoMethodList);
+            await this.connection.InvokeAsync("DoSomething");
         }
     }
 }