From 7d20aa07d35561d497ff6a9b0555ecd7e079394c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:07:32 +0100 Subject: [PATCH 1/8] Added global.json with version 10.0.100 --- global.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..512142d --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.100", + "rollForward": "latestFeature" + } +} From ee4503957a49656c44bc183d1ebf4a0c88f45d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:16:52 +0100 Subject: [PATCH 2/8] Upgrade actions/checkout@v5 --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 0edd1ac..8a75699 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -15,7 +15,7 @@ jobs: name: Build And Test (${{ matrix.test-target-framework }}, ${{ matrix.build-configuration }}) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v5 - name: Setup DotNet uses: actions/setup-dotnet@v2 with: From d80cbf9655f6a3b0c0cb99ee167a85a1604d60fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:18:45 +0100 Subject: [PATCH 3/8] Upgrade actions/setup-dotnet@v5 --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 8a75699..fb49b90 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Setup DotNet - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.x From 4321749da3b898d30d083b77b0c34dfc8b609986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:29:08 +0100 Subject: [PATCH 4/8] dotnet can build run builds for multiple frameworks --- .github/workflows/build-and-test.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index fb49b90..dbb2d86 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -1,17 +1,17 @@ name: build-and-test on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] env: JsonDiffPatchSolutionPath: src/SystemTextJson.JsonDiffPatch.sln jobs: build: strategy: matrix: - build-configuration: [ Debug, Release ] - test-target-framework: [ net8.0, net7.0, net6.0 ] + build-configuration: [Debug, Release] + test-target-framework: [net8.0, net7.0, net6.0] name: Build And Test (${{ matrix.test-target-framework }}, ${{ matrix.build-configuration }}) runs-on: ubuntu-latest steps: @@ -19,14 +19,10 @@ jobs: - name: Setup DotNet uses: actions/setup-dotnet@v5 with: - dotnet-version: | - 8.x - 7.x - 6.x + global-json-file: global.json - name: Restore run: dotnet restore ${{ env.JsonDiffPatchSolutionPath }} - name: Build run: dotnet build -c ${{ matrix.build-configuration }} --no-restore ${{ env.JsonDiffPatchSolutionPath }} - name: Test run: dotnet test -c ${{ matrix.build-configuration }} -f ${{ matrix.test-target-framework }} --no-restore --no-build ${{ env.JsonDiffPatchSolutionPath }} - From 8b5b45c67db820d9b6320ef789560bfa512ebdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:34:41 +0100 Subject: [PATCH 5/8] Drop support for net6.0 and net7.0 --- .github/workflows/build-and-test.yaml | 2 +- src/Directory.Build.props | 2 +- test/Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index dbb2d86..ebdd347 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: build-configuration: [Debug, Release] - test-target-framework: [net8.0, net7.0, net6.0] + test-target-framework: [net8.0] name: Build And Test (${{ matrix.test-target-framework }}, ${{ matrix.build-configuration }}) runs-on: ubuntu-latest steps: diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 8cb48b8..9ea1e53 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.0;net462 + net8.0;netstandard2.0;net462 enable latest true diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 6c40006..778d16c 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;net48 + net8.0;net48 From c4a34d3e5ff549e7c7a87f530d0ee1b18049330f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:54:20 +0100 Subject: [PATCH 6/8] Add support net10.0 --- .github/workflows/build-and-test.yaml | 2 +- src/Directory.Build.props | 2 +- test/Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index ebdd347..3f5e648 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: build-configuration: [Debug, Release] - test-target-framework: [net8.0] + test-target-framework: [net10.0, net8.0] name: Build And Test (${{ matrix.test-target-framework }}, ${{ matrix.build-configuration }}) runs-on: ubuntu-latest steps: diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9ea1e53..ed02ccd 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0;netstandard2.0;net462 + net10.0;net8.0;netstandard2.0;net462 enable latest true diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 778d16c..73c1221 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0;net48 + net10.0;net8.0;net48 From 047a82835cf9d27da0f0e97dcb9d32caf346a2e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 12:56:09 +0100 Subject: [PATCH 7/8] Upgrade System.Text.Json to 10.0.0 --- .../SystemTextJson.JsonDiffPatch.csproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/SystemTextJson.JsonDiffPatch/SystemTextJson.JsonDiffPatch.csproj b/src/SystemTextJson.JsonDiffPatch/SystemTextJson.JsonDiffPatch.csproj index a92ba95..11d7669 100644 --- a/src/SystemTextJson.JsonDiffPatch/SystemTextJson.JsonDiffPatch.csproj +++ b/src/SystemTextJson.JsonDiffPatch/SystemTextJson.JsonDiffPatch.csproj @@ -7,7 +7,9 @@ SystemTextJson.JsonDiffPatch json;diff;compare;patch;system-text-json;jsondiffpatch - High-performance, low-allocating JSON object diff and patch extension for System.Text.Json. Support generating patch document in RFC 6902 JSON Patch format. Provides bonus DeepEquals and DeepClone methods. + High-performance, low-allocating JSON object diff and patch extension for + System.Text.Json. Support generating patch document in RFC 6902 JSON Patch format. Provides + bonus DeepEquals and DeepClone methods. @@ -15,12 +17,12 @@ - + - - + + \ No newline at end of file From 3ac098e693af874d158dd813e7644b81719f481f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96rjan=20Sj=C3=B6holm?= Date: Wed, 12 Nov 2025 13:48:05 +0100 Subject: [PATCH 8/8] Added slnx solution file --- SystemTextJson.JsonDiffPatch.slnx | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 SystemTextJson.JsonDiffPatch.slnx diff --git a/SystemTextJson.JsonDiffPatch.slnx b/SystemTextJson.JsonDiffPatch.slnx new file mode 100644 index 0000000..7a2a790 --- /dev/null +++ b/SystemTextJson.JsonDiffPatch.slnx @@ -0,0 +1,13 @@ + + + + + + + + + + + + +