Commit Graph

72 Commits (master)

Author SHA1 Message Date
William Bishop c2b2458823 Update JsonDeltaFormatterUnitTests.cs 2023-01-16 17:02:08 -06:00
William Bishop cf4373e441
Merge branch 'master' into master 2023-01-16 16:29:05 -06:00
William Bishop 483f897751
Merge pull request #58 from vooba/ObjectHash
Implementation of Object Hash
2023-01-16 16:27:49 -06:00
William Bishop baaad880cc
Merge pull request #61 from lingbohome/master
fix: escape the key with ~ or/in its the json Pointer name
2023-01-16 16:27:35 -06:00
dependabot[bot] f71f76e1de
Bump Newtonsoft.Json from 11.0.1 to 13.0.2 in /Src/JsonDiffPatchDotNet
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 11.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/11.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-07 21:25:04 +00:00
lingbo 9c557daf91 fix: escape the key with ~ or/in its the json Pointer name 2022-02-01 21:45:02 +08:00
Mathias Kolb dd7ace5338 feat: implement object hash
based on pull request #52
fixes #54, #42
2021-09-08 12:30:08 +02:00
Mathias Kolb 8f91145d61 fix: lcs backtrack function
function know search the matrix from bottom right to top left
2021-09-08 12:23:36 +02:00
Mathias Kolb c98bb3f378 Merge remote-tracking branch 'khiemnd777/master'
Conflicts:
              Src/JsonDiffPatchDotNet/JsonDiffPatch.cs
	Src/JsonDiffPatchDotNet/Options.cs
2021-07-20 08:48:11 +02:00
Adam McCoy 078ccf1ce2 Use stable sort 2020-11-29 00:46:13 +11:00
Adam McCoy 8cd59b6532 Add test to cover issue with unstable array sort 2020-11-29 00:43:18 +11:00
William Bishop d0abb0e7a7 Bump version to 2.3.0.0 2020-11-27 21:22:13 -06:00
Ryan Obray c40cf5dcff Resolves #34. This change extends the capabilities of the Option class that is leveraged by JsonDiffPatch to apply diff patches. This change introduces an ExcludePaths property that allows you to specify the paths of the properties that you want the patch process to ignore. This is useful for preventing Id or other sensitive fields from being updated. This change also introduces a DiffBehaviors property that allows you to modify the behavior of the diff patch process. Specifying a behavior of IgnoreMissingProperties will prevent the patch process from deleting properties from the source object that aren't specified in the patch object, creating an avenue for partial updates to be applied. Specifying a behavior of IgnoreNewProperties will pevent properties that exist in the patch object but not in the source object from being applied to the source object. The implementation is applied exactly in accordance to the comment I made on issue #34 - https://github.com/wbish/jsondiffpatch.net/issues/34 2020-10-25 04:33:33 -06:00
Adam McCoy 0f51947b82 Replicate reordering of remove operations from source codebase 2020-09-04 15:08:05 +10:00
Adam McCoy 7f193e8bd8 Refactor and replicate tests from source codebase 2020-09-04 15:06:06 +10:00
Adam McCoy e5b01525c9 Add test verifying array add operations are ordered correctly 2020-06-09 11:51:03 +10:00
William Bishop da7a89f463 Bump version to 2.2 2020-03-30 18:53:55 -07:00
Justin Hopper 03464117d3 Removed editorconfig from sln 2020-03-30 14:42:57 -05:00
Justin Hopper ac6b5dc792 Moved editorconfig to root 2020-03-30 14:05:27 -05:00
Justin Hopper 4091654196 Updated formatting to match master 2020-03-30 14:03:19 -05:00
Justin Hopper 14ed050e05 Added JsonDeltaFormatter 2020-03-30 13:58:31 -05:00
Matt Grimwade ad3173410a
Correct `Options.ArrayDiff` documentation
The doc comment for `Options.ArrayDiff` states that the default setting is `Simple`, but it is actually `Efficient` (line 7).
2020-02-19 10:26:09 +00:00
khiemnd777 5e2808445a [add] item match serves object hash 2018-10-05 11:49:32 +07:00
Cornelius Putzler 25b82d8ee0
update json ref 2018-03-09 17:27:04 +01:00
William Bishop cf7dfce8bb UnitTests csproj tweak 2018-03-03 18:33:15 -08:00
William Bishop dcf4a3e490 Bump Version 2.1.0.0 2018-03-03 13:35:45 -08:00
William Bishop 0c1c7adf9f VS2017 Builds
Use Visual Studio 2017 format. Conslidate all sln/csproj into single
version.
2018-03-03 13:29:49 -08:00
William Bishop af11448a77 Fix for #17
When unpatching, unpatch list should be recreated in reverse order and
also the Patch object needs to have the length and start information.
2018-03-03 11:58:28 -08:00
William Bishop 8f22916a49 Fix assembly name 2018-03-03 11:47:46 -08:00
Daniel Crenna 623fdb4c86 add project files for clean builds for .NET Standard (so it can be used by .NET Core 2.0 / .NET Standard via NuGet without .NET 4.5 project references) 2017-12-08 21:18:03 -05:00
William Bishop a5cb3b66fb Update to v2.0.2.0 2017-11-18 01:16:24 -08:00
William Bishop 9bd9d2f302 Fix #16
- When unpatching arrays, modifications need to be done before
additions/deletes
- When performing array diffs and nothing matches, we should do object
diffs starting from the front of both arrats, instead of the back.
2017-11-18 01:13:21 -08:00
William Bishop 901ec82281 Fix build break 2017-06-26 09:48:44 -07:00
William Bishop d0b4916d7d Formatting 2017-06-26 08:51:43 -07:00
William Bishop a48b847b29 Update NUnit version
Update NUnit version from 3.0.1 to 3.6.1
2017-05-29 12:08:15 -07:00
William Bishop b2394f9d40 Unit tests
Add missing NUnit3TestAdapter package reference
2017-05-29 12:04:54 -07:00
William Bishop 04d2f2c10c Add unit tests to roslyn sln 2017-03-26 19:59:19 -07:00
William Bishop a36465a229 strong name signing 2017-03-25 00:26:48 -07:00
William Bishop 0323ab4c3a Netstandard support
Fixes issues #4 and #12
2017-03-24 23:56:38 -07:00
William Bishop 253fff5829 Netstandard
Get netstandard project building. Refactor solution layout.
2017-03-24 21:16:01 -07:00
William Bishop 008d943684 Rev version to 1.0.7.0 2017-03-03 14:52:41 -08:00
Nikita Golovin 672ef34066 Fix Patch and Unpatch operations when JsonConvert.DefaultSettings is not null 2017-03-03 10:18:58 +02:00
Nikita Golovin 38328ec40c Fix StackOverflowException if diff'ing large array 2017-02-21 09:26:43 +02:00
William Bishop b38d9159af Add build scripts
Add a script to build all flavors and configurations. Add a script to
pack the nuget file with the correct files.
2017-02-12 22:16:39 -08:00
William Bishop 4ec9bc054b Fix for Efficient String Patching
The implementation for patch and unpatch for diff_match_patch textlines
was completely incorrect. Unit tests were not covering because previous
text cases were using a text length shorter than the minimum required to
execute the efficient string matchc ode path. Unit test coverage has
been added for the fix. Version has been bumped to 1.0.5.1.

This resolves issue #6. Thanks to @arbitertl for reporting the issue.
2016-11-29 14:03:52 -08:00
William Bishop 74219fc286 Bump version 1.0.5.0 2016-02-28 22:32:48 -08:00
William Bishop 99bdcc055d Fix #3 Array Diffs
JToken.Equals are reference equality checks in Newtonsoft.Json, we
should be using JToken.DeepEquals.

This means we were not properly returning null patch documents when
doing diffs of identical JArrays that contained JObjects.

Fix #3
2016-02-28 21:39:33 -08:00
William Bishop 870bfa713e Build for UWA (Portable .NET 4.5) 2016-02-14 00:15:47 -08:00
William Bishop 2e451d95b4 Small meta tweaks
- Version bump
- A couple more unit tests cases for array patching/unpatching
- Fix comments
2016-02-06 18:20:16 -08:00
William Bishop 598a396926 Finish support for array move for patch & unpatch 2016-02-06 17:41:40 -08:00