Fixes for .NET 8 RC2

fsbolero · Nov 2, 2023 · d5185b3 · d5185b3
1 parent 08834f8
commit d5185b3
Show file tree

Hide file tree

Showing 11 changed files with 247 additions and 125 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -26,7 +26,13 @@ source https://api.nuget.org/v3/index.json
 storage: none
 framework: net8.0
 
-nuget Microsoft.AspNetCore.Components.Web >= 8.0 preview
+nuget Elmish >= 4.0.1 < 5.0 lowest_matching: true
+nuget Microsoft.AspNetCore.Components.WebAssembly >= 8.0.0-rc.2.23480.2
+nuget Microsoft.JSInterop.WebAssembly >= 8.0.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.Web >= 8.0.0-rc.2.23480.2
+nuget Microsoft.Extensions.Http >= 8.0.0-rc.2.23479.6
+nuget FSharp.SystemTextJson >= 0.19.13
+nuget System.Text.Json >= 8.0.0-rc.2.23479.6
 
 group build
 source https://api.nuget.org/v3/index.json
@@ -84,9 +90,9 @@ source https://api.nuget.org/v3/index.json
 storage: none
 framework: net8.0
 
-nuget Microsoft.AspNetCore.OpenApi ~> 8.0 preview
-nuget Microsoft.AspNetCore.Components.Authorization ~> 8.0 preview
-nuget Microsoft.AspNetCore.Components.WebAssembly ~> 8.0 preview
-nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication ~> 8.0 preview
-nuget Microsoft.AspNetCore.Components.WebAssembly.DevServer ~> 8.0 preview
-nuget Microsoft.AspNetCore.Components.WebAssembly.Server ~> 8.0 preview
+nuget Microsoft.AspNetCore.OpenApi ~> 8.0.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.Authorization ~> 8.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.WebAssembly ~> 8.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.WebAssembly.Authentication ~> 8.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.WebAssembly.DevServer ~> 8.0-rc.2.23480.2
+nuget Microsoft.AspNetCore.Components.WebAssembly.Server ~> 8.0-rc.2.23480.2
diff --git a/paket.lock b/paket.lock
diff --git a/src/Bolero.Server/paket.references b/src/Bolero.Server/paket.references
@@ -3,4 +3,6 @@ Nerdbank.GitVersioning
 FSharp.SystemTextJson
 
 group net8
+Microsoft.JSInterop.WebAssembly
+Microsoft.AspNetCore.Components.WebAssembly
 Microsoft.AspNetCore.Components.Web
diff --git a/src/Bolero.Server/paket.template b/src/Bolero.Server/paket.template
@@ -12,3 +12,10 @@ interproject-references fix
 excludeddependencies
     nerdbank.gitversioning
 include-pdbs true
+dependencies
+    framework: net6.0
+    framework: net7.0
+    framework: net8.0
+        Microsoft.AspNetCore.Components.Web >= 8.0-rc.2.23480.2
+        Microsoft.AspNetCore.Components.WebAssembly >= 8.0-rc.2.23480.2
+        Microsoft.JSInterop.WebAssembly >= 8.0-rc.2.23480.2
diff --git a/src/Bolero/Bolero.fsproj b/src/Bolero/Bolero.fsproj
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <OutputType>Library</OutputType>
     <IsTrimmable>true</IsTrimmable>
     <!-- <DefineConstants>DEBUG_RENDERER;$(DefineConstants)</DefineConstants> -->

diff --git a/src/Bolero/Router.fs b/src/Bolero/Router.fs
@@ -190,8 +190,15 @@ exception InvalidRouter of kind: InvalidRouterKind with
 type PageModel<'T> =
     { Model: 'T }
 
+#if NET8_0
+    static let prop = typeof<PageModel<'T>>.GetProperty("Model")
+
+    member internal this.SetModel(value) =
+        prop.SetValue(this, value)
+#else
     member internal this.SetModel(value) =
-        (Unsafe.AsRef<'T> &this.Model) <- value
+        (Unsafe.AsRef<'T>(&this.Model)) <- value
+#endif
 
 [<AutoOpen>]
 module private RouterImpl =

diff --git a/src/Bolero/paket.references b/src/Bolero/paket.references
@@ -4,4 +4,11 @@ Microsoft.AspNetCore.Components.WebAssembly
 Elmish
 Nerdbank.GitVersioning
 Microsoft.Extensions.Http
-FSharp.SystemTextJson
+FSharp.SystemTextJson
+
+group net8
+Elmish
+Microsoft.AspNetCore.Components.WebAssembly
+Microsoft.JSInterop.WebAssembly
+Microsoft.Extensions.Http
+FSharp.SystemTextJson
diff --git a/src/Bolero/paket.template b/src/Bolero/paket.template
@@ -21,6 +21,11 @@ excludeddependencies
 include-pdbs true
 dependencies
     framework: net6.0
+        Microsoft.JSInterop.WebAssembly ~> 6.0
         Microsoft.AspNetCore.Components.WebAssembly ~> 6.0
     framework: net7.0
-        Microsoft.AspNetCore.Components.WebAssembly >= 7.0
+        Microsoft.JSInterop.WebAssembly ~> 7.0
+        Microsoft.AspNetCore.Components.WebAssembly ~> 7.0
+    framework: net8.0
+        Microsoft.JSInterop.WebAssembly >= 8.0-rc.2.23480.2
+        Microsoft.AspNetCore.Components.WebAssembly >= 8.0-rc.2.23480.2
diff --git a/tests/Remoting.Server/paket.references b/tests/Remoting.Server/paket.references
@@ -1,8 +1,10 @@
 group tests
 FSharp.Core
 Swashbuckle.AspNetCore
-FSharp.SystemTextJson.Swagger
 
 group tests-net8
 Microsoft.AspNetCore.OpenApi
+Microsoft.AspNetCore.Components
+Microsoft.AspNetCore.Components.WebAssembly
 Microsoft.AspNetCore.Components.WebAssembly.Server
+FSharp.SystemTextJson.Swagger
diff --git a/tests/Server/paket.references b/tests/Server/paket.references
@@ -2,4 +2,6 @@ group tests
 FSharp.Core
 
 group tests-net8
+Microsoft.AspNetCore.Components
+Microsoft.AspNetCore.Components.WebAssembly
 Microsoft.AspNetCore.Components.WebAssembly.Server
diff --git a/tests/Unit/paket.references b/tests/Unit/paket.references
@@ -9,4 +9,6 @@ Selenium.WebDriver.ChromeDriver
 Unquote
 
 group tests-net8
+Microsoft.AspNetCore.Components
+Microsoft.AspNetCore.Components.WebAssembly
 Microsoft.AspNetCore.Components.WebAssembly.Server