Skip to content

Commit 6d681a4

Browse files
ardalisardalis
authored
Configure multi-targeting (#463)
* Configure multi-targeting * Update target frameworks for tests
1 parent 677986c commit 6d681a4

File tree

15 files changed

+203
-182
lines changed

15 files changed

+203
-182
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
<PackageProjectUrl>https://github.com/ardalis/SmartEnum</PackageProjectUrl>
1010
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1111
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12-
<TargetFramework>net7.0</TargetFramework>
12+
<TargetFrameworks>net7.0;net6.0;net8.0;netstandard2.1</TargetFrameworks>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Version>7.0.0</Version>
14+
<Version>8.0.0</Version>
15+
<LangVersion>11</LangVersion>
1516
<Features>strict</Features>
1617
</PropertyGroup>
1718
<PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
2424
<PackageVersion Include="protobuf-net" Version="3.2.26" />
2525
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.12.0.78982" />
26+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
2627
<PackageVersion Include="System.Text.Json" Version="7.0.3" />
2728
<PackageVersion Include="Utf8Json" Version="1.3.7" />
2829
<PackageVersion Include="xunit" Version="2.4.2" />

‎src/SmartEnum.EFCore/SmartEnum.EFCore.csproj‎

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

33
<PropertyGroup>
4+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
45
<PackageId>Ardalis.SmartEnum.EFCore</PackageId>
56
<Title>Ardalis.SmartEnum.EFCore</Title>
67
<Description>EFCore support for Ardalis.SmartEnum.</Description>

‎src/SmartEnum/SmartEnum.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@
3030
</None>
3131
<None Include="$(SolutionDir)img\icon.png" Pack="true" Visible="false" PackagePath="" />
3232
</ItemGroup>
33+
<ItemGroup>
34+
<PackageReference Include="System.ComponentModel.Annotations" />
35+
</ItemGroup>
3336
</Project>

‎test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj‎

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

3-
<PropertyGroup>
4-
<IsPackable>false</IsPackable>
5-
<LangVersion>7.3</LangVersion>
6-
<Features>strict</Features>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
10-
</ItemGroup>
11-
<ItemGroup>
12-
<ProjectReference Include="..\..\src\SmartEnum.AutoFixture\SmartEnum.AutoFixture.csproj" />
13-
</ItemGroup>
14-
<ItemGroup>
15-
<PackageReference Include="coverlet.collector">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.msbuild" >
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
22-
</PackageReference>
23-
<PackageReference Include="FluentAssertions" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
25-
<PackageReference Include="xunit" />
26-
<PackageReference Include="xunit.runner.visualstudio">
27-
<PrivateAssets>all</PrivateAssets>
28-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
29-
</PackageReference>
30-
</ItemGroup>
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
<LangVersion>7.3</LangVersion>
6+
<Features>strict</Features>
7+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
11+
</ItemGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\src\SmartEnum.AutoFixture\SmartEnum.AutoFixture.csproj" />
14+
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="coverlet.collector">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="coverlet.msbuild" >
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="FluentAssertions" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
26+
<PackageReference Include="xunit" />
27+
<PackageReference Include="xunit.runner.visualstudio">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
30+
</PackageReference>
31+
</ItemGroup>
3132
</Project>

‎test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
55
<RootNamespace>Ardalis.SmartEnum.Dapper.IntegrationTests</RootNamespace>
6+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
67
</PropertyGroup>
78

89
<ItemGroup>

‎test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<RootNamespace>Ardalis.SmartEnum.Dapper.UnitTests</RootNamespace>
5+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
56
</PropertyGroup>
67

78
<ItemGroup>

‎test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj‎

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

33
<PropertyGroup>
4+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
45
<IsPackable>false</IsPackable>
56
</PropertyGroup>
67

‎test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<IsPackable>false</IsPackable>
4-
<LangVersion>7.3</LangVersion>
5-
<Features>strict</Features>
6-
</PropertyGroup>
2+
<PropertyGroup>
3+
<IsPackable>false</IsPackable>
4+
<LangVersion>7.3</LangVersion>
5+
<Features>strict</Features>
6+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
7+
</PropertyGroup>
78

8-
<ItemGroup>
9-
<ProjectReference Include="..\..\src\SmartEnum.JsonNet\SmartEnum.JsonNet.csproj" />
10-
</ItemGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\src\SmartEnum.JsonNet\SmartEnum.JsonNet.csproj" />
11+
</ItemGroup>
1112

12-
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" >
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
</PackageReference>
17-
<PackageReference Include="coverlet.msbuild" >
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="FluentAssertions" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
23-
<PackageReference Include="xunit" />
24-
<PackageReference Include="xunit.runner.visualstudio">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
27-
</PackageReference>
28-
</ItemGroup>
13+
<ItemGroup>
14+
<PackageReference Include="coverlet.collector" >
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="coverlet.msbuild" >
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
21+
</PackageReference>
22+
<PackageReference Include="FluentAssertions" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
24+
<PackageReference Include="xunit" />
25+
<PackageReference Include="xunit.runner.visualstudio">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
28+
</PackageReference>
29+
</ItemGroup>
2930
</Project>

‎test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<IsPackable>false</IsPackable>
4-
<LangVersion>7.3</LangVersion>
5-
<Features>strict</Features>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
9-
</ItemGroup>
10-
<ItemGroup>
11-
<ProjectReference Include="..\..\src\SmartEnum.MessagePack\SmartEnum.MessagePack.csproj" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<PackageReference Include="coverlet.collector">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="coverlet.msbuild">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
21-
</PackageReference>
22-
<PackageReference Include="FluentAssertions" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
24-
<PackageReference Include="xunit" />
25-
<PackageReference Include="xunit.runner.visualstudio">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
28-
</PackageReference>
29-
</ItemGroup>
2+
<PropertyGroup>
3+
<IsPackable>false</IsPackable>
4+
<LangVersion>7.3</LangVersion>
5+
<Features>strict</Features>
6+
<TargetFrameworks>net6;net7;net8</TargetFrameworks>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
10+
</ItemGroup>
11+
<ItemGroup>
12+
<ProjectReference Include="..\..\src\SmartEnum.MessagePack\SmartEnum.MessagePack.csproj" />
13+
</ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Include="coverlet.collector">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.msbuild">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
22+
</PackageReference>
23+
<PackageReference Include="FluentAssertions" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
25+
<PackageReference Include="xunit" />
26+
<PackageReference Include="xunit.runner.visualstudio">
27+
<PrivateAssets>all</PrivateAssets>
28+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
29+
</PackageReference>
30+
</ItemGroup>
3031
</Project>

0 commit comments

Comments
 (0)