Upgrade test projects to use net8.0 (#87)

Rubjerg · Aug 27, 2024 · 03597fb · 03597fb
1 parent 577b9ff
commit 03597fb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 21 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "nunit.consolerunner.netcore": {
-      "version": "3.15.2",
+      "version": "3.17.0",
       "commands": [
         "nunit"
       ]
     }
   }
-}
+}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -53,41 +53,39 @@ jobs:
     - name: Check if code is formatted
       run: dotnet format whitespace --verify-no-changes -v diag Rubjerg.Graphviz.NugetTests.sln
 
+    - name: Run Unittests Without Coverage (.NET 8)
+      run: bash run-tests-netcore.sh Rubjerg.Graphviz.Test\Rubjerg.Graphviz.Test.csproj
+
     - name: Run Unittests With Coverage Calculation (.NET 4.8)
-
       run: packages\opencover\4.7.1221\tools\OpenCover.Console.exe -skipautoprops -returntargetcode -register '-target:bash.exe' -targetargs:'nunit-console.sh Rubjerg.Graphviz.Test\bin\x64\Release\net48\Rubjerg.Graphviz.Test.dll'  '-filter:+[Rubjerg*]* -[Rubjerg.Graphviz.Test*]*'
 
-    - name: Run Unittests With Coverage Calculation (.NET 6)
-
-      run: packages\opencover\4.7.1221\tools\OpenCover.Console.exe -skipautoprops -returntargetcode -register '-target:bash.exe' -targetargs:'nunit-console-netcore.sh Rubjerg.Graphviz.Test\bin\x64\Release\net6.0\Rubjerg.Graphviz.Test.dll'  '-filter:+[Rubjerg*]* -[Rubjerg.Graphviz.Test*]*'
-
     - name: Upload Coverage data
       run: |
         echo "C:\msys64\usr\bin" >> $GITHUB_PATH
         Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
         bash codecov.sh -f "results.xml"
 
+    - name: Run Transitive Tests (.NET 8)
+      run: bash run-tests-netcore.sh Rubjerg.Graphviz.TransitiveTest\Rubjerg.Graphviz.TransitiveTest.csproj
+
     - name: Run Transitive Tests (.NET 4.8)
       run: bash nunit-console.sh Rubjerg.Graphviz.TransitiveTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveTest.dll
 
-    - name: Run Transitive Tests (.NET 6)
-      run: bash nunit-console-netcore.sh Rubjerg.Graphviz.TransitiveTest\bin\x64\Release\net6.0\Rubjerg.Graphviz.TransitiveTest.dll
-
     - name: Restore NuGet Packages for Nuget Tests (from local package source)
       run: nuget restore Rubjerg.Graphviz.NugetTests.sln
 
     - name: Build Nuget Test Solution
       run: msbuild Rubjerg.Graphviz.NugetTests.sln /p:Configuration=Release
 
+    - name: Run Nuget Tests (.NET 8)
+      run: bash run-tests-netcore.sh Rubjerg.Graphviz.NugetTest\Rubjerg.Graphviz.NugetTest.csproj
+
     - name: Run Nuget Tests (.NET 4.8)
       run: bash nunit-console.sh Rubjerg.Graphviz.NugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.NugetTest.dll
 
-    - name: Run Nuget Tests (.NET 6)
-      run: bash nunit-console.sh Rubjerg.Graphviz.NugetTest\bin\x64\Release\net6.0\Rubjerg.Graphviz.NugetTest.dll
-
     - name: Run Transitive Nuget Tests (.NET 4.8)
       run: bash nunit-console.sh Rubjerg.Graphviz.TransitiveNugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveNugetTest.dll
 
-    - name: Run Transitive Nuget Tests (.NET 6)
-      run: bash nunit-console.sh Rubjerg.Graphviz.TransitiveNugetTest\bin\x64\Release\net6.0\Rubjerg.Graphviz.TransitiveNugetTest.dll
+    - name: Run Transitive Nuget Tests (.NET 8)
+      run: bash nunit-console.sh Rubjerg.Graphviz.TransitiveNugetTest\bin\x64\Release\net8.0\Rubjerg.Graphviz.TransitiveNugetTest.dll
 
diff --git a/Rubjerg.Graphviz.NugetTest/Rubjerg.Graphviz.NugetTest.csproj b/Rubjerg.Graphviz.NugetTest/Rubjerg.Graphviz.NugetTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
     <Authors>Chiel ten Brinke</Authors>

diff --git a/Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj b/Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
     <Authors>Chiel ten Brinke</Authors>

diff --git a/Rubjerg.Graphviz.TransitiveNugetTest/Rubjerg.Graphviz.TransitiveNugetTest.csproj b/Rubjerg.Graphviz.TransitiveNugetTest/Rubjerg.Graphviz.TransitiveNugetTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
     <Authors>Chiel ten Brinke</Authors>

diff --git a/Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj b/Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
     <Authors>Chiel ten Brinke</Authors>

diff --git a/nunit-console-netcore.sh b/nunit-console-netcore.sh
diff --git a/run-tests-netcore.sh b/run-tests-netcore.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+dotnet test  -p:Platform=x64 --no-build -c Release -f net8.0 -v d --filter "Category != Flaky & Category != Slow" "$@"