Skip to content

Commit 7a271e7

Browse files
fix: Re-added netcoreapp3.1
1 parent cfa3161 commit 7a271e7

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Testing
1414
strategy:
1515
matrix:
16-
dotnet: [ 'net6.0', 'net7.0' ]
16+
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
1717
steps:
1818
- name: Checkout code base
1919
uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
3030
name: Building
3131
strategy:
3232
matrix:
33-
dotnet: [ 'net6.0', 'net7.0' ]
33+
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
3434
steps:
3535
- name: Checkout code base
3636
uses: actions/checkout@v2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Testing
1313
strategy:
1414
matrix:
15-
dotnet: [ 'net6.0', 'net7.0' ]
15+
dotnet: [ 'netcoreapp3.1', 'net6.0', 'net7.0' ]
1616
steps:
1717
- name: Checkout code base
1818
uses: actions/checkout@v2

ExpressionEngine/ExpressionEngine.csproj

Lines changed: 7 additions & 1 deletion
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</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
55

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

14+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.31" />
16+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
17+
<PackageReference Include="Sprache" Version="2.3.1" />
18+
</ItemGroup>
19+
1420
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
1521
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
1622
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

ExpressionEngine/ExpressionGrammar.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5-
using ExpressionEngine.Functions.Base;
65
using ExpressionEngine.Rules;
76
using Sprache;
87

Test/Test.csproj

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

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

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

9+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.31" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
12+
<PackageReference Include="NUnit" Version="3.9.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
14+
<PackageReference Include="coverlet.collector" Version="3.2.0">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
</ItemGroup>
19+
920
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
1021
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
1122
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />

0 commit comments

Comments
 (0)