Updated CI pipeline for compile target

bartoszlenar · May 22, 2024 · 207924a · 207924a
1 parent a4963a3
commit 207924a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -528,9 +528,7 @@ Before publishing, each release is tested on the ["latest" version](https://help
 
 using the upcoming, the current and all also the supported [LTS versions](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) of the underlying frameworks:
 
-* .NET 7.0 (RC1)
-* .NET 6.0
-* .NET Core 3.1
+* .NET 8.0
 * .NET Framework 4.8 (Windows only)
 
 ### Performance

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -15,21 +15,18 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        dotnet: ['3.1.x', '6.0.x', '7.0.100-rc.1.22431.12']
+        dotnet: ['8.0.5']
     runs-on: ${{ matrix.os }}
     name: Test on ${{ matrix.os }} using dotnet ${{ matrix.dotnet }}
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - name: Setup base dotnet sdk
-        uses: actions/setup-dotnet@v1
+        uses: actions/checkout@v4
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
-      - name: Setup target dotnet sdk
-        if: matrix.dotnet != '6.0.x'
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: ${{ matrix.dotnet }}
+          dotnet-version: |
+            8.0.5
+            ${{ matrix.dotnet }}
       - name: Init workflow variables
         run: pwsh .github/workflows/Init-WorkflowVariables.ps1
       - name: Compile
@@ -53,9 +50,9 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v2
       - name: Setup base dotnet sdk
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.5'
       - name: Init workflow variables
         run: pwsh .github/workflows/Init-WorkflowVariables.ps1
       - name: Compile
@@ -77,13 +74,9 @@ jobs:
         - name: Check out code
           uses: actions/checkout@v2
         - name: Setup base dotnet sdk
-          uses: actions/setup-dotnet@v1
-          with:
-            dotnet-version: '6.0.x'
-        - name: Setup dotnet sdk for global tool
-          uses: actions/setup-dotnet@v1
+          uses: actions/setup-dotnet@v4
           with:
-            dotnet-version: '3.1.x'
+            dotnet-version: '8.0.5'
         - name: Init workflow variables
           run: pwsh .github/workflows/Init-WorkflowVariables.ps1
         - name: Analyze code coverage
@@ -116,9 +109,9 @@ jobs:
         - name: Checking out code
           uses: actions/checkout@v2
         - name: Setup base dotnet sdk
-          uses: actions/setup-dotnet@v1
+          uses: actions/setup-dotnet@v4
           with:
-            dotnet-version: '6.0.x'
+            dotnet-version: '8.0.5'
         - name: Init workflow variables
           run: pwsh .github/workflows/Init-WorkflowVariables.ps1
         - name: Create package

diff --git a/build/Build.cs b/build/Build.cs
@@ -438,6 +438,11 @@ string GetFramework(string dotnet)
                 return "net7.0";
             }
 
+            if (dotnet.StartsWith("8.0.", StringComparison.Ordinal))
+            {
+                return "net8.0";
+            }
+
             Logger.Warn("Unrecognized dotnet SDK version: " + dotnet);
 
             return dotnet;

diff --git a/tests/Validot.Tests.Functional/.editorconfig b/tests/Validot.Tests.Functional/.editorconfig
@@ -13,6 +13,10 @@ dotnet_diagnostic.CA1310.severity = none
 dotnet_diagnostic.CA1707.severity = none
 dotnet_diagnostic.CA1847.severity = none
 dotnet_diagnostic.CA1852.severity = none
+dotnet_diagnostic.CA1859.severity = none
+dotnet_diagnostic.CA1860.severity = none
+dotnet_diagnostic.CA1861.severity = none
+dotnet_diagnostic.CA1866.severity = none
 dotnet_diagnostic.CA2237.severity = none
 
 dotnet_diagnostic.SA1122.severity = none

diff --git a/tests/Validot.Tests.Unit/.editorconfig b/tests/Validot.Tests.Unit/.editorconfig
@@ -41,6 +41,9 @@ dotnet_diagnostic.CA1825.severity = none
 dotnet_diagnostic.CA1845.severity = none
 dotnet_diagnostic.CA1847.severity = none
 dotnet_diagnostic.CA1852.severity = none
+dotnet_diagnostic.CA1859.severity = none
+dotnet_diagnostic.CA1860.severity = none
+dotnet_diagnostic.CA1861.severity = none
 
 dotnet_diagnostic.SA1118.severity = none
 dotnet_diagnostic.SA1122.severity = none