From b8954fabf8a29d6ecd1f69e814c188087385a208 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sun, 19 Nov 2023 14:38:29 +0100 Subject: [PATCH 1/3] (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 From 833b21d310e5438cb2174cb7a1ba3c66e8c18590 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sun, 19 Nov 2023 14:45:52 +0100 Subject: [PATCH 2/3] Update Azure Pipelines OS & SDK --- azure-pipelines.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index b6ea092..273e2c2 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -1,16 +1,22 @@ strategy: matrix: linux: - imageName: 'ubuntu-20.04' + imageName: 'ubuntu-latest' mac: - imageName: 'macos-10.15' + imageName: 'macos-latest' windows: - imageName: 'windows-2022' + imageName: 'windows-latest' pool: vmImage: $(imageName) steps: +- task: UseDotNet@2 + displayName: 'Use .NET SDK 6.0.x' + inputs: + packageType: sdk + version: '6.0.x' + - task: UseDotNet@2 displayName: 'Use .NET Core sdk' inputs: From 9c651e5f4cdd132fceca9e780f1f2fe518aae9af Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Sun, 19 Nov 2023 15:19:27 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 11 +++++++---- src/LitJson.Source/LitJSON.Source.csproj | 2 ++ src/LitJson/LitJSON.csproj | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b962f84..555d1ea 100644 --- a/README.md +++ b/README.md @@ -60,19 +60,19 @@ framework. #### Package manager ```PowerShell -Install-Package LitJson -Version 0.10.0 +Install-Package LitJson -Version 0.19.0 ``` #### .NET CLI ```PowerShell -dotnet add package LitJson --version 0.10.0 +dotnet add package LitJson --version 0.19.0 ``` #### Paket CLI ```PowerShell -paket add LitJson --version 0.10.0 +paket add LitJson --version 0.19.0 ``` Alternatively, just copy the whole tree of files under `src/LitJSON` to your @@ -81,11 +81,14 @@ own project's source tree and integrate it with your development environment. #### Requirements LitJSON currently targets and supports + +* .NET 8 * .NET 6 * .NET Standard 2.1 * .NET Standard 2.0 * .NET Standard 1.5 -* .NET Framework 4.5 and above +* .NET Framework 4.8 +* .NET Framework 4.5 * .NET Framework 4.0 * .NET Framework 3.5 (including SQLCLR, for which [WCOMAB/SqlServerSlackAPI](https://github.com/WCOMAB/SqlServerSlackAPI) is an example of) * .NET Framework 2.0 diff --git a/src/LitJson.Source/LitJSON.Source.csproj b/src/LitJson.Source/LitJSON.Source.csproj index f38a30a..6cc9348 100644 --- a/src/LitJson.Source/LitJSON.Source.csproj +++ b/src/LitJson.Source/LitJSON.Source.csproj @@ -18,11 +18,13 @@ https://github.com/LitJSON/litjson git JSON;Serializer + README.md + diff --git a/src/LitJson/LitJSON.csproj b/src/LitJson/LitJSON.csproj index 688d750..d021cf2 100644 --- a/src/LitJson/LitJSON.csproj +++ b/src/LitJson/LitJSON.csproj @@ -10,6 +10,7 @@ true true true + README.md @@ -79,4 +80,8 @@ It's quick and lean, without external dependencies. + + + +