Skip to content

Commit d4f3c52

Browse files
jamesmcroftjamesmcroft
committed
Add support for dotnet 7 & 8
1 parent 1201b97 commit d4f3c52

File tree

13 files changed

+107
-74
lines changed

13 files changed

+107
-74
lines changed

‎src/MADE.Data.EFCore/MADE.Data.EFCore.csproj‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<Product>MADE.NET for EF Core</Product>
66
<Description>
77
MADE.NET for EF Core builds on the base Entity Framework library to provide base classes and helpers for maintaining data in databases.
88
</Description>
99
<PackageTags>MADE EFCore Entity Framework Extensions Queryable DbContext</PackageTags>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
14-
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.15.2" />
12+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
13+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
14+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.101.1.3" />
15+
</ItemGroup>
16+
17+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
19+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="7.101.1.3" />
20+
</ItemGroup>
21+
22+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
23+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
24+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.101.1.3" />
1525
</ItemGroup>
1626

1727
</Project>

‎src/MADE.Web.Mvc/MADE.Web.Mvc.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<Product>MADE.NET for ASP.NET Core MVC</Product>
66
<Description>
77
MADE.NET for ASP.NET Core MVC builds on features of ASP.NET Core MVC to provide additional MVC-specific functionality to improve your web applications.
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/MADE.Web/Extensions/ApiVersioningExtensions.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
namespace MADE.Web.Extensions
55
{
6-
using Microsoft.AspNetCore.Mvc;
7-
using Microsoft.AspNetCore.Mvc.Versioning;
6+
using Asp.Versioning;
87
using Microsoft.Extensions.DependencyInjection;
98

109
/// <summary>
@@ -24,15 +23,15 @@ public static IServiceCollection AddApiVersionSupport(
2423
int defaultMajor = 1,
2524
int defaultMinor = 0)
2625
{
27-
services.AddVersionedApiExplorer(options => options.GroupNameFormat = "'v'VVV");
28-
29-
services.AddApiVersioning(options =>
26+
var apiVersioningBuilder = services.AddApiVersioning(options =>
3027
{
3128
options.DefaultApiVersion = new ApiVersion(defaultMajor, defaultMinor);
3229
options.AssumeDefaultVersionWhenUnspecified = true;
3330
options.ReportApiVersions = true;
3431
});
3532

33+
apiVersioningBuilder.AddApiExplorer(options => options.GroupNameFormat = "'v'VVV");
34+
3635
return services;
3736
}
3837

@@ -50,16 +49,16 @@ public static IServiceCollection AddApiVersionHeaderSupport(
5049
int defaultMajor = 1,
5150
int defaultMinor = 0)
5251
{
53-
services.AddVersionedApiExplorer(options => options.GroupNameFormat = "'v'VVV");
54-
55-
services.AddApiVersioning(options =>
52+
var apiVersioningBuilder = services.AddApiVersioning(options =>
5653
{
5754
options.DefaultApiVersion = new ApiVersion(defaultMajor, defaultMinor);
5855
options.AssumeDefaultVersionWhenUnspecified = true;
5956
options.ReportApiVersions = true;
6057
options.ApiVersionReader = new HeaderApiVersionReader(apiHeaderName);
6158
});
6259

60+
apiVersioningBuilder.AddApiExplorer(options => options.GroupNameFormat = "'v'VVV");
61+
6362
return services;
6463
}
6564
}

‎src/MADE.Web/MADE.Web.csproj‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<Product>MADE.NET for ASP.NET Core</Product>
66
<Description>
77
MADE.NET for ASP.NET Core builds on features of ASP.NET Core to provide better support for your web API or MVC applications, including standardized pagination support, global authenticated user accessor, standardized exception handling with JSON responses, and API versioning.
@@ -14,9 +14,22 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
18-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
17+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
21+
<PackageReference Include="Asp.Versioning.Mvc" Version="6.4.1" />
22+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="6.4.0" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
26+
<PackageReference Include="Asp.Versioning.Mvc" Version="7.1.1" />
27+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.1.0" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
31+
<PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0" />
32+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.0.0" />
2033
</ItemGroup>
2134

2235
</Project>

‎tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
<PackageReference Include="Shouldly" Version="4.2.1" />
1919
</ItemGroup>
2020

‎tests/MADE.Data.Converters.Tests/MADE.Data.Converters.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
<PackageReference Include="Shouldly" Version="4.2.1" />
1919
</ItemGroup>
2020

‎tests/MADE.Data.EFCore.Tests/MADE.Data.EFCore.Tests.csproj‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
16-
<PackageReference Include="Moq" Version="4.18.2" />
17-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1816
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2018
<PackageReference Include="Shouldly" Version="4.2.1" />
2119
</ItemGroup>
2220

21+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.25" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
31+
</ItemGroup>
32+
33+
2334
<ItemGroup>
2435
<ProjectReference Include="..\..\src\MADE.Data.EFCore\MADE.Data.EFCore.csproj" />
2536
</ItemGroup>

‎tests/MADE.Data.Serialization.Tests/MADE.Data.Serialization.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
<PackageReference Include="Shouldly" Version="4.2.1" />
1919
</ItemGroup>
2020

‎tests/MADE.Data.Validation.FluentValidation.Tests/MADE.Data.Validation.FluentValidation.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
<PackageReference Include="Shouldly" Version="4.2.1" />
1919
</ItemGroup>
2020

‎tests/MADE.Data.Validation.Tests/MADE.Data.Validation.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

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

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="34.0.2" />
10-
<PackageReference Include="coverlet.collector" Version="3.1.2">
9+
<PackageReference Include="Bogus" Version="35.2.0" />
10+
<PackageReference Include="coverlet.collector" Version="6.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="NUnit" Version="3.13.3" />
14+
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="NUnit" Version="4.0.1" />
1616
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1818
<PackageReference Include="Shouldly" Version="4.2.1" />
1919
</ItemGroup>
2020

0 commit comments

Comments
 (0)