diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 0edd1ac..3f5e648 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -1,32 +1,28 @@
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: [net10.0, net8.0]
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
+ 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 }}
-
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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"
+ }
+}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 8cb48b8..ed02ccd 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,7 +1,7 @@
- net8.0;net7.0;net6.0;netstandard2.0;net462
+ net10.0;net8.0;netstandard2.0;net462
enable
latest
true
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
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 6c40006..73c1221 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,7 +1,7 @@
- net8.0;net7.0;net6.0;net48
+ net10.0;net8.0;net48