From 289359f19172eb4cb9746392dd80c90b0daddb3d Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 7 Sep 2014 10:14:34 +1200 Subject: [PATCH] -Fixed camelcase culture bug --- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json.Tests/TestFixtureBase.cs | 8 +++++--- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/Utilities/StringUtils.cs | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index ee252358..433e507d 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,4 +75,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.5.17706")] +[assembly: AssemblyFileVersion("6.0.5.17707")] diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 15044ce6..9c5a651c 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -120,9 +120,11 @@ namespace Newtonsoft.Json.Tests [SetUp] protected void TestSetup() { - //CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr"); - //Thread.CurrentThread.CurrentCulture = turkey; - //Thread.CurrentThread.CurrentUICulture = turkey; +//#if !NETFX_CORE +// CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr"); +// Thread.CurrentThread.CurrentCulture = turkey; +// Thread.CurrentThread.CurrentUICulture = turkey; +//#endif JsonConvert.DefaultSettings = null; } diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index bdad808f..b435b569 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -91,5 +91,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.5.17706")] +[assembly: AssemblyFileVersion("6.0.5.17707")] [assembly: CLSCompliant(true)] diff --git a/Src/Newtonsoft.Json/Utilities/StringUtils.cs b/Src/Newtonsoft.Json/Utilities/StringUtils.cs index 659b3657..975f1962 100644 --- a/Src/Newtonsoft.Json/Utilities/StringUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/StringUtils.cs @@ -173,7 +173,7 @@ namespace Newtonsoft.Json.Utilities #if !(NETFX_CORE || PORTABLE) chars[i] = char.ToLower(chars[i], CultureInfo.InvariantCulture); #else - chars[i] = char.ToLower(chars[i]); + chars[i] = char.ToLowerInvariant(chars[i]); #endif }