Add net8.0 support

spectresystems · Nov 14, 2023 · 4845985 · 4845985
1 parent fc8bfb6
commit 4845985
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 58 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,25 +14,15 @@ jobs:
   build:
     name: Build
     if: "!contains(github.event.head_commit.message, 'skip-ci')"
-    strategy:
-      matrix:
-        kind: ['linux', 'windows', 'macOS']
-        include:
-          - kind: linux
-            os: ubuntu-latest
-          - kind: windows
-            os: windows-latest
-          - kind: macOS
-            os: macos-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
 
       - name: Build
         shell: bash

diff --git a/.github/workflows/on-push-do-docs.yml b/.github/workflows/on-push-do-docs.yml
@@ -1,15 +1,23 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: on-push-do-docs
+
 on:
   push:
+
 jobs:
+
+  ###################################################
+  # DOCS
+  ###################################################
+
   docs:
     runs-on: windows-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
 
     - name: Run MarkdownSnippets
       run: |

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Publish
 
 on:
@@ -13,56 +14,22 @@ env:
 
 jobs:
 
-  ###################################################
-  # BUILD
-  ###################################################
-
-  build:
-    name: Build
-    if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
-    strategy:
-      matrix:
-        kind: ['linux', 'windows', 'macOS']
-        include:
-          - kind: linux
-            os: ubuntu-latest
-          - kind: windows
-            os: windows-latest
-          - kind: macOS
-            os: macos-latest
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
-
-      - name: Build
-        shell: bash
-        run: |
-          dotnet tool restore
-          dotnet cake
-
   ###################################################
   # PUBLISH
   ###################################################
 
   publish:
     name: Publish
-    needs: [build]
     if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v3
 
       - name: Publish
         shell: bash

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.3.0",
+      "version": "3.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/global.json b/global.json
@@ -1,7 +1,6 @@
 {
-  "projects": [ "src" ],
   "sdk": {
-    "version": "7.0.403",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -29,10 +29,10 @@
 
   <ItemGroup Label="Package References">
     <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.6.1">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/src/Spectre.Verify.Extensions.Tests/Spectre.Verify.Extensions.Tests.csproj b/src/Spectre.Verify.Extensions.Tests/Spectre.Verify.Extensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Spectre.Verify.Extensions/Spectre.Verify.Extensions.csproj b/src/Spectre.Verify.Extensions/Spectre.Verify.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>