.NET 8 Updates (#151)

* WIP .NET 8 pass * Deal with general upgrade cruft/obsolete code * More dependency updates * Adjust docs * Update IdentityServer * Fix tests
JasperFx · Jan 21, 2024 · aa3554f · aa3554f
1 parent 60488ce
commit aa3554f
Show file tree

Hide file tree

Showing 182 changed files with 2,620 additions and 47,862 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -14,15 +14,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install .NET Core 7.0.x
+      - name: Install .NET Core 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Setup Pages
         uses: actions/configure-pages@v3

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Setup .NET
+    - name: Setup .NET 6
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 6.0.x
@@ -28,6 +28,11 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x      
+
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x  
 
     - name: Test
       run: ./build.ps1 test
diff --git a/docs/guide/nunit.md b/docs/guide/nunit.md
@@ -27,7 +27,7 @@ public class Application
     }
 }
 ```
-<sup><a href='https://github.com/JasperFx/alba/blob/master/src/NUnitSamples/UnitTest1.cs#L11-L33' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_nunit_application' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/alba/blob/master/src/NUnitSamples/UnitTest1.cs#L8-L30' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_nunit_application' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Then reference the `AlbaHost` in tests like this sample:
@@ -48,5 +48,5 @@ public class sample_integration_fixture
     }
 }
 ```
