From b8954fabf8a29d6ecd1f69e814c188087385a208 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sun, 19 Nov 2023 14:38:29 +0100 Subject: [PATCH] (GH-146) Add .NET 8 and update to .NET 8.0.100 SDK * fixes #146 --- .github/workflows/build.yml | 12 ++++++++---- global.json | 2 +- src/LitJson.Source/LitJSON.Source.csproj | 2 +- src/LitJson/LitJSON.csproj | 2 +- test/LitJSON.Tests.csproj | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6bb01ec..86520da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,18 +14,22 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-latest, macos-latest] + os: [windows-latest, ubuntu-latest, macos-latest] steps: - name: Get the sources uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Install .NET Core SDK - uses: actions/setup-dotnet@v1 + - name: Install .NET SDK 6.0.x - 8.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 6.0.x + 8.0.x - name: Run Cake script - uses: cake-build/cake-action@v1 + uses: cake-build/cake-action@master env: GH_PACKAGES_NUGET_SOURCE: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json GH_PACKAGES_NUGET_APIKEY: ${{ secrets.GITHUB_TOKEN }} diff --git a/global.json b/global.json index dc86641..c182193 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.401", + "version": "8.0.100", "allowPrerelease": false, "rollForward": "feature" } diff --git a/src/LitJson.Source/LitJSON.Source.csproj b/src/LitJson.Source/LitJSON.Source.csproj index 7fb4387..f38a30a 100644 --- a/src/LitJson.Source/LitJSON.Source.csproj +++ b/src/LitJson.Source/LitJSON.Source.csproj @@ -1,6 +1,6 @@ - net6.0 + net6.0;net8.0 true false false diff --git a/src/LitJson/LitJSON.csproj b/src/LitJson/LitJSON.csproj index 614c7ff..688d750 100644 --- a/src/LitJson/LitJSON.csproj +++ b/src/LitJson/LitJSON.csproj @@ -1,7 +1,7 @@ - netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0 + netstandard2.1;netstandard2.0;net45;net48;netstandard1.5;net40;net35;net20;net6.0;net8.0 diff --git a/test/LitJSON.Tests.csproj b/test/LitJSON.Tests.csproj index e959852..348f683 100644 --- a/test/LitJSON.Tests.csproj +++ b/test/LitJSON.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net45 + net8.0;net6.0;net45 false