-Fixed camelcase culture bug

This commit is contained in:
James Newton-King
2014-09-07 10:14:34 +12:00
parent 7e29a7e489
commit 289359f191
4 changed files with 8 additions and 6 deletions
@@ -75,4 +75,4 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.5.17706")] [assembly: AssemblyFileVersion("6.0.5.17707")]
+5 -3
View File
@@ -120,9 +120,11 @@ namespace Newtonsoft.Json.Tests
[SetUp] [SetUp]
protected void TestSetup() protected void TestSetup()
{ {
//CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr"); //#if !NETFX_CORE
//Thread.CurrentThread.CurrentCulture = turkey; // CultureInfo turkey = CultureInfo.CreateSpecificCulture("tr");
//Thread.CurrentThread.CurrentUICulture = turkey; // Thread.CurrentThread.CurrentCulture = turkey;
// Thread.CurrentThread.CurrentUICulture = turkey;
//#endif
JsonConvert.DefaultSettings = null; JsonConvert.DefaultSettings = null;
} }
@@ -91,5 +91,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.5.17706")] [assembly: AssemblyFileVersion("6.0.5.17707")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
+1 -1
View File
@@ -173,7 +173,7 @@ namespace Newtonsoft.Json.Utilities
#if !(NETFX_CORE || PORTABLE) #if !(NETFX_CORE || PORTABLE)
chars[i] = char.ToLower(chars[i], CultureInfo.InvariantCulture); chars[i] = char.ToLower(chars[i], CultureInfo.InvariantCulture);
#else #else
chars[i] = char.ToLower(chars[i]); chars[i] = char.ToLowerInvariant(chars[i]);
#endif #endif
} }