Skip to content

Commit 62c6fb3

Browse files
jeremydmillerjeremydmiller
committed
Dropping .NET 6, upgrading jasperfx deps, bumping to 14.0
1 parent a9fd707 commit 62c6fb3

File tree

25 files changed

+38
-64
lines changed

25 files changed

+38
-64
lines changed

‎src/Aspect.Logger/Widget.Aspect.Logger.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Lamar.AspNetCoreTests.Integration/Lamar.AspNetCoreTests.Integration.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

@@ -9,7 +9,6 @@
99
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
1010
<PackageReference Include="IdentityServer4" Version="4.1.2" />
1111
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
12-
<PackageReference Include="JasperFx.Core" Version="1.5.1" />
1312
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
1413
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
1514
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />

‎src/Lamar.Diagnostics/Lamar.Diagnostics.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<Description>Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app</Description>
5-
<Version>13.2.0</Version>
5+
<Version>14.0.0</Version>
66
<Authors>Jeremy D. Miller</Authors>
7-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
88
<DebugType>portable</DebugType>
99
<AssemblyName>Lamar.Diagnostics</AssemblyName>
1010
<PackageId>Lamar.Diagnostics</PackageId>
@@ -21,7 +21,7 @@
2121
<ItemGroup>
2222
<ProjectReference Include="..\Lamar\Lamar.csproj" />
2323
<PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.4.0" />
24-
<PackageReference Include="Oakton" Version="6.1.0" />
24+
<PackageReference Include="Oakton" Version="6.3.0" />
2525
</ItemGroup>
2626

2727
</Project>

‎src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj

+9-23
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Lamar Adapter for HostBuilder Integration</Description>
4-
<Version>13.2.0</Version>
4+
<Version>14.0.0</Version>
55
<Authors>Jeremy D. Miller</Authors>
6-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyName>Lamar.Microsoft.DependencyInjection</AssemblyName>
99
<PackageId>Lamar.Microsoft.DependencyInjection</PackageId>
@@ -16,29 +16,15 @@
1616
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1717
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
1818
</PropertyGroup>
19-
20-
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
21-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[9.0.0]" />
22-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[9.0.0]" />
23-
<PackageReference Include="Microsoft.Extensions.Logging" Version="[9.0.0]" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="[9.0.0]" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
28-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0]" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0]" />
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0]" />
31-
<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0]" />
32-
</ItemGroup>
33-
34-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
35-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[6.0.0,9.0.0)" />
36-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[6.0.0,9.0.0)" />
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="[6.0.0,9.0.0)" />
38-
<PackageReference Include="Microsoft.Extensions.Options" Version="[6.0.0,9.0.0)" />
39-
</ItemGroup>
4019

4120
<ItemGroup>
4221
<ProjectReference Include="..\Lamar\Lamar.csproj" />
4322
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[8.0.0,10.0.0)" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[8.0.0,10.0.0)" />
27+
<PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0,10.0.0)" />
28+
<PackageReference Include="Microsoft.Extensions.Options" Version="[8.0.0,10.0.0)" />
29+
</ItemGroup>
4430
</Project>

‎src/Lamar.Testing/Lamar.Testing.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
44
<LangVersion>10.0</LangVersion>
55
</PropertyGroup>
66
<ItemGroup>

‎src/Lamar/Lamar.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Fast ASP.Net Core compatible IoC Tool, Successor to StructureMap</Description>
4-
<Version>13.2.0</Version>
4+
<Version>14.0.0</Version>
55
<Authors>Jeremy D. Miller</Authors>
6-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyName>Lamar</AssemblyName>
99
<PackageId>Lamar</PackageId>
@@ -19,11 +19,11 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="JasperFx.CodeGeneration" Version="3.4.0" />
23-
<PackageReference Include="JasperFx.Core" Version="1.5.1" />
22+
<PackageReference Include="JasperFx.CodeGeneration" Version="3.7.0" />
23+
<PackageReference Include="JasperFx.Core" Version="1.9.0" />
2424
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
2525
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
2727
</ItemGroup>
2828

2929
</Project>

‎src/Lamar/LamarIgnoreAttribute.cs

-11
This file was deleted.

‎src/LamarDiagnosticsWithNetCore3Demonstrator/LamarDiagnosticsWithNetCore3Demonstrator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

‎src/LamarWithAspNetCoreMvc3/LamarWithAspNetCoreMvc3.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77

‎src/LamarWithIdentityOnNet5/LamarWithIdentityOnNet5.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/LamarWithMinimalApiOnNet6/LamarWithMinimalApiOnNet6.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77

‎src/MinimalApiTests/MinimalApiTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>

‎src/StructureMap.Testing.ExeWidget/StructureMap.Testing.ExeWidget.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
<AssemblyName>StructureMap.Testing.ExeWidget</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<PackageId>StructureMap.Testing.ExeWidget</PackageId>

‎src/StructureMap.Testing.GenericWidgets/StructureMap.Testing.GenericWidgets.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
<AssemblyName>StructureMap.Testing.GenericWidgets</AssemblyName>
66
<PackageId>StructureMap.Testing.GenericWidgets</PackageId>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

‎src/StructureMap.Testing.Widget/StructureMap.Testing.Widget.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
44
<AssemblyName>StructureMap.Testing.Widget</AssemblyName>
55
<PackageId>StructureMap.Testing.Widget</PackageId>
66
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

‎src/StructureMap.Testing.Widget2/StructureMap.Testing.Widget2.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
<AssemblyName>StructureMap.Testing.Widget2</AssemblyName>
66
<PackageId>StructureMap.Testing.Widget2</PackageId>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

‎src/StructureMap.Testing.Widget3/StructureMap.Testing.Widget3.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
<AssemblyName>StructureMap.Testing.Widget3</AssemblyName>
66
<PackageId>StructureMap.Testing.Widget3</PackageId>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

‎src/StructureMap.Testing.Widget4/StructureMap.Testing.Widget4.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
<AssemblyName>StructureMap.Testing.Widget4</AssemblyName>
66
<PackageId>StructureMap.Testing.Widget4</PackageId>
77
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>

‎src/StructureMap.Testing.Widget5/StructureMap.Testing.Widget5.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
44
<AssemblyName>StructureMap.Testing.Widget5</AssemblyName>
55
<PackageId>StructureMap.Testing.Widget5</PackageId>
66
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>

‎src/UserApp/UserApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

‎src/Widget.Core/Widget.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Widget.Instance/Widget.Instance.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Widget.Registration/Widget.Registration.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)