Skip to content

Commit aee3f9b

Browse files
fix: Remove netcoreapp3.1 and net5.0 and specify dependencies to specific targets
1 parent eaa53f0 commit aee3f9b

2 files changed

Lines changed: 29 additions & 11 deletions

File tree

ExpressionEngine/ExpressionEngine.csproj

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

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

66
<PackageId>Delegate.ExpressionEngine</PackageId>
77
<Authors>Delegate A/S,thygesteffensen</Authors>
@@ -11,12 +11,19 @@
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
</PropertyGroup>
1313

14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
16-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
17-
<PackageReference Include="Sprache" Version="2.3.1" />
14+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
16+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
17+
<PackageReference Include="Sprache" Version="2.3.1" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
22+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
23+
<PackageReference Include="Sprache" Version="2.3.1" />
1824
</ItemGroup>
1925

26+
2027
<ItemGroup>
2128
<Folder Include="Functions\Implementations\Miscellaneous" />
2229
</ItemGroup>

Test/Test.csproj

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

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

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

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
12-
<PackageReference Include="NUnit" Version="3.13.2" />
9+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
12+
<PackageReference Include="NUnit" Version="3.13.3" />
1313
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
14-
<PackageReference Include="coverlet.collector" Version="3.0.3">
14+
<PackageReference Include="coverlet.collector" Version="3.2.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
1818
</ItemGroup>
1919

20+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
23+
<PackageReference Include="NUnit" Version="3.13.3" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
25+
<PackageReference Include="coverlet.collector" Version="3.2.0">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28+
</PackageReference>
29+
</ItemGroup>
30+
2031
<ItemGroup>
2132
<ProjectReference Include="..\ExpressionEngine\ExpressionEngine.csproj" />
2233
</ItemGroup>

0 commit comments

Comments
 (0)