Fix #59: Update to .NET Core and Blazor 3.0 preview6

appveyor.yml

@@ -13,7 +13,7 @@ branches:
 skip_tags: true
 
 init:
-- cmd: choco install dotnetcore-sdk --version 3.0.100-preview5-011568
+- cmd: choco install dotnetcore-sdk --version 3.0.100-preview6-012264
 - git config --global core.autocrlf input
 
 before_build:

paket.dependencies

@@ -8,11 +8,11 @@ nuget FSharp.Core >= 4.5.0 lowest_matching: true
 nuget HtmlAgilityPack >= 1.8.0 lowest_matching: true
 nuget Elmish ~> 2.0 lowest_matching: true
 nuget TaskBuilder.fs >= 2.1.0 lowest_matching: true
-nuget Microsoft.AspNetCore.Blazor 3.0.0-preview5-19227-01
-nuget Microsoft.AspNetCore.Blazor.Build 3.0.0-preview5-19227-01
-nuget Microsoft.AspNetCore.Blazor.Server 3.0.0-preview5-19227-01
-nuget Microsoft.AspNetCore.Blazor.DevServer 3.0.0-preview5-19227-01
-nuget System.Runtime.CompilerServices.Unsafe 4.6.0-preview5.19224.8
+nuget Microsoft.AspNetCore.Blazor 3.0.0-preview6.19307.2
+nuget Microsoft.AspNetCore.Blazor.Build 3.0.0-preview6.19307.2
+nuget Microsoft.AspNetCore.Blazor.Server 3.0.0-preview6.19307.2
+nuget Microsoft.AspNetCore.Blazor.DevServer 3.0.0-preview6.19307.2
+nuget System.Runtime.CompilerServices.Unsafe 4.6.0-preview6.19303.8
 
 # Build and test references
 nuget FsCheck.NUnit ~> 2.12
@@ -40,4 +40,4 @@ nuget Fake.IO.FileSystem
 nuget Fake.DotNet.AssemblyInfoFile
 nuget Fake.DotNet.Cli
 nuget Fake.DotNet.Paket
-nuget FSharp.Data ~> 3.0-beta
+nuget FSharp.Data ~> 3.0-beta

src/Bolero/Components.fs

@@ -22,7 +22,9 @@ namespace Bolero
 
 open System
 open System.Collections.Generic
+open System.Threading.Tasks
 open Microsoft.AspNetCore.Components
+open Microsoft.AspNetCore.Components.Routing
 open Microsoft.JSInterop
 open Elmish
 open Bolero.Render
@@ -83,13 +85,19 @@ type ProgramComponent<'model, 'msg>() =
     inherit Component()
 
     let mutable oldModel = Unchecked.defaultof<'model>
+    let mutable navigationInterceptionEnabled = false
 
     [<Inject>]
     member val UriHelper = Unchecked.defaultof<IUriHelper> with get, set
     [<Inject>]
     member val Services = Unchecked.defaultof<System.IServiceProvider> with get, set
     [<Inject>]
     member val JSRuntime = Unchecked.defaultof<IJSRuntime> with get, set
+    [<Inject>]
+    member val NavigationInterception = Unchecked.defaultof<INavigationInterception> with get, set
+    [<Inject>]
+    member val ComponentContext = Unchecked.defaultof<IComponentContext> with get, set
+
     member val private View = Empty with get, set
     member val private Dispatch = ignore with get, set
     member val private BaseUri = "/" with get, set
@@ -101,9 +109,9 @@ type ProgramComponent<'model, 'msg>() =
     interface IProgramComponent with
         member this.Services = this.Services
 
-    member private this.OnLocationChanged (_: obj) (uri: string) =
+    member private this.OnLocationChanged (_: obj) (e: LocationChangedEventArgs) =
         this.Router |> Option.iter (fun router ->
-            let uri = this.UriHelper.ToBaseRelativePath(this.BaseUri, uri)
+            let uri = this.UriHelper.ToBaseRelativePath(this.BaseUri, e.Location)
             let route = router.SetRoute uri
             Option.iter this.Dispatch route)
 
@@ -154,20 +162,27 @@ type ProgramComponent<'model, 'msg>() =
         ) =
         this.Router <- Some r
         this.BaseUri <- this.UriHelper.GetBaseUri()
-        System.EventHandler<string> this.OnLocationChanged
+        System.EventHandler<_> this.OnLocationChanged
         |> this.UriHelper.OnLocationChanged.AddHandler
         match r.SetRoute (this.GetCurrentUri()) with
         | Some msg ->
             program.update msg initModel
         | None ->
             initModel, []
 
+    override this.OnAfterRenderAsync() =
+        if this.Router.IsSome && not navigationInterceptionEnabled && this.ComponentContext.IsConnected then
+            navigationInterceptionEnabled <- true
+            this.NavigationInterception.EnableNavigationInterceptionAsync()
+        else
+            Task.CompletedTask
+
     override this.Render() =
         this.View
 
     interface System.IDisposable with
         member this.Dispose() =
-            System.EventHandler<string> this.OnLocationChanged
+            System.EventHandler<_> this.OnLocationChanged
             |> this.UriHelper.OnLocationChanged.RemoveHandler
 
 type ElementRefBinder() =

tests/Remoting.Server/Program.fs

@@ -71,6 +71,7 @@ type MyApiHandler(log: ILogger<MyApiHandler>) =
 type Startup() =
 
     member this.ConfigureServices(services: IServiceCollection) =
+        services.AddMvcCore() |> ignore
         services
             .AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
                 .AddCookie()
@@ -82,7 +83,11 @@ type Startup() =
     member this.Configure(app: IApplicationBuilder, env: IHostEnvironment) =
         app.UseAuthentication()
             .UseRemoting()
-            .UseBlazor<Client.Startup>()
+            .UseClientSideBlazorFiles<Client.Startup>()
+            .UseRouting()
+            .UseEndpoints(fun endpoints ->
+                endpoints.MapDefaultControllerRoute() |> ignore
+                endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html") |> ignore)
         |> ignore
 
 module Main =

tests/Server/Startup.fs

@@ -30,13 +30,13 @@ open Bolero.Test
 type Startup() =
 
     member this.ConfigureServices(services: IServiceCollection) =
+        services.AddMvcCore() |> ignore
         services
             .AddSingleton<HtmlEncoder>(HtmlEncoder.Default)
             .AddServerSideBlazor()
         |> ignore
 
     member this.Configure(app: IApplicationBuilder) =
-
         app
             .UseStaticFiles()
             .UseRouting()

tests/Unit/Startup.fs

@@ -63,6 +63,7 @@ type Startup() =
         }
 
     member this.ConfigureServices(services: IServiceCollection) =
+        services.AddMvcCore() |> ignore
         services
             .AddAuthorization()
             .AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
@@ -85,5 +86,9 @@ type Startup() =
                     endpoints.MapFallbackToFile("index.html") |> ignore
                 )
         else
-            app .UseBlazor<Client.Startup>()
+            app .UseClientSideBlazorFiles<Client.Startup>()
+                .UseRouting()
+                .UseEndpoints(fun endpoints ->
+                    endpoints.MapDefaultControllerRoute() |> ignore
+                    endpoints.MapFallbackToClientSideBlazor<Client.Startup>("index.html") |> ignore)
         |> ignore

version.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.5-preview1",
+    "version": "0.6-preview1",
     "nugetPackageVersion": {
         "semVer": 2
     },