diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index ac896652..cba135fc 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -22,18 +22,18 @@ jobs:
steps:
- uses: actions/checkout@v2
-
+ - name: Setup .NET 8
+ uses: actions/setup-dotnet@v3
+ with:
+ dotnet-version: 8.0.x
- name: Setup .NET
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Setup .NET
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- - name: Setup .NET 5
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: 5.0.x
+
- name: Test
run: dotnet run -p build/build.csproj -- ci
diff --git a/src/Aspect.Logger/Widget.Aspect.Logger.csproj b/src/Aspect.Logger/Widget.Aspect.Logger.csproj
index 063dc539..d08fedb9 100644
--- a/src/Aspect.Logger/Widget.Aspect.Logger.csproj
+++ b/src/Aspect.Logger/Widget.Aspect.Logger.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
diff --git a/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj b/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj
index 0ba4eb59..f78f5645 100644
--- a/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj
+++ b/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj
@@ -1,51 +1,51 @@
-
- net6.0;net7.0
-
- false
-
-
-
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ net6.0;net7.0;net8.0
+
+ false
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj
index 683a8db6..c7b6b1ac 100644
--- a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj
+++ b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj
@@ -1,43 +1,46 @@
-
- net6.0;net7.0
- false
-
-
+
+ net6.0;net7.0;net8.0
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
+
+
+ PreserveNewest
+
+
\ No newline at end of file
diff --git a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj
index 1cfd25ba..625bfa6d 100644
--- a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj
+++ b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj
@@ -4,7 +4,7 @@
Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app
12.0.2
Jeremy D. Miller
- net6.0;net7.0
+ net6.0;net7.0;net8.0
portable
Lamar.Diagnostics
Lamar.Diagnostics
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/src/Lamar.Diagnostics/LamarServicesCommand.cs b/src/Lamar.Diagnostics/LamarServicesCommand.cs
index 2fea5c32..4e9aac23 100644
--- a/src/Lamar.Diagnostics/LamarServicesCommand.cs
+++ b/src/Lamar.Diagnostics/LamarServicesCommand.cs
@@ -68,8 +68,7 @@ private void WriteSummaries(LamarServicesInput input, IGrouping @group, WhatDoIHaveDisplay displayMode,
IContainer container)
{
- var rule = new Rule($"[blue]{@group.Key.GetName().Name} ({@group.Key.GetName().Version})[/]")
- {Alignment = Justify.Left};
+ var rule = new Rule($"[blue]{@group.Key.GetName().Name} ({@group.Key.GetName().Version})[/]"){ Justification = Justify.Left};
AnsiConsole.Write(rule);
var namespaces = @group.GroupBy(x => x.ServiceType.ResolveServiceType().Namespace);
diff --git a/src/Lamar.Diagnostics/ServiceCollectionExtensions.cs b/src/Lamar.Diagnostics/ServiceCollectionExtensions.cs
index 8b4f4bad..b839c1c3 100644
--- a/src/Lamar.Diagnostics/ServiceCollectionExtensions.cs
+++ b/src/Lamar.Diagnostics/ServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-using JasperFx.TypeDiscovery;
+using JasperFx.Core.TypeScanning;
using Microsoft.Extensions.DependencyInjection;
using Oakton.Environment;
diff --git a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj
index 1c4ec18e..c749797f 100644
--- a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj
+++ b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj
@@ -1,30 +1,42 @@
-
- Lamar Adapter for HostBuilder Integration
- 12.0.2
- Jeremy D. Miller
- net6.0;net7.0
- portable
- Lamar.Microsoft.DependencyInjection
- Lamar.Microsoft.DependencyInjection
- https://avatars2.githubusercontent.com/u/10048186?v=3&s=200
- https://jasperfx.github.io/lamar
- https://github.com/JasperFX/lamar/blob/master/LICENSE
- false
- false
- false
- false
- false
-
+
+ Lamar Adapter for HostBuilder Integration
+ 12.0.2
+ Jeremy D. Miller
+ net6.0;net7.0;net8.0
+ portable
+ Lamar.Microsoft.DependencyInjection
+ Lamar.Microsoft.DependencyInjection
+ https://avatars2.githubusercontent.com/u/10048186?v=3&s=200
+ https://jasperfx.github.io/lamar
+ https://github.com/JasperFX/lamar/blob/master/LICENSE
+ false
+ false
+ false
+ false
+ false
+
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Lamar.Testing/Lamar.Testing.csproj b/src/Lamar.Testing/Lamar.Testing.csproj
index eb3879fe..62d52a35 100644
--- a/src/Lamar.Testing/Lamar.Testing.csproj
+++ b/src/Lamar.Testing/Lamar.Testing.csproj
@@ -1,15 +1,18 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
10.0
-
-
-
-
-
-
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
diff --git a/src/Lamar/Lamar.csproj b/src/Lamar/Lamar.csproj
index 0f263a48..23855d86 100644
--- a/src/Lamar/Lamar.csproj
+++ b/src/Lamar/Lamar.csproj
@@ -3,7 +3,7 @@
Fast ASP.Net Core compatible IoC Tool, Successor to StructureMap
12.0.2
Jeremy D. Miller
- net6.0;net7.0
+ net6.0;net7.0;net8.0
portable
Lamar
Lamar
@@ -17,16 +17,22 @@
false
10.0
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj b/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj
index ad505aaa..b7df5802 100644
--- a/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj
+++ b/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj
@@ -2,7 +2,7 @@
Exe
- net7.0;net6.0
+ net7.0;net6.0;net8.0
@@ -15,16 +15,20 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj b/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj
index 13624ee9..461add59 100644
--- a/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj
+++ b/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj
@@ -1,19 +1,24 @@
- net6.0;net7.0
-
+ net6.0;net7.0;net8.0
false
-
+
-
-
-
-
-
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj b/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj
index 340b3098..483d511c 100644
--- a/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj
+++ b/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net7.0;net6.0;net8.0
diff --git a/src/MinimalApiTests/MinimalApiTests.csproj b/src/MinimalApiTests/MinimalApiTests.csproj
index 978f94e4..f3d31829 100644
--- a/src/MinimalApiTests/MinimalApiTests.csproj
+++ b/src/MinimalApiTests/MinimalApiTests.csproj
@@ -1,21 +1,21 @@
- net6.0;net7.0
+ net6.0;net7.0;net8.0
enable
false
-
-
-
-
+
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj b/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj
index ac8c77ff..1e81bddb 100644
--- a/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj
+++ b/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.ExeWidget
Exe
StructureMap.Testing.ExeWidget
diff --git a/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj b/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj
index c27705c8..147834c9 100644
--- a/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj
+++ b/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.GenericWidgets
StructureMap.Testing.GenericWidgets
false
diff --git a/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj b/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj
index fa257866..5922700f 100644
--- a/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj
+++ b/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj
@@ -1,6 +1,6 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.Widget
StructureMap.Testing.Widget
false
diff --git a/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj b/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj
index 4550717a..9d0f3e46 100644
--- a/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj
+++ b/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.Widget2
StructureMap.Testing.Widget2
false
diff --git a/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj b/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj
index ffec10d0..3e6f5cbe 100644
--- a/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj
+++ b/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.Widget3
StructureMap.Testing.Widget3
false
diff --git a/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj b/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj
index 95b65df8..8b482960 100644
--- a/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj
+++ b/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.Widget4
StructureMap.Testing.Widget4
1.6.0
diff --git a/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj b/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj
index 5ff8daad..d0342838 100644
--- a/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj
+++ b/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj
@@ -1,6 +1,6 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
StructureMap.Testing.Widget5
StructureMap.Testing.Widget5
false
diff --git a/src/UserApp/UserApp.csproj b/src/UserApp/UserApp.csproj
index acf956af..1b0c77e5 100644
--- a/src/UserApp/UserApp.csproj
+++ b/src/UserApp/UserApp.csproj
@@ -1,11 +1,11 @@
- net7.0;net6.0
+ net7.0;net6.0;net8.0
InProcess
-
+
diff --git a/src/Widget.Core/Widget.Core.csproj b/src/Widget.Core/Widget.Core.csproj
index 74d4e866..5e4fc759 100644
--- a/src/Widget.Core/Widget.Core.csproj
+++ b/src/Widget.Core/Widget.Core.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
diff --git a/src/Widget.Instance/Widget.Instance.csproj b/src/Widget.Instance/Widget.Instance.csproj
index e713cba5..5d6a6f91 100644
--- a/src/Widget.Instance/Widget.Instance.csproj
+++ b/src/Widget.Instance/Widget.Instance.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0
diff --git a/src/Widget.Registration/Widget.Registration.csproj b/src/Widget.Registration/Widget.Registration.csproj
index 41cd5b3b..60a3c9ae 100644
--- a/src/Widget.Registration/Widget.Registration.csproj
+++ b/src/Widget.Registration/Widget.Registration.csproj
@@ -1,7 +1,7 @@
- net7.0;net6.0
+ net8.0;net7.0;net6.0