Skip to content

Commit 706e35a

Browse files
cheng93jeremydmiller
cheng93
authored and
jeremydmiller
committed
Support .NET7
Updated test projects target framework to include .NET7 Updated Lamar dependency version range
1 parent ec535a8 commit 706e35a

File tree

8 files changed

+46
-57
lines changed

8 files changed

+46
-57
lines changed

‎.github/workflows/dotnet.yml

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
- uses: actions/checkout@v2
2424

2525

26+
- name: Setup .NET
27+
uses: actions/setup-dotnet@v1
28+
with:
29+
dotnet-version: 7.0.x
2630
- name: Setup .NET
2731
uses: actions/setup-dotnet@v1
2832
with:

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

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

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

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

9-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[5.0.0,5.9.0)" />
9+
<ItemGroup>
1110
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.0,5.9.0)" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[5.0.0,5.9.0)" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[5.0.0,5.9.0)" />
15-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[5.0.0,5.9.0)" />
16-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[5.0.0,5.9.0)" />
1711
<PackageReference Include="Shouldly" Version="3.0.0" />
1812
<PackageReference Include="xunit" Version="2.4.0" />
1913
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
2014
<PackageReference Include="coverlet.collector" Version="1.0.1" />
2115
</ItemGroup>
2216

17+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[5.0.0,6.0.0)" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5.0.0,6.0.0)" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[5.0.0,6.0.0)" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[5.0.0,6.0.0)" />
22+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[5.0.0,6.0.0)" />
23+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[5.0.0,6.0.0)" />
24+
</ItemGroup>
25+
2326
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
24-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.0,6.9.0)" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,6.9.0)" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[6.0.0,6.9.0)" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.0,6.9.0)" />
29-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[6.0.0,6.9.0)" />
30-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[6.0.0,6.9.0)" />
31-
<PackageReference Include="Shouldly" Version="3.0.0" />
32-
<PackageReference Include="xunit" Version="2.4.0" />
33-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
34-
<PackageReference Include="coverlet.collector" Version="1.0.1" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[6.0.0,7.0.0)" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6.0.0,7.0.0)" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[6.0.0,7.0.0)" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.0,7.0.0)" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[6.0.0,7.0.0)" />
32+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[6.0.0,7.0.0)" />
33+
</ItemGroup>
34+
35+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
36+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.0,8.0.0)" />
37+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[7.0.0,8.0.0)" />
38+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[7.0.0,8.0.0)" />
39+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.0,8.0.0)" />
40+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[7.0.0,8.0.0)" />
41+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="[7.0.0,8.0.0)" />
3542
</ItemGroup>
3643

3744
<ItemGroup>

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
77

88
<PackageReference Include="App.Metrics.AspNetCore.Mvc" Version="4.2.0" />
9+
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
910

1011
<PackageReference Include="IdentityServer4" Version="4.1.2" />
12+
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
1113

1214
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
1315
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
@@ -24,18 +26,16 @@
2426
</ItemGroup>
2527

2628
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
27-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
28-
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
30-
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
3129
<PackageReference Include="Baseline" Version="3.2.2" />
30+
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0" />
3231
</ItemGroup>
3332
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
34-
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="5.0.1" />
35-
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
37-
<PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
3833
<PackageReference Include="Alba" Version="6.0.0" />
34+
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
35+
</ItemGroup>
36+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
37+
<PackageReference Include="Alba" Version="6.0.0" />
38+
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

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

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
44
<LangVersion>10.0</LangVersion>
55
</PropertyGroup>
66
<ItemGroup>
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
78
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
89
<PackageReference Include="xunit" Version="2.4.1" />
910
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
@@ -25,14 +26,6 @@
2526
<ProjectReference Include="..\Widget.Registration\Widget.Registration.csproj" />
2627
</ItemGroup>
2728

28-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
34-
</ItemGroup>
35-
3629
<ItemGroup>
3730
<Compile Remove="Codegen\StubGeneratedMethod.cs" />
3831
</ItemGroup>

‎src/Lamar/Lamar.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737

3838
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
3939
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
40-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.0, 7.0.0)" />
40+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[6.0.0, 8.0.0)" />
4141
</ItemGroup>
4242
</Project>

‎src/LamarCompiler.Testing/LamarCompiler.Testing.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
55
<LangVersion>10.0</LangVersion>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -12,14 +12,6 @@
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1313
<PackageReference Include="Shouldly" Version="3.0.2" />
1414
<PackageReference Include="NSubstitute" Version="4.2.1" />
15-
<PackageReference Include="Baseline" Version="2.1.0" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
19-
<PackageReference Include="Baseline" Version="2.1.1" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
2315
<PackageReference Include="Baseline" Version="2.1.1" />
2416
</ItemGroup>
2517

‎src/LamarWithAspNetCore3/LamarWithAspNetCore3.csproj

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

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

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

99
<ItemGroup>
10+
<PackageReference Include="Baseline" Version="2.1.1" />
1011
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1112
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
1213
<PackageReference Include="xunit" Version="2.4.0" />
@@ -20,14 +21,6 @@
2021
<ProjectReference Include="..\StructureMap.Testing.Widget\StructureMap.Testing.Widget.csproj" />
2122
</ItemGroup>
2223

23-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
24-
<PackageReference Include="Baseline" Version="2.1.1" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
28-
<PackageReference Include="Baseline" Version="2.1.1" />
29-
</ItemGroup>
30-
3124
<ItemGroup>
3225
<None Update="appsettings.json">
3326
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎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-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>

0 commit comments

Comments
 (0)