-<sup><a href='https://github.com/JasperFx/alba/blob/master/src/NUnitSamples/UnitTest1.cs#L35-L48' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_nunit_scenario_test' title='Start of snippet'>anchor</a></sup>
+<sup><a href='https://github.com/JasperFx/alba/blob/master/src/NUnitSamples/UnitTest1.cs#L32-L45' title='Snippet source file'>snippet source</a> | <a href='#snippet-sample_nunit_scenario_test' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
diff --git a/docs/scenarios/formdata.md b/docs/scenarios/formdata.md
@@ -36,7 +36,7 @@ There's a second overload that attempts to use an object and its properties to p
 [Fact]
 public async Task can_bind_to_form_data()
 {
-    await using var system = AlbaHost.ForStartup<Startup>();
+    await using var system = await AlbaHost.For<Startup>();
 
     var input = new InputModel {
         One = "one",

diff --git a/src/Alba.Testing/Acceptance/assertions_against_redirects.cs b/src/Alba.Testing/Acceptance/assertions_against_redirects.cs
@@ -10,7 +10,7 @@ public class assertions_against_redirects
         [Fact]
         public async Task redirect()
         {
-            await using var system = AlbaHost.ForStartup<Startup>();
+            await using var system = await AlbaHost.For<Startup>();
             await system.Scenario(_ =>
             {
                 _.Get.Url("/auth/redirect");
@@ -24,15 +24,13 @@ public async Task not_redirected()
         {
             var result = await Exception<ScenarioAssertionException>.ShouldBeThrownBy(async () =>
             {
-                using (var system = AlbaHost.ForStartup<Startup>())
+                await using var system = await AlbaHost.For<Startup>();
+                await system.Scenario(_ =>
                 {
-                    await system.Scenario(_ =>
-                    {
-                        _.Get.Url("/api/values");
+                    _.Get.Url("/api/values");
 
-                        _.RedirectShouldBe("/else");
-                    });
-                }
+                    _.RedirectShouldBe("/else");
+                });
             });
 
             result.Message.ShouldContain("Expected to be redirected to '/else' but was ''.");
@@ -43,7 +41,7 @@ public async Task redirect_wrong_value()
         {
             var result = await Exception<ScenarioAssertionException>.ShouldBeThrownBy(async () =>
             {
-                await using var system = AlbaHost.ForStartup<Startup>();
+                await using var system = await AlbaHost.For<Startup>();
                 await system.Scenario(_ =>
                 {
                     _.Get.Url("/auth/redirect");
@@ -58,23 +56,21 @@ await system.Scenario(_ =>
         [Fact]
         public async Task redirect_permanent()
         {
-            using (var system = AlbaHost.ForStartup<Startup>())
+            await using var system = await AlbaHost.For<Startup>();
+            await system.Scenario(_ =>
             {
-                await system.Scenario(_ =>
-                {
-                    _.Get.Url("/auth/redirectpermanent");
+                _.Get.Url("/auth/redirectpermanent");
 
-                    _.RedirectPermanentShouldBe("/api/values");
-                });
-            }
+                _.RedirectPermanentShouldBe("/api/values");
+            });
         }
 
         [Fact]
         public async Task redirect_permanent_wrong_value()
         {
             var result = await Exception<ScenarioAssertionException>.ShouldBeThrownBy(async () =>
             {
-                await using var system = AlbaHost.ForStartup<Startup>();
+                await using var system = await AlbaHost.For<Startup>();
                 await system.Scenario(_ =>
                 {
                     _.Get.Url("/auth/redirectpermanent");
@@ -91,7 +87,7 @@ public async Task redirect_permanent_non_permanent_result()
         {
             var result = await Exception<ScenarioAssertionException>.ShouldBeThrownBy(async () =>
             {
-                await using var system = AlbaHost.ForStartup<Startup>();
+                await using var system = await AlbaHost.For<Startup>();
                 await system.Scenario(_ =>
                 {
                     _.Get.Url("/auth/redirect");

diff --git a/src/Alba.Testing/Acceptance/customize_before_each_and_after_each.cs b/src/Alba.Testing/Acceptance/customize_before_each_and_after_each.cs
@@ -11,13 +11,12 @@ public class customize_before_each_and_after_each
         [Fact]
         public async Task before_each_and_after_each_is_called()
         {
-            await using var host = AlbaHost
-                .ForStartup<Startup>()
-                .BeforeEach(c =>
-                {
-                    BeforeContext = c;
-                })
-                .AfterEach(c => AfterContext = c);
+            await using var host = await AlbaHost.For<Startup>();
+            host.BeforeEach(c =>
+            {
+                BeforeContext = c;
+            })
+            .AfterEach(c => AfterContext = c);
 
             BeforeContext = AfterContext = null;
 

diff --git a/src/Alba.Testing/Acceptance/data_binding_in_mvc_app.cs b/src/Alba.Testing/Acceptance/data_binding_in_mvc_app.cs
@@ -13,7 +13,7 @@ public class data_binding_in_mvc_app
         [Fact]
         public async Task can_bind_to_form_data()
         {
-            await using var system = AlbaHost.ForStartup<Startup>();
+            await using var system = await AlbaHost.For<Startup>();
 
             var input = new InputModel {
                 One = "one",
@@ -40,7 +40,7 @@ await system.Scenario(_ =>
         [Fact]
         public async Task can_bind_to_form_data_as_dictionary()
         {
-            await using var system = AlbaHost.ForStartup<Startup>();
+            await using var system = await AlbaHost.For<Startup>();
 
             var dict = new Dictionary<string, string> {{"One", "one"}, {"Two", "two"}, {"Three", "three"}};
 

diff --git a/src/Alba.Testing/Acceptance/specs_against_aspnet_core_app.cs b/src/Alba.Testing/Acceptance/specs_against_aspnet_core_app.cs
@@ -13,20 +13,15 @@
 
 namespace Alba.Testing.Acceptance
 {
-    public class specs_against_aspnet_core_app : IDisposable
+    public class specs_against_aspnet_core_app : IAsyncLifetime
     {
-        private readonly AlbaHost _system;
+        private IAlbaHost _system;
 
         private Task<IScenarioResult> run(Action<Scenario> configuration)
         {
             return _system.Scenario(configuration);
         }
 
-        public specs_against_aspnet_core_app()
-        {
-            _system = AlbaHost.ForStartup<Startup>();
-        }
-
         public void Dispose()
         {
             _system?.Dispose();
@@ -386,5 +381,15 @@ public Task returns_successfully_when_passed_object_is_passed_to_Input()
                 _.ContentShouldContain("somevalue");
             });
         }
+
+        public async Task InitializeAsync()
+        {
+            _system = await AlbaHost.For<Startup>();
+        }
+
+        public async Task DisposeAsync()
+        {
+            await _system.DisposeAsync();
+        }
     }
 }
diff --git a/src/Alba.Testing/Acceptance/using_custom_service_registrations.cs b/src/Alba.Testing/Acceptance/using_custom_service_registrations.cs
@@ -14,36 +14,35 @@ public class using_custom_service_registrations
         [Fact]
         public async Task override_service_registration_in_bootstrapping()
         {
-            ValuesController.LastWidget = new IWidget[0];
+            ValuesController.LastWidget = Array.Empty<IWidget>();
 
-            using (var system = AlbaHost.ForStartup<Startup>(builder =>
+            using var system = await AlbaHost.For<Startup>(builder =>
                 {
-                    return builder.ConfigureServices((c, _) =>
+                    builder.ConfigureServices((c, _) =>
                     {
                         _.AddTransient<IWidget, RedWidget>();
                     });
-                }))
-            {
-                ValuesController.LastWidget = null;
+                });
 
-                // The default registration is a GreenWidget
+            ValuesController.LastWidget = null;
 
-                await system.Scenario(_ =>
-                {
-
-                    _.Put.Url("/api/values/foo").ContentType("application/json");
-                });
+            // The default registration is a GreenWidget
+
+            await system.Scenario(_ =>
+            {
+
+                _.Put.Url("/api/values/foo").ContentType("application/json");
+            });
 
-                ValuesController.LastWidget.Length.ShouldBe(2);
-            }
+            ValuesController.LastWidget.Length.ShouldBe(2);
         }
 
         [Fact]
-        public void can_request_services()
+        public async Task can_request_services()
         {
-            using var system = AlbaHost.ForStartup<Startup>(builder =>
+            using var system = await AlbaHost.For<Startup>(builder =>
             {
-                return builder.ConfigureServices((c, _) => { _.AddHttpContextAccessor(); });
+                builder.ConfigureServices((c, _) => { _.AddHttpContextAccessor(); });
             });
 
             var accessor1 = system.Services.GetService<IHttpContextAccessor>();

diff --git a/src/Alba.Testing/ActivityTests.cs b/src/Alba.Testing/ActivityTests.cs
@@ -7,7 +7,15 @@
 
 namespace Alba.Testing;
 
-public class ActivityTests
+// activity listener cannot be tested in parallel with other tests
+[CollectionDefinition(nameof(ActivityCollection), DisableParallelization = true)]
+public class ActivityCollection
+{
+
+}
+
+[Collection(nameof(ActivityCollection))]
+public class ActivityTests 
 {
     [Fact]
     public async Task ActivityTagged_AsExpected()

diff --git a/src/Alba.Testing/Alba.Testing.csproj b/src/Alba.Testing/Alba.Testing.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>Alba.Testing</AssemblyName>
     <PackageId>Alba.Testing</PackageId>
 
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Alba\Alba.csproj" />
-    <ProjectReference Include="..\IdentityServer\IdentityServer.csproj" />
+    <ProjectReference Include="..\IdentityServer.New\IdentityServer.New.csproj" />
     <ProjectReference Include="..\WebAppSecuredWithJwt\WebAppSecuredWithJwt.csproj" />
     <ProjectReference Include="..\WebApp\WebApp.csproj" />
     <ProjectReference Include="..\WebApiAspNetCore3\WebApiStartupHostingModel.csproj" />
@@ -17,12 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="NSubstitute" Version="4.4.0" />
-    <PackageReference Include="Shouldly" Version="4.1.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NSubstitute" Version="5.1.0" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Alba.Testing/Assertions/RedirectAssertionTests.cs b/src/Alba.Testing/Assertions/RedirectAssertionTests.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using Alba.Assertions;
-using Baseline;
 using Shouldly;
 using Xunit;
 

diff --git a/src/Alba.Testing/CrudeRouter.cs b/src/Alba.Testing/CrudeRouter.cs
@@ -4,8 +4,8 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
-using Baseline;
-using Baseline.Reflection;
+using JasperFx.Core;
+using JasperFx.Core.Reflection;
 using Microsoft.AspNetCore.Http;
 
 namespace Alba.Testing

diff --git a/src/Alba.Testing/FormDataExtensionsTests.cs b/src/Alba.Testing/FormDataExtensionsTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using Baseline;
+using JasperFx.Core;
 using Microsoft.AspNetCore.Http;
 using Shouldly;
 using Xunit;

diff --git a/src/Alba.Testing/Samples/Quickstart.cs b/src/Alba.Testing/Samples/Quickstart.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Baseline;
+using JasperFx.Core;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;

diff --git a/src/Alba.Testing/Security/IdentityServerFixture.cs b/src/Alba.Testing/Security/IdentityServerFixture.cs
@@ -20,7 +20,7 @@ public class IdentityServerFixture : IAsyncLifetime
         public TestServer IdentityServer { get; set; }
         public Task InitializeAsync()
         {
-            IdentityServer = new WebApplicationFactory<IdentityServer.Program>().Server;
+            IdentityServer = new WebApplicationFactory<IdentityServer.New.Program>().Server;
             return Task.CompletedTask;
         }
 

diff --git a/src/Alba.Testing/Security/OpenConnectClientCredentialsTests.cs b/src/Alba.Testing/Security/OpenConnectClientCredentialsTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Alba.Security;
-using IdentityServer;
+using IdentityServer.New;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;

diff --git a/src/Alba.Testing/Security/OpenConnectUserPasswordTests.cs b/src/Alba.Testing/Security/OpenConnectUserPasswordTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Alba.Security;
-using IdentityServer;
+using IdentityServer.New;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;

diff --git a/src/Alba.Testing/SpecificationExtensions.cs b/src/Alba.Testing/SpecificationExtensions.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using Baseline;
+using JasperFx.Core;
 using Shouldly;
 
 namespace Alba.Testing