From 9a1405434440eab81af98f838adffd843cc60474 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 17 Jan 2016 10:55:54 +1300 Subject: [PATCH 1/2] -Updated README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b216c1a..56940a89 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ - [Homepage](http://www.newtonsoft.com/json) - [Documentation](http://www.newtonsoft.com/json/help) - [NuGet Package](https://www.nuget.org/packages/Newtonsoft.Json) +- [Release Notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Contributing Guidelines](CONTRIBUTING.md) - [License](LICENSE.md) -- [Stack Overflow](http://stackoverflow.com/questions/tagged/json.net) \ No newline at end of file +- [Stack Overflow](http://stackoverflow.com/questions/tagged/json.net) From 38ebf966558888fea659132dd39afd4632cb4189 Mon Sep 17 00:00:00 2001 From: Taylor Wood Date: Thu, 28 Jan 2016 22:02:39 -0600 Subject: [PATCH 2/2] Fix DU converter exception typo. --- .../Converters/DiscriminatedUnionConverterTests.cs | 2 +- Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs index fb0c7051..3e586218 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs @@ -252,7 +252,7 @@ namespace Newtonsoft.Json.Tests.Converters [Test] public void DeserializeBasicUnion_MismatchedFieldCount() { - ExceptionAssert.Throws(() => JsonConvert.DeserializeObject(@"{""Case"":""AUD"",""Fields"":[1]}"), "The number of field values does not match the number of properties definied by union 'AUD'. Path '', line 1, position 27."); + ExceptionAssert.Throws(() => JsonConvert.DeserializeObject(@"{""Case"":""AUD"",""Fields"":[1]}"), "The number of field values does not match the number of properties defined by union 'AUD'. Path '', line 1, position 27."); } [Test] diff --git a/Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs b/Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs index bffaba88..679a8324 100644 --- a/Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs +++ b/Src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs @@ -214,7 +214,7 @@ namespace Newtonsoft.Json.Converters { if (caseInfo.Fields.Length != fields.Count) { - throw JsonSerializationException.Create(reader, "The number of field values does not match the number of properties definied by union '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName)); + throw JsonSerializationException.Create(reader, "The number of field values does not match the number of properties defined by union '{0}'.".FormatWith(CultureInfo.InvariantCulture, caseName)); } for (int i = 0; i < fields.Count; i++)