From 62c6fb3f2a2acbd6ba32e81ed72338a9dadb5770 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Miller" Date: Mon, 18 Nov 2024 09:41:23 -0600 Subject: [PATCH] Dropping .NET 6, upgrading jasperfx deps, bumping to 14.0 --- src/Aspect.Logger/Widget.Aspect.Logger.csproj | 2 +- .../Lamar.AspNetCoreTests.Integration.csproj | 2 +- .../Lamar.AspNetCoreTests.csproj | 3 +- .../Lamar.Diagnostics.csproj | 6 ++-- ...Lamar.Microsoft.DependencyInjection.csproj | 32 ++++++------------- src/Lamar.Testing/Lamar.Testing.csproj | 2 +- src/Lamar/Lamar.csproj | 10 +++--- src/Lamar/LamarIgnoreAttribute.cs | 11 ------- ...DiagnosticsWithNetCore3Demonstrator.csproj | 2 +- .../LamarWithAspNetCore3.csproj | 2 +- .../LamarWithAspNetCoreMvc3.csproj | 2 +- .../LamarWithIdentityOnNet5.csproj | 2 +- .../LamarWithMinimalApiOnNet6.csproj | 2 +- src/MinimalApiTests/MinimalApiTests.csproj | 2 +- .../StructureMap.Testing.ExeWidget.csproj | 2 +- ...StructureMap.Testing.GenericWidgets.csproj | 2 +- .../StructureMap.Testing.Widget.csproj | 2 +- .../StructureMap.Testing.Widget2.csproj | 2 +- .../StructureMap.Testing.Widget3.csproj | 2 +- .../StructureMap.Testing.Widget4.csproj | 2 +- .../StructureMap.Testing.Widget5.csproj | 2 +- src/UserApp/UserApp.csproj | 2 +- src/Widget.Core/Widget.Core.csproj | 2 +- src/Widget.Instance/Widget.Instance.csproj | 2 +- .../Widget.Registration.csproj | 2 +- 25 files changed, 38 insertions(+), 64 deletions(-) delete mode 100644 src/Lamar/LamarIgnoreAttribute.cs diff --git a/src/Aspect.Logger/Widget.Aspect.Logger.csproj b/src/Aspect.Logger/Widget.Aspect.Logger.csproj index 6d4cc3bf..0ff53ac3 100644 --- a/src/Aspect.Logger/Widget.Aspect.Logger.csproj +++ b/src/Aspect.Logger/Widget.Aspect.Logger.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0 diff --git a/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj b/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj index 709722ad..5d17c731 100644 --- a/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj +++ b/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 false diff --git a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj index 36862cd1..e73b3cca 100644 --- a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj +++ b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 false @@ -9,7 +9,6 @@ - diff --git a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj index 9ae71502..8c4629cd 100644 --- a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj +++ b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj @@ -2,9 +2,9 @@ Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app - 13.2.0 + 14.0.0 Jeremy D. Miller - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 portable Lamar.Diagnostics Lamar.Diagnostics @@ -21,7 +21,7 @@ - + diff --git a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj index 4651d811..ab7ec6e2 100644 --- a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj +++ b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj @@ -1,9 +1,9 @@  Lamar Adapter for HostBuilder Integration - 13.2.0 + 14.0.0 Jeremy D. Miller - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 portable Lamar.Microsoft.DependencyInjection Lamar.Microsoft.DependencyInjection @@ -16,29 +16,15 @@ 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 16004ce5..3009f6c8 100644 --- a/src/Lamar.Testing/Lamar.Testing.csproj +++ b/src/Lamar.Testing/Lamar.Testing.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 10.0 diff --git a/src/Lamar/Lamar.csproj b/src/Lamar/Lamar.csproj index 68780806..e931692b 100644 --- a/src/Lamar/Lamar.csproj +++ b/src/Lamar/Lamar.csproj @@ -1,9 +1,9 @@  Fast ASP.Net Core compatible IoC Tool, Successor to StructureMap - 13.2.0 + 14.0.0 Jeremy D. Miller - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 portable Lamar Lamar @@ -19,11 +19,11 @@ - - + + - + \ No newline at end of file diff --git a/src/Lamar/LamarIgnoreAttribute.cs b/src/Lamar/LamarIgnoreAttribute.cs deleted file mode 100644 index 0d95e5c0..00000000 --- a/src/Lamar/LamarIgnoreAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Lamar; - -/// -/// Use to direct Lamar type scanning to ignore this type -/// -[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)] -public class LamarIgnoreAttribute : Attribute -{ -} \ No newline at end of file diff --git a/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj b/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj index 7007fdc4..92ee4299 100644 --- a/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj +++ b/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj @@ -2,7 +2,7 @@ Exe - net7.0;net6.0;net8.0 + net7.0;net8.0 diff --git a/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj b/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj index e7107460..6ee935c7 100644 --- a/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj +++ b/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 false diff --git a/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj b/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj index 483d511c..d0241bab 100644 --- a/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj +++ b/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net8.0 + net7.0;net8.0 diff --git a/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj b/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj index 8986cb9c..09a6ed52 100644 --- a/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj +++ b/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net7.0 diff --git a/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj b/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj index 0df20b8b..cf570c7b 100644 --- a/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj +++ b/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0;net8.0;net9.0 enable enable diff --git a/src/MinimalApiTests/MinimalApiTests.csproj b/src/MinimalApiTests/MinimalApiTests.csproj index f0ee4a51..329704e4 100644 --- a/src/MinimalApiTests/MinimalApiTests.csproj +++ b/src/MinimalApiTests/MinimalApiTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0;net9.0 + net7.0;net8.0;net9.0 enable false diff --git a/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj b/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj index f9547d7c..95146aab 100644 --- a/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj +++ b/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 d14eceaa..2f992ada 100644 --- a/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj +++ b/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 53abc8c0..f29b8465 100644 --- a/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj +++ b/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj @@ -1,6 +1,6 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 d00adbed..584309a2 100644 --- a/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj +++ b/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 9267dc24..a8b45c33 100644 --- a/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj +++ b/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 b1e4f29a..4b28c943 100644 --- a/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj +++ b/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj @@ -1,7 +1,7 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.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 65e26bba..5291069c 100644 --- a/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj +++ b/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj @@ -1,6 +1,6 @@  - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0 StructureMap.Testing.Widget5 StructureMap.Testing.Widget5 false diff --git a/src/UserApp/UserApp.csproj b/src/UserApp/UserApp.csproj index 1b0c77e5..1a728313 100644 --- a/src/UserApp/UserApp.csproj +++ b/src/UserApp/UserApp.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net8.0 + net7.0;net8.0 InProcess diff --git a/src/Widget.Core/Widget.Core.csproj b/src/Widget.Core/Widget.Core.csproj index 404e7bff..458e4193 100644 --- a/src/Widget.Core/Widget.Core.csproj +++ b/src/Widget.Core/Widget.Core.csproj @@ -1,7 +1,7 @@ - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0 diff --git a/src/Widget.Instance/Widget.Instance.csproj b/src/Widget.Instance/Widget.Instance.csproj index 1a0b5c87..25b5324d 100644 --- a/src/Widget.Instance/Widget.Instance.csproj +++ b/src/Widget.Instance/Widget.Instance.csproj @@ -1,7 +1,7 @@ - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0 diff --git a/src/Widget.Registration/Widget.Registration.csproj b/src/Widget.Registration/Widget.Registration.csproj index 3d8c2808..7c5c2c46 100644 --- a/src/Widget.Registration/Widget.Registration.csproj +++ b/src/Widget.Registration/Widget.Registration.csproj @@ -1,7 +1,7 @@ - net9.0;net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0