Dropping .NET 6, upgrading jasperfx deps, bumping to 14.0

JasperFx · Nov 18, 2024 · 62c6fb3 · 62c6fb3
1 parent a9fd707
commit 62c6fb3
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 64 deletions.
diff --git a/src/Aspect.Logger/Widget.Aspect.Logger.csproj b/src/Aspect.Logger/Widget.Aspect.Logger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj b/src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>

diff --git a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
@@ -9,7 +9,6 @@
 		<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
 		<PackageReference Include="IdentityServer4" Version="4.1.2" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-		<PackageReference Include="JasperFx.Core" Version="1.5.1" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />

diff --git a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj
@@ -2,9 +2,9 @@
 
     <PropertyGroup>
         <Description>Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app</Description>
-        <Version>13.2.0</Version>
+        <Version>14.0.0</Version>
         <Authors>Jeremy D. Miller</Authors>
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <DebugType>portable</DebugType>
         <AssemblyName>Lamar.Diagnostics</AssemblyName>
         <PackageId>Lamar.Diagnostics</PackageId>
@@ -21,7 +21,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Lamar\Lamar.csproj" />
         <PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.4.0" />
-        <PackageReference Include="Oakton" Version="6.1.0" />
+        <PackageReference Include="Oakton" Version="6.3.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<Description>Lamar Adapter for HostBuilder Integration</Description>
-		<Version>13.2.0</Version>
+		<Version>14.0.0</Version>
 		<Authors>Jeremy D. Miller</Authors>
-		<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<DebugType>portable</DebugType>
 		<AssemblyName>Lamar.Microsoft.DependencyInjection</AssemblyName>
 		<PackageId>Lamar.Microsoft.DependencyInjection</PackageId>
@@ -16,29 +16,15 @@
 		<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
 		<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
 	</PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0]" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="[9.0.0]" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0]" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0]" />
-  </ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0]" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0]" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0]" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0]" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[6.0.0,9.0.0)" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.0,9.0.0)" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="[6.0.0,9.0.0)" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="[6.0.0,9.0.0)" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\Lamar\Lamar.csproj" />
 	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0,10.0.0)" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0,10.0.0)" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0,10.0.0)" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0,10.0.0)" />
+	</ItemGroup>
 </Project>
diff --git a/src/Lamar.Testing/Lamar.Testing.csproj b/src/Lamar.Testing/Lamar.Testing.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <LangVersion>10.0</LangVersion>
     </PropertyGroup>
     <ItemGroup>

diff --git a/src/Lamar/Lamar.csproj b/src/Lamar/Lamar.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Fast ASP.Net Core compatible IoC Tool, Successor to StructureMap</Description>
-        <Version>13.2.0</Version>
+        <Version>14.0.0</Version>
         <Authors>Jeremy D. Miller</Authors>
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <DebugType>portable</DebugType>
         <AssemblyName>Lamar</AssemblyName>
         <PackageId>Lamar</PackageId>
@@ -19,11 +19,11 @@
     </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JasperFx.CodeGeneration" Version="3.4.0" />
-		<PackageReference Include="JasperFx.Core" Version="1.5.1" />
+		<PackageReference Include="JasperFx.CodeGeneration" Version="3.7.0" />
+		<PackageReference Include="JasperFx.Core" Version="1.9.0" />
 		<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Lamar/LamarIgnoreAttribute.cs b/src/Lamar/LamarIgnoreAttribute.cs
diff --git a/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj b/src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj b/src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

diff --git a/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj b/src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
 

diff --git a/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj b/src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj b/src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 

diff --git a/src/MinimalApiTests/MinimalApiTests.csproj b/src/MinimalApiTests/MinimalApiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>

diff --git a/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj b/src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.ExeWidget</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>StructureMap.Testing.ExeWidget</PackageId>

diff --git a/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj b/src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.GenericWidgets</AssemblyName>
     <PackageId>StructureMap.Testing.GenericWidgets</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

diff --git a/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj b/src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.Widget</AssemblyName>
     <PackageId>StructureMap.Testing.Widget</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

diff --git a/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj b/src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.Widget2</AssemblyName>
     <PackageId>StructureMap.Testing.Widget2</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

diff --git a/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj b/src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.Widget3</AssemblyName>
     <PackageId>StructureMap.Testing.Widget3</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

diff --git a/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj b/src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.Widget4</AssemblyName>
     <PackageId>StructureMap.Testing.Widget4</PackageId>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>

diff --git a/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj b/src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
     <AssemblyName>StructureMap.Testing.Widget5</AssemblyName>
     <PackageId>StructureMap.Testing.Widget5</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

diff --git a/src/UserApp/UserApp.csproj b/src/UserApp/UserApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 

diff --git a/src/Widget.Core/Widget.Core.csproj b/src/Widget.Core/Widget.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Widget.Instance/Widget.Instance.csproj b/src/Widget.Instance/Widget.Instance.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Widget.Registration/Widget.Registration.csproj b/src/Widget.Registration/Widget.Registration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>