Skip to content

Commit d41f91d

Browse files
thygesteffensenthygesteffensen
authored
Merge pull request #92 from delegateas/dev
Dev
2 parents 7852f4c + cfa3161 commit d41f91d

4 files changed

Lines changed: 44 additions & 26 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Testing
1414
strategy:
1515
matrix:
16-
dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
16+
dotnet: [ 'net6.0', 'net7.0' ]
1717
steps:
1818
- name: Checkout code base
1919
uses: actions/checkout@v2
@@ -29,8 +29,8 @@ jobs:
2929
runs-on: windows-latest
3030
name: Building
3131
strategy:
32-
matrix:
33-
dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
32+
matrix:
33+
dotnet: [ 'net6.0', 'net7.0' ]
3434
steps:
3535
- name: Checkout code base
3636
uses: actions/checkout@v2
@@ -59,17 +59,17 @@ jobs:
5959
name: Generate docs and publish artifacts
6060
needs: ['build']
6161
steps:
62-
- name: Get cache - net5.0
62+
- name: Get cache - net6.0
6363
uses: actions/cache@v2
6464
with:
65-
path: build/net5.0
66-
key: ${{ runner.os }}-build-net5.0
67-
68-
- name: Get cache - netcoreapp3.1
65+
path: build/net6.0
66+
key: ${{ runner.os }}-build-net6.0
67+
68+
- name: Get cache - net7.0
6969
uses: actions/cache@v2
7070
with:
71-
path: build/netcoreapp3.1
72-
key: ${{ runner.os }}-build-netcoreapp3.1
71+
path: build/net7.0
72+
key: ${{ runner.os }}-build-net7.0
7373

7474
- uses: actions/setup-dotnet@v3
7575
with:
@@ -79,14 +79,14 @@ jobs:
7979
run: dotnet new tool-manifest && dotnet tool install EAVFW.Extensions.Docs.TransformToMarkdown
8080

8181
- name: Generate docs
82-
run: dotnet tool run tomd --input build/net5.0/ExpressionEngine.xml --output Documentation.md
82+
run: dotnet tool run tomd --input build/net7.0/ExpressionEngine.xml --output Documentation.md
8383

8484
- name: Archive build to artifacts
8585
uses: actions/upload-artifact@v2.3.1
8686
with:
8787
name: Build
8888
path: |
89-
build/netcoreapp3.1/
90-
build/net5.0/
89+
build/net6.0/
90+
build/net7.0/
9191
Documentation.md
9292
retention-days: 5

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Testing
1313
strategy:
1414
matrix:
15-
dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
15+
dotnet: [ 'net6.0', 'net7.0' ]
1616
steps:
1717
- name: Checkout code base
1818
uses: actions/checkout@v2
@@ -79,7 +79,7 @@ jobs:
7979
if: ${{ env.RELEASE_VERSION }}
8080

8181
- name: Generate docs
82-
run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net5.0/ExpressionEngine.xml --output artifacts/Documentation.md
82+
run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net7.0/ExpressionEngine.xml --output artifacts/Documentation.md
8383
if: ${{ env.RELEASE_VERSION }}
8484

8585
- name: Release to GitHub and NuGet

‎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)