From d5185b323dd5dbf2cf8fd3aa6eac41988da8731d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Thu, 2 Nov 2023 22:23:49 +0100 Subject: [PATCH] Fixes for .NET 8 RC2 --- paket.dependencies | 20 +- paket.lock | 307 ++++++++++++++++--------- src/Bolero.Server/paket.references | 2 + src/Bolero.Server/paket.template | 7 + src/Bolero/Bolero.fsproj | 3 +- src/Bolero/Router.fs | 9 +- src/Bolero/paket.references | 9 +- src/Bolero/paket.template | 7 +- tests/Remoting.Server/paket.references | 4 +- tests/Server/paket.references | 2 + tests/Unit/paket.references | 2 + 11 files changed, 247 insertions(+), 125 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index fcabfcdb..2ba90440 100644 --- 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 index 9bfd93b1..d9c51363 100644 --- a/paket.lock +++ b/paket.lock @@ -406,35 +406,103 @@ STORAGE: NONE RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - Microsoft.AspNetCore.Authorization (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Metadata (>= 8.0.0-preview.7.23375.9) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Options (>= 8.0.0-preview.7.23375.6) - Microsoft.AspNetCore.Components (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Authorization (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Analyzers (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Analyzers (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Forms (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Web (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Forms (>= 8.0.0-preview.7.23375.9) - Microsoft.Extensions.DependencyInjection (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.JSInterop (>= 8.0.0-preview.7.23375.9) - System.IO.Pipelines (>= 8.0.0-preview.7.23375.6) - Microsoft.AspNetCore.Metadata (8.0.0-preview.7.23375.9) - Microsoft.Extensions.DependencyInjection (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Logging.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Options (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (8.0.0-preview.7.23375.6) - Microsoft.JSInterop (8.0.0-preview.7.23375.9) - System.IO.Pipelines (8.0.0-preview.7.23375.6) + Elmish (4.0.1) + FSharp.Core (7.0.401) + FSharp.SystemTextJson (1.2.42) + FSharp.Core (>= 4.7) + System.Text.Json (>= 6.0) + Microsoft.AspNetCore.Authorization (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Metadata (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.AspNetCore.Components (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Authorization (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Analyzers (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Analyzers (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Forms (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Web (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Forms (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.DependencyInjection (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.JSInterop (>= 8.0.0-rc.2.23480.2) + System.IO.Pipelines (>= 8.0.0-rc.2.23479.6) + Microsoft.AspNetCore.Components.WebAssembly (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Web (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.Configuration.Binder (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Json (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging (>= 8.0.0-rc.2.23479.6) + Microsoft.JSInterop.WebAssembly (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Metadata (8.0.0-rc.2.23480.2) + Microsoft.Extensions.Configuration (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Binder (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.FileExtensions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Physical (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Json (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.FileExtensions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + System.Text.Json (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Diagnostics (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Diagnostics.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options.ConfigurationExtensions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Diagnostics.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + System.Diagnostics.DiagnosticSource (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Physical (8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileSystemGlobbing (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileSystemGlobbing (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Http (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Diagnostics (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options.ConfigurationExtensions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Binder (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (8.0.0-rc.2.23479.6) + Microsoft.JSInterop (8.0.0-rc.2.23480.2) + Microsoft.JSInterop.WebAssembly (8.0.0-rc.2.23480.2) + Microsoft.JSInterop (>= 8.0.0-rc.2.23480.2) + System.Diagnostics.DiagnosticSource (8.0.0-rc.2.23479.6) + System.IO.Pipelines (8.0.0-rc.2.23479.6) + System.Text.Encodings.Web (8.0.0-rc.2.23479.6) + System.Text.Json (8.0.0-rc.2.23479.6) + System.Text.Encodings.Web (>= 8.0.0-rc.2.23479.6) GROUP tests STORAGE: NONE @@ -447,7 +515,7 @@ NUGET FsCheck.NUnit (2.16.6) FsCheck (2.16.6) nunit (>= 3.13.1 < 4.0) - FSharp.Core (7.0.400) + FSharp.Core (7.0.401) FSharp.SystemTextJson (1.2.34) FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) @@ -472,7 +540,7 @@ NUGET Microsoft.TestPlatform.TestHost (>= 15.8) Microsoft.NETCore.Platforms (7.0.4) Microsoft.NETCore.Targets (5.0) - Microsoft.OpenApi (1.6.6) + Microsoft.OpenApi (1.6.10) Microsoft.TestPlatform.ObjectModel (17.7.1) NuGet.Frameworks (>= 6.5) System.Reflection.Metadata (>= 1.6) @@ -509,7 +577,7 @@ NUGET Selenium.WebDriver (>= 4.11) Selenium.WebDriver (4.11) Newtonsoft.Json (>= 13.0.1) - Selenium.WebDriver.ChromeDriver (116.0.5845.9600) + Selenium.WebDriver.ChromeDriver (118.0.5993.7000) Swashbuckle.AspNetCore (6.5) Microsoft.Extensions.ApiDescription.Server (>= 6.0.5) Swashbuckle.AspNetCore.Swagger (>= 6.5) @@ -839,7 +907,7 @@ NUGET Microsoft.JSInterop (7.0.10) Microsoft.JSInterop.WebAssembly (7.0.10) Microsoft.JSInterop (>= 7.0.10) - Microsoft.OpenApi (1.6.6) + Microsoft.OpenApi (1.6.10) System.IO.Pipelines (7.0) System.Text.Encodings.Web (7.0) System.Text.Json (7.0.3) @@ -850,84 +918,97 @@ STORAGE: NONE RESTRICTION: == net8.0 NUGET remote: https://api.nuget.org/v3/index.json - Microsoft.AspNetCore.Authorization (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Metadata (>= 8.0.0-preview.7.23375.9) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Options (>= 8.0.0-preview.7.23375.6) - Microsoft.AspNetCore.Components (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Authorization (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Analyzers (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Analyzers (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Authorization (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Authorization (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Forms (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Web (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Forms (>= 8.0.0-preview.7.23375.9) - Microsoft.Extensions.DependencyInjection (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.JSInterop (>= 8.0.0-preview.7.23375.9) - System.IO.Pipelines (>= 8.0.0-preview.7.23375.6) - Microsoft.AspNetCore.Components.WebAssembly (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Web (>= 8.0.0-preview.7.23375.9) - Microsoft.Extensions.Configuration.Binder (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Json (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Logging (>= 8.0.0-preview.7.23375.6) - Microsoft.JSInterop.WebAssembly (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.WebAssembly.Authentication (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Authorization (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.Web (>= 8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.WebAssembly.DevServer (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Components.WebAssembly.Server (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.Metadata (8.0.0-preview.7.23375.9) - Microsoft.AspNetCore.OpenApi (8.0.0-preview.7.23375.9) + FSharp.Core (7.0.401) + FSharp.SystemTextJson (1.2.42) + FSharp.Core (>= 4.7) + System.Text.Json (>= 6.0) + FSharp.SystemTextJson.Swagger (0.0.2) + FSharp.Core (>= 6.0.7) + FSharp.SystemTextJson (>= 1.0.6) + Swashbuckle.AspNetCore.Swagger (>= 6.4) + Swashbuckle.AspNetCore.SwaggerGen (>= 6.4) + Microsoft.AspNetCore.Authorization (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Metadata (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.AspNetCore.Components (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Authorization (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Analyzers (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Analyzers (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Authorization (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Authorization (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Forms (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Web (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Forms (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.DependencyInjection (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.JSInterop (>= 8.0.0-rc.2.23480.2) + System.IO.Pipelines (>= 8.0.0-rc.2.23479.6) + Microsoft.AspNetCore.Components.WebAssembly (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Web (>= 8.0.0-rc.2.23480.2) + Microsoft.Extensions.Configuration.Binder (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Json (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging (>= 8.0.0-rc.2.23479.6) + Microsoft.JSInterop.WebAssembly (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.WebAssembly.Authentication (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Authorization (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.Web (>= 8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.WebAssembly.DevServer (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Components.WebAssembly.Server (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.Metadata (8.0.0-rc.2.23480.2) + Microsoft.AspNetCore.OpenApi (8.0.0-rc.2.23480.2) Microsoft.OpenApi (>= 1.4.3) - Microsoft.Extensions.Configuration (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Binder (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.FileExtensions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Physical (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Json (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Configuration.FileExtensions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-preview.7.23375.6) - System.Text.Json (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Physical (8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileSystemGlobbing (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.FileSystemGlobbing (8.0.0-preview.7.23375.6) - Microsoft.Extensions.Logging (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Options (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Logging.Abstractions (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Options (8.0.0-preview.7.23375.6) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (>= 8.0.0-preview.7.23375.6) - Microsoft.Extensions.Primitives (8.0.0-preview.7.23375.6) - Microsoft.JSInterop (8.0.0-preview.7.23375.9) - Microsoft.JSInterop.WebAssembly (8.0.0-preview.7.23375.9) - Microsoft.JSInterop (>= 8.0.0-preview.7.23375.9) - Microsoft.OpenApi (1.6.6) - System.IO.Pipelines (8.0.0-preview.7.23375.6) - System.Text.Encodings.Web (8.0.0-preview.7.23375.6) - System.Text.Json (8.0.0-preview.7.23375.6) - System.Text.Encodings.Web (>= 8.0.0-preview.7.23375.6) + Microsoft.Extensions.Configuration (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Binder (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.FileExtensions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Physical (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Json (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Configuration.FileExtensions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + System.Text.Json (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Physical (8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileProviders.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileSystemGlobbing (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.FileSystemGlobbing (8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Logging.Abstractions (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Options (8.0.0-rc.2.23479.6) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (>= 8.0.0-rc.2.23479.6) + Microsoft.Extensions.Primitives (8.0.0-rc.2.23479.6) + Microsoft.JSInterop (8.0.0-rc.2.23480.2) + Microsoft.JSInterop.WebAssembly (8.0.0-rc.2.23480.2) + Microsoft.JSInterop (>= 8.0.0-rc.2.23480.2) + Microsoft.OpenApi (1.6.10) + Swashbuckle.AspNetCore.Swagger (6.5) + Microsoft.OpenApi (>= 1.2.3) + Swashbuckle.AspNetCore.SwaggerGen (6.5) + Swashbuckle.AspNetCore.Swagger (>= 6.5) + System.IO.Pipelines (8.0.0-rc.2.23479.6) + System.Text.Encodings.Web (8.0.0-rc.2.23479.6) + System.Text.Json (8.0.0-rc.2.23479.6) + System.Text.Encodings.Web (>= 8.0.0-rc.2.23479.6) diff --git a/src/Bolero.Server/paket.references b/src/Bolero.Server/paket.references index cbfe87c9..74dae6f3 100644 --- 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 index 3c87232b..9e61209b 100644 --- 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 index 1f988d56..c991ca0a 100644 --- a/src/Bolero/Bolero.fsproj +++ b/src/Bolero/Bolero.fsproj @@ -1,8 +1,9 @@ - net6.0 + net6.0;net8.0 true + false Library true diff --git a/src/Bolero/Router.fs b/src/Bolero/Router.fs index 11b052e2..146a5c00 100644 --- 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>.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 [] module private RouterImpl = diff --git a/src/Bolero/paket.references b/src/Bolero/paket.references index 557a4887..a36acd86 100644 --- 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 \ No newline at end of file +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 index 25dd83dc..f3a40447 100644 --- 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 index 04887615..fb5ff486 100644 --- 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 index d661febd..2f6225cb 100644 --- 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 index 77ac909e..19885cb5 100644 --- 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