Update to Blazor 3.0.0-preview4 (#26)

* Update to Blazor 0.9

* Add SDK installer tasks to pipelines for .Net Core SDK 3.0.100-preview3-010431.

* Changes for 3.0.0-preview4

* Remove .bak file

* Remove unnecessary package references

* Remove global.json

* Update to match blazorlib template - updated SDK, package refs, etc

* Revert "Remove global.json"

This reverts commit 6c1da40.

* Rename runtime to _runtime and add this. where missing.

* Remove myget.org package sources.

* Move JSRuntime to constructor of HubConnectionBuilder

* Register/inject HubConnectionBuilder instead of constructing it explicitly so it can obtain its own IJSRuntime reference via DI.

* Revert "Remove .bak file"

This reverts commit 54b49df.

* Rename .editorconfig.bak to .editorconfig

Author: DanielCarmingham

.vsts-ci.yml

@@ -5,6 +5,11 @@ variables:
 
 steps:
 
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: DotNetCoreCLI@2
     inputs:
       command: 'restore'

.vsts-release.yml

@@ -5,6 +5,11 @@ variables:
 
 steps:
 
+  - task: DotNetCoreInstaller@0
+    inputs:
+      packageType: 'sdk'
+      version: '3.0.100-preview4-011223'
+
   - task: DotNetCoreCLI@2
     inputs:
       command: 'restore'

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-      "version": "2.1.302"
+      "version": "3.0.100-preview4-011223"
   }
 }

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -14,7 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.7.0" />
     <WebpackInputs Include="**\*.ts" Exclude="dist\**;node_modules\**" />
   </ItemGroup>
 

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

@@ -1,17 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <Title>Blazor Extensions SignalR</Title>
     <Description>SignalR Core support for ASP.NET Core Blazor.</Description>
   </PropertyGroup>
 
   <PropertyGroup>
-    <OutputType>Library</OutputType>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <LangVersion>7.3</LangVersion>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeP2POutput</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.7.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview4-19216-03" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -23,19 +23,21 @@ public class HubConnection : IDisposable
         private Dictionary<string, Dictionary<string, HubMethodCallback>> _callbacks = new Dictionary<string, Dictionary<string, HubMethodCallback>>();
 
         private HubCloseCallback _closeCallback;
+        private IJSRuntime _runtime;
 
-        public HubConnection(HttpConnectionOptions options)
+        public HubConnection(IJSRuntime runtime, HttpConnectionOptions options)
         {
+            this._runtime = runtime;
             this.Options = options;
             this.InternalConnectionId = Guid.NewGuid().ToString();
-            JSRuntime.Current.InvokeSync<object>(CREATE_CONNECTION_METHOD,
+            runtime.InvokeSync<object>(CREATE_CONNECTION_METHOD,
                 this.InternalConnectionId,
                 new DotNetObjectRef(this.Options));
         }
 
 
-        public Task StartAsync() => JSRuntime.Current.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
-        public Task StopAsync() => JSRuntime.Current.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
+        public Task StartAsync() => this._runtime.InvokeAsync<object>(START_CONNECTION_METHOD, this.InternalConnectionId);
+        public Task StopAsync() => this._runtime.InvokeAsync<object>(STOP_CONNECTION_METHOD, this.InternalConnectionId);
 
         public IDisposable On<TResult1>(string methodName, Func<TResult1, Task> handler)
             => On<TResult1, object, object, object, object, object, object, object, object, object>(methodName,
@@ -163,7 +165,7 @@ internal void RegisterHandle(string methodName, HubMethodCallback callback)
                 };
             }
 
-            JSRuntime.Current.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, new DotNetObjectRef(callback));
+            this._runtime.InvokeSync<object>(ON_METHOD, this.InternalConnectionId, new DotNetObjectRef(callback));
         }
 
         internal void RemoveHandle(string methodName, string callbackId)
@@ -172,7 +174,7 @@ internal void RemoveHandle(string methodName, string callbackId)
             {
                 if (callbacks.TryGetValue(callbackId, out var callback))
                 {
-                    JSRuntime.Current.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
+                    this._runtime.InvokeSync<object>(OFF_METHOD, this.InternalConnectionId, methodName, callbackId);
                     //HubConnectionManager.Off(this.InternalConnectionId, handle.Item1);
                     callbacks.Remove(callbackId);
 
@@ -187,17 +189,17 @@ internal void RemoveHandle(string methodName, string callbackId)
         public void OnClose(Func<Exception, Task> callback)
         {
             this._closeCallback = new HubCloseCallback(callback);
-            JSRuntime.Current.InvokeSync<object>(ON_CLOSE_METHOD,
+            this._runtime.InvokeSync<object>(ON_CLOSE_METHOD,
                 this.InternalConnectionId,
                 new DotNetObjectRef(this._closeCallback));
         }
 
         public Task InvokeAsync(string methodName, params object[] args) =>
-            JSRuntime.Current.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
+            this._runtime.InvokeAsync<object>(INVOKE_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
 
         public Task<TResult> InvokeAsync<TResult>(string methodName, params object[] args) =>
-            JSRuntime.Current.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
+            this._runtime.InvokeAsync<TResult>(INVOKE_WITH_RESULT_ASYNC_METHOD, this.InternalConnectionId, methodName, args);
 
-        public void Dispose() => JSRuntime.Current.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
+        public void Dispose() => this._runtime.InvokeSync<object>(REMOVE_CONNECTION_METHOD, this.InternalConnectionId);
     }
 }

src/Blazor.Extensions.SignalR/HubConnection.cs

@@ -1,13 +1,21 @@
 using System;
+using Microsoft.JSInterop;
 
 namespace Blazor.Extensions
 {
     public class HubConnectionBuilder
     {
         private bool _hubConnectionBuilt;
 
+        private IJSRuntime _runtime;
+
         internal HttpConnectionOptions Options { get; set; } = new HttpConnectionOptions();
 
+        public HubConnectionBuilder(IJSRuntime runtime)
+        {
+            this._runtime = runtime;
+        }
+
         /// <summary>
         /// Build a SignalR <see cref="HubConnection"/>
         /// This method can only be called once.
@@ -23,7 +31,7 @@ public HubConnection Build()
 
             this._hubConnectionBuilt = true;
 
-            return new HubConnection(this.Options);
+            return new HubConnection(this._runtime, this.Options);
         }
     }
 

src/Blazor.Extensions.SignalR/HubConnectionBuilder.cs

@@ -0,0 +1 @@
+<Router AppAssembly="typeof(Program).Assembly" />