Merge pull request #92 from delegateas/dev

Dev
delegateas · Nov 17, 2022 · d41f91d · d41f91d
2 parents 7852f4c + cfa3161
commit d41f91d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     name: Testing
     strategy:
       matrix:
-        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
+        dotnet: [ 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
@@ -29,8 +29,8 @@ jobs:
     runs-on: windows-latest
     name: Building
     strategy:
-      matrix: 
-        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
+      matrix:
+        dotnet: [ 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
@@ -59,17 +59,17 @@ jobs:
     name: Generate docs and publish artifacts
     needs: ['build']
     steps:
-      - name: Get cache - net5.0
+      - name: Get cache - net6.0
         uses: actions/cache@v2
         with:
-          path: build/net5.0
-          key: ${{ runner.os }}-build-net5.0
-
-      - name: Get cache - netcoreapp3.1
+          path: build/net6.0
+          key: ${{ runner.os }}-build-net6.0
+          
+      - name: Get cache - net7.0
         uses: actions/cache@v2
         with:
-          path: build/netcoreapp3.1
-          key: ${{ runner.os }}-build-netcoreapp3.1
+          path: build/net7.0
+          key: ${{ runner.os }}-build-net7.0
 
       - uses: actions/setup-dotnet@v3
         with:
@@ -79,14 +79,14 @@ jobs:
         run: dotnet new tool-manifest && dotnet tool install EAVFW.Extensions.Docs.TransformToMarkdown
 
       - name: Generate docs
-        run: dotnet tool run tomd --input build/net5.0/ExpressionEngine.xml --output Documentation.md
+        run: dotnet tool run tomd --input build/net7.0/ExpressionEngine.xml --output Documentation.md
 
       - name: Archive build to artifacts
         uses: actions/[email protected]
         with:
           name: Build
           path: |
-            build/netcoreapp3.1/
-            build/net5.0/
+            build/net6.0/
+            build/net7.0/
             Documentation.md
           retention-days: 5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Testing
     strategy:
       matrix:
-        dotnet: [ 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
+        dotnet: [ 'net6.0', 'net7.0' ]
     steps:
       - name: Checkout code base
         uses: actions/checkout@v2
@@ -79,7 +79,7 @@ jobs:
         if: ${{ env.RELEASE_VERSION }}
 
       - name: Generate docs
-        run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net5.0/ExpressionEngine.xml --output artifacts/Documentation.md
+        run: dotnet tool run tomd --input ExpressionEngine/bin/Release/net7.0/ExpressionEngine.xml --output artifacts/Documentation.md
         if: ${{ env.RELEASE_VERSION }}
 
       - name: Release to GitHub and NuGet

diff --git a/ExpressionEngine/ExpressionEngine.csproj b/ExpressionEngine/ExpressionEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 
         <PackageId>Delegate.ExpressionEngine</PackageId>
         <Authors>Delegate A/S,thygesteffensen</Authors>
@@ -11,12 +11,19 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-      <PackageReference Include="Sprache" Version="2.3.1" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Sprache" Version="2.3.1" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Sprache" Version="2.3.1" />
     </ItemGroup>
 
+
     <ItemGroup>
       <Folder Include="Functions\Implementations\Miscellaneous" />
     </ItemGroup>

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -1,22 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-        <PackageReference Include="NUnit" Version="3.13.2" />
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
-        <PackageReference Include="coverlet.collector" Version="3.0.3">
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\ExpressionEngine\ExpressionEngine.csproj" />
     </ItemGroup>