-Fixed time zone unit test failure

-Removed Metro IDictionary copy
-Fixed Metro build
This commit is contained in:
James Newton-King
2012-06-08 05:21:58 -07:00
parent 0ba52bbf13
commit 55854f1682
67 changed files with 258 additions and 360 deletions
@@ -29,9 +29,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
using System.IO; using System.IO;
@@ -29,9 +29,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
using System.IO; using System.IO;
@@ -36,9 +36,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Converters namespace Newtonsoft.Json.Tests.Converters
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Converters namespace Newtonsoft.Json.Tests.Converters
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -28,9 +28,9 @@ using System;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
#if !NETFX_CORE #if !NETFX_CORE
using System.Data; using System.Data;
@@ -40,9 +40,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -28,9 +28,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
@@ -28,9 +28,9 @@ using System.Collections.Generic;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Tests.Serialization; using Newtonsoft.Json.Tests.Serialization;
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Utilities;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Converters namespace Newtonsoft.Json.Tests.Converters
@@ -39,9 +39,9 @@ using Newtonsoft.Json.Utilities;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -28,9 +28,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Converters namespace Newtonsoft.Json.Tests.Converters
@@ -31,9 +31,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
+3 -3
View File
@@ -28,9 +28,9 @@ using Newtonsoft.Json.Schema;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests namespace Newtonsoft.Json.Tests
@@ -26,9 +26,9 @@
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests namespace Newtonsoft.Json.Tests
+3 -3
View File
@@ -40,9 +40,9 @@ using Newtonsoft.Json.Utilities;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests namespace Newtonsoft.Json.Tests
@@ -30,9 +30,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
@@ -32,9 +32,9 @@ using System.Xml;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
@@ -33,9 +33,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using System.Xml; using System.Xml;
using System.Xml.Schema; using System.Xml.Schema;
@@ -33,9 +33,9 @@ using Newtonsoft.Json.Linq;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
using System.Globalization; using System.Globalization;
@@ -29,9 +29,9 @@ using System.ComponentModel;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if NET20 #if NET20
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Linq;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using System.IO; using System.IO;
#if NET20 #if NET20
@@ -31,9 +31,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.IO; using System.IO;
+3 -3
View File
@@ -28,9 +28,9 @@ using System.Collections.Generic;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
#if NET20 #if NET20
@@ -31,9 +31,9 @@ using Newtonsoft.Json.Linq;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using System.IO; using System.IO;
+3 -3
View File
@@ -26,9 +26,9 @@
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -27,9 +27,9 @@ using System.Collections.Generic;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -29,9 +29,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
@@ -30,9 +30,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.IO; using System.IO;
@@ -29,9 +29,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
@@ -29,9 +29,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.Globalization; using System.Globalization;
@@ -30,9 +30,9 @@ using System.Globalization;
using System.IO; using System.IO;
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
+54 -54
View File
@@ -1,54 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest"> <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
<Identity Name="416af769-23b3-4c62-bc3f-d2f756b8f292" <Identity Name="c15d5e96-7d57-4336-ae9e-a1a4e6ac522a"
Publisher="CN=James" Publisher="CN=James"
Version="1.0.0.0" /> Version="1.0.0.0" />
<Properties> <Properties>
<DisplayName>UnitTestProject1</DisplayName> <DisplayName>Newtonsoft.Json.Tests.Metro</DisplayName>
<PublisherDisplayName>James</PublisherDisplayName> <PublisherDisplayName>James</PublisherDisplayName>
<Logo>Images\UnitTestStoreLogo.png</Logo> <Logo>Images\UnitTestStoreLogo.png</Logo>
<Description>UnitTestProject1</Description> <Description>Newtonsoft.Json.Tests.Metro</Description>
</Properties> </Properties>
<Prerequisites> <Prerequisites>
<OSMinVersion>6.2</OSMinVersion> <OSMinVersion>6.2</OSMinVersion>
<OSMaxVersionTested>6.2</OSMaxVersionTested> <OSMaxVersionTested>6.2</OSMaxVersionTested>
</Prerequisites> </Prerequisites>
<Resources> <Resources>
<Resource Language="x-generate"/> <Resource Language="x-generate"/>
</Resources> </Resources>
<Applications> <Applications>
<Application Id="vstest.executionengine.App" <Application Id="vstest.executionengine.App"
Executable="vstest.executionengine.appcontainer.exe" Executable="vstest.executionengine.appcontainer.exe"
EntryPoint="vstest.executionengine.App"> EntryPoint="vstest.executionengine.App">
<VisualElements <VisualElements
DisplayName="NoUIEntryPoints" DisplayName="NoUIEntryPoints"
Logo="Images\UnitTestLogo.png" Logo="Images\UnitTestLogo.png"
SmallLogo="Images\UnitTestSmallLogo.png" SmallLogo="Images\UnitTestSmallLogo.png"
Description="vstest.executionengine.App" Description="vstest.executionengine.App"
ForegroundText="light" ForegroundText="light"
BackgroundColor="#0084FF"> BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" /> <SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements> </VisualElements>
</Application> </Application>
<Application Id="vstest.executionengine.x86.App" <Application Id="vstest.executionengine.x86.App"
Executable="vstest.executionengine.appcontainer.x86.exe" Executable="vstest.executionengine.appcontainer.x86.exe"
EntryPoint="vstest.executionengine.x86.App"> EntryPoint="vstest.executionengine.x86.App">
<VisualElements <VisualElements
DisplayName="NoUIEntryPoints" DisplayName="NoUIEntryPoints"
Logo="Images\UnitTestLogo.png" Logo="Images\UnitTestLogo.png"
SmallLogo="Images\UnitTestSmallLogo.png" SmallLogo="Images\UnitTestSmallLogo.png"
Description="vstest.executionengine.x86.App" Description="vstest.executionengine.x86.App"
ForegroundText="light" ForegroundText="light"
BackgroundColor="#0084FF"> BackgroundColor="#0084FF">
<SplashScreen Image="Images\UnitTestSplashScreen.png" /> <SplashScreen Image="Images\UnitTestSplashScreen.png" />
</VisualElements> </VisualElements>
</Application> </Application>
</Applications> </Applications>
</Package> </Package>
@@ -72,5 +72,5 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
#if !PocketPC #if !PocketPC
[assembly: AssemblyFileVersion("4.5.6.14930")] [assembly: AssemblyFileVersion("4.5.6.15008")]
#endif #endif
@@ -28,9 +28,9 @@ using System.Collections.Generic;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Schema; using Newtonsoft.Json.Schema;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -27,9 +27,9 @@ using System;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Schema; using Newtonsoft.Json.Schema;
using System.IO; using System.IO;
@@ -34,9 +34,9 @@ using Newtonsoft.Json.Utilities;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Schema; using Newtonsoft.Json.Schema;
using System.IO; using System.IO;
@@ -27,9 +27,9 @@ using Newtonsoft.Json.Schema;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Schema namespace Newtonsoft.Json.Tests.Schema
@@ -27,9 +27,9 @@ using Newtonsoft.Json.Schema;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Schema namespace Newtonsoft.Json.Tests.Schema
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Schema;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Schema namespace Newtonsoft.Json.Tests.Schema
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Serialization;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -28,9 +28,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -29,9 +29,9 @@ using System.Runtime.Serialization;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
#if NET20 #if NET20
using Newtonsoft.Json.Utilities.LinqBridge; using Newtonsoft.Json.Utilities.LinqBridge;
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -39,9 +39,9 @@ using Newtonsoft.Json.Utilities;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -33,9 +33,9 @@ using Newtonsoft.Json.Converters;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -26,9 +26,9 @@
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Tests.TestObjects;
@@ -40,9 +40,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
@@ -6319,9 +6319,9 @@ Parameter name: value",
Venue = "Gryphon Theatre", Venue = "Gryphon Theatre",
Performances = new List<DateTime> Performances = new List<DateTime>
{ {
DateTime.Parse("8 Tue May 2012, 6:30pm"), JsonConvert.ConvertJavaScriptTicksToDateTime(1336458600000),
DateTime.Parse("9 Wed May 2012, 6:30pm"), JsonConvert.ConvertJavaScriptTicksToDateTime(1336545000000),
DateTime.Parse("10 Thu May 2012, 8:00pm") JsonConvert.ConvertJavaScriptTicksToDateTime(1336636800000)
} }
}; };
@@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -29,9 +29,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -32,9 +32,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -27,9 +27,9 @@ using System.Collections.Generic;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests.Serialization namespace Newtonsoft.Json.Tests.Serialization
@@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using System.IO; using System.IO;
using ErrorEventArgs=Newtonsoft.Json.Serialization.ErrorEventArgs; using ErrorEventArgs=Newtonsoft.Json.Serialization.ErrorEventArgs;
@@ -34,9 +34,9 @@ using Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
@@ -39,9 +39,9 @@ using global::Newtonsoft.Json.Tests.TestObjects;
#if !NETFX_CORE #if !NETFX_CORE
using global::NUnit.Framework; using global::NUnit.Framework;
#else #else
using global::Microsoft.VisualStudio.TestTools.UnitTesting; using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using global::Newtonsoft.Json.Utilities; using global::Newtonsoft.Json.Utilities;
using global::System.Net; using global::System.Net;
@@ -33,9 +33,9 @@ using System.Text;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
#if !(SILVERLIGHT || NETFX_CORE || NET20) #if !(SILVERLIGHT || NETFX_CORE || NET20)
using System.Runtime.Serialization.Json; using System.Runtime.Serialization.Json;
@@ -28,9 +28,9 @@ using System.Reflection;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
namespace Newtonsoft.Json.Tests namespace Newtonsoft.Json.Tests
+3 -3
View File
@@ -36,9 +36,9 @@ using System.Threading;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using TestMethod = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using TestMethod = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
using System.Collections; using System.Collections;
@@ -29,9 +29,9 @@ using System.Reflection;
#if !NETFX_CORE #if !NETFX_CORE
using NUnit.Framework; using NUnit.Framework;
#else #else
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using Newtonsoft.Json.Utilities; using Newtonsoft.Json.Utilities;
@@ -30,9 +30,9 @@ using global::System.Runtime.Serialization.Formatters;
#if !NETFX_CORE #if !NETFX_CORE
using global::NUnit.Framework; using global::NUnit.Framework;
#else #else
using global::Microsoft.VisualStudio.TestTools.UnitTesting; using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
#endif #endif
using global::Newtonsoft.Json.Utilities; using global::Newtonsoft.Json.Utilities;
@@ -90,7 +90,7 @@ using System.Security;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("4.5.0.0")] [assembly: AssemblyVersion("4.5.0.0")]
#if !PocketPC #if !PocketPC
[assembly: AssemblyFileVersion("4.5.6.14930")] [assembly: AssemblyFileVersion("4.5.6.15008")]
#endif #endif
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
@@ -94,20 +94,16 @@ namespace Newtonsoft.Json.Serialization
{ {
CreatedType = ReflectionUtils.MakeGenericType(typeof(Dictionary<,>), keyType, valueType); CreatedType = ReflectionUtils.MakeGenericType(typeof(Dictionary<,>), keyType, valueType);
} }
#if !NETFX_CORE
else if (UnderlyingType == typeof(IDictionary)) else if (UnderlyingType == typeof(IDictionary))
{ {
CreatedType = typeof (Dictionary<object, object>); CreatedType = typeof (Dictionary<object, object>);
} }
#endif
} }
internal IWrappedDictionary CreateWrapper(object dictionary) internal IWrappedDictionary CreateWrapper(object dictionary)
{ {
#if !(NETFX_CORE)
if (dictionary is IDictionary && (DictionaryValueType == null || !_isDictionaryValueTypeNullableType)) if (dictionary is IDictionary && (DictionaryValueType == null || !_isDictionaryValueTypeNullableType))
return new DictionaryWrapper<object, object>((IDictionary)dictionary); return new DictionaryWrapper<object, object>((IDictionary)dictionary);
#endif
if (_genericWrapperCreator == null) if (_genericWrapperCreator == null)
{ {
@@ -102,10 +102,8 @@ namespace Newtonsoft.Json.Utilities
{ {
ValidationUtils.ArgumentNotNull(type, "type"); ValidationUtils.ArgumentNotNull(type, "type");
#if !NETFX_CORE
if (typeof(IDictionary).IsAssignableFrom(type)) if (typeof(IDictionary).IsAssignableFrom(type))
return true; return true;
#endif
if (ReflectionUtils.ImplementsGenericDefinition(type, typeof (IDictionary<,>))) if (ReflectionUtils.ImplementsGenericDefinition(type, typeof (IDictionary<,>)))
return true; return true;
@@ -159,12 +157,10 @@ namespace Newtonsoft.Json.Utilities
return (IWrappedDictionary)ReflectionUtils.CreateGeneric(typeof(DictionaryWrapper<,>), new[] { dictionaryKeyType, dictionaryValueType }, instanceCreator, dictionary); return (IWrappedDictionary)ReflectionUtils.CreateGeneric(typeof(DictionaryWrapper<,>), new[] { dictionaryKeyType, dictionaryValueType }, instanceCreator, dictionary);
} }
#if !NETFX_CORE
else if (dictionary is IDictionary) else if (dictionary is IDictionary)
{ {
return new DictionaryWrapper<object, object>((IDictionary)dictionary); return new DictionaryWrapper<object, object>((IDictionary)dictionary);
} }
#endif
else else
{ {
throw new ArgumentException("Can not create DictionaryWrapper for type {0}.".FormatWith(CultureInfo.InvariantCulture, dictionary.GetType()), "dictionary"); throw new ArgumentException("Can not create DictionaryWrapper for type {0}.".FormatWith(CultureInfo.InvariantCulture, dictionary.GetType()), "dictionary");
@@ -35,44 +35,6 @@ using System.Linq;
namespace Newtonsoft.Json.Utilities namespace Newtonsoft.Json.Utilities
{ {
#if (NETFX_CORE)
internal interface IDictionary : ICollection
{
object this[object key] { get; set; }
void Add(object key, object value);
new IDictionaryEnumerator GetEnumerator();
}
internal interface IDictionaryEnumerator : IEnumerator
{
DictionaryEntry Entry { get; }
object Key { get; }
object Value { get; }
}
internal struct DictionaryEntry
{
private readonly object _key;
private readonly object _value;
public DictionaryEntry(object key, object value)
{
_key = key;
_value = value;
}
public object Key
{
get { return _key; }
}
public object Value
{
get { return _value; }
}
}
#endif
internal interface IWrappedDictionary internal interface IWrappedDictionary
: IDictionary : IDictionary
{ {
@@ -81,20 +43,16 @@ namespace Newtonsoft.Json.Utilities
internal class DictionaryWrapper<TKey, TValue> : IDictionary<TKey, TValue>, IWrappedDictionary internal class DictionaryWrapper<TKey, TValue> : IDictionary<TKey, TValue>, IWrappedDictionary
{ {
#if !(NETFX_CORE)
private readonly IDictionary _dictionary; private readonly IDictionary _dictionary;
#endif
private readonly IDictionary<TKey, TValue> _genericDictionary; private readonly IDictionary<TKey, TValue> _genericDictionary;
private object _syncRoot; private object _syncRoot;
#if !(NETFX_CORE)
public DictionaryWrapper(IDictionary dictionary) public DictionaryWrapper(IDictionary dictionary)
{ {
ValidationUtils.ArgumentNotNull(dictionary, "dictionary"); ValidationUtils.ArgumentNotNull(dictionary, "dictionary");
_dictionary = dictionary; _dictionary = dictionary;
} }
#endif
public DictionaryWrapper(IDictionary<TKey, TValue> dictionary) public DictionaryWrapper(IDictionary<TKey, TValue> dictionary)
{ {
@@ -105,40 +63,33 @@ namespace Newtonsoft.Json.Utilities
public void Add(TKey key, TValue value) public void Add(TKey key, TValue value)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary.Add(key, value); _dictionary.Add(key, value);
else else
#endif _genericDictionary.Add(key, value);
_genericDictionary.Add(key, value);
} }
public bool ContainsKey(TKey key) public bool ContainsKey(TKey key)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.Contains(key); return _dictionary.Contains(key);
else else
#endif return _genericDictionary.ContainsKey(key);
return _genericDictionary.ContainsKey(key);
} }
public ICollection<TKey> Keys public ICollection<TKey> Keys
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.Keys.Cast<TKey>().ToList(); return _dictionary.Keys.Cast<TKey>().ToList();
else else
#endif return _genericDictionary.Keys;
return _genericDictionary.Keys;
} }
} }
public bool Remove(TKey key) public bool Remove(TKey key)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
{ {
if (_dictionary.Contains(key)) if (_dictionary.Contains(key))
@@ -151,14 +102,12 @@ namespace Newtonsoft.Json.Utilities
return false; return false;
} }
} }
#endif
return _genericDictionary.Remove(key); return _genericDictionary.Remove(key);
} }
public bool TryGetValue(TKey key, out TValue value) public bool TryGetValue(TKey key, out TValue value)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
{ {
if (!_dictionary.Contains(key)) if (!_dictionary.Contains(key))
@@ -172,7 +121,6 @@ namespace Newtonsoft.Json.Utilities
return true; return true;
} }
} }
#endif
return _genericDictionary.TryGetValue(key, out value); return _genericDictionary.TryGetValue(key, out value);
} }
@@ -181,11 +129,9 @@ namespace Newtonsoft.Json.Utilities
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.Values.Cast<TValue>().ToList(); return _dictionary.Values.Cast<TValue>().ToList();
else else
#endif
return _genericDictionary.Values; return _genericDictionary.Values;
} }
} }
@@ -194,56 +140,45 @@ namespace Newtonsoft.Json.Utilities
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return (TValue)_dictionary[key]; return (TValue)_dictionary[key];
#endif
return _genericDictionary[key]; return _genericDictionary[key];
} }
set set
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary[key] = value; _dictionary[key] = value;
else else
#endif _genericDictionary[key] = value;
_genericDictionary[key] = value;
} }
} }
public void Add(KeyValuePair<TKey, TValue> item) public void Add(KeyValuePair<TKey, TValue> item)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
((IList)_dictionary).Add(item); ((IList)_dictionary).Add(item);
else else
#endif _genericDictionary.Add(item);
_genericDictionary.Add(item);
} }
public void Clear() public void Clear()
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary.Clear(); _dictionary.Clear();
else else
#endif _genericDictionary.Clear();
_genericDictionary.Clear();
} }
public bool Contains(KeyValuePair<TKey, TValue> item) public bool Contains(KeyValuePair<TKey, TValue> item)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return ((IList)_dictionary).Contains(item); return ((IList)_dictionary).Contains(item);
else else
#endif return _genericDictionary.Contains(item);
return _genericDictionary.Contains(item);
} }
public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
{ {
foreach (DictionaryEntry item in _dictionary) foreach (DictionaryEntry item in _dictionary)
@@ -252,7 +187,6 @@ namespace Newtonsoft.Json.Utilities
} }
} }
else else
#endif
{ {
_genericDictionary.CopyTo(array, arrayIndex); _genericDictionary.CopyTo(array, arrayIndex);
} }
@@ -262,12 +196,10 @@ namespace Newtonsoft.Json.Utilities
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.Count; return _dictionary.Count;
else else
#endif return _genericDictionary.Count;
return _genericDictionary.Count;
} }
} }
@@ -275,18 +207,15 @@ namespace Newtonsoft.Json.Utilities
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.IsReadOnly; return _dictionary.IsReadOnly;
else else
#endif return _genericDictionary.IsReadOnly;
return _genericDictionary.IsReadOnly;
} }
} }
public bool Remove(KeyValuePair<TKey, TValue> item) public bool Remove(KeyValuePair<TKey, TValue> item)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
{ {
if (_dictionary.Contains(item.Key)) if (_dictionary.Contains(item.Key))
@@ -309,7 +238,6 @@ namespace Newtonsoft.Json.Utilities
} }
} }
else else
#endif
{ {
return _genericDictionary.Remove(item); return _genericDictionary.Remove(item);
} }
@@ -317,12 +245,10 @@ namespace Newtonsoft.Json.Utilities
public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.Cast<DictionaryEntry>().Select(de => new KeyValuePair<TKey, TValue>((TKey)de.Key, (TValue)de.Value)).GetEnumerator(); return _dictionary.Cast<DictionaryEntry>().Select(de => new KeyValuePair<TKey, TValue>((TKey)de.Key, (TValue)de.Value)).GetEnumerator();
else else
#endif return _genericDictionary.GetEnumerator();
return _genericDictionary.GetEnumerator();
} }
IEnumerator IEnumerable.GetEnumerator() IEnumerator IEnumerable.GetEnumerator()
@@ -332,33 +258,27 @@ namespace Newtonsoft.Json.Utilities
void IDictionary.Add(object key, object value) void IDictionary.Add(object key, object value)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary.Add(key, value); _dictionary.Add(key, value);
else else
#endif _genericDictionary.Add((TKey)key, (TValue)value);
_genericDictionary.Add((TKey)key, (TValue)value);
} }
object IDictionary.this[object key] object IDictionary.this[object key]
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary[key]; return _dictionary[key];
else else
#endif return _genericDictionary[(TKey)key];
return _genericDictionary[(TKey)key];
} }
set set
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary[key] = value; _dictionary[key] = value;
else else
#endif _genericDictionary[(TKey)key] = (TValue)value;
_genericDictionary[(TKey)key] = (TValue)value;
} }
} }
@@ -405,15 +325,12 @@ namespace Newtonsoft.Json.Utilities
IDictionaryEnumerator IDictionary.GetEnumerator() IDictionaryEnumerator IDictionary.GetEnumerator()
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.GetEnumerator(); return _dictionary.GetEnumerator();
else else
#endif return new DictionaryEnumerator<TKey, TValue>(_genericDictionary.GetEnumerator());
return new DictionaryEnumerator<TKey, TValue>(_genericDictionary.GetEnumerator());
} }
#if !NETFX_CORE
bool IDictionary.Contains(object key) bool IDictionary.Contains(object key)
{ {
if (_genericDictionary != null) if (_genericDictionary != null)
@@ -443,19 +360,15 @@ namespace Newtonsoft.Json.Utilities
return _dictionary.Keys; return _dictionary.Keys;
} }
} }
#endif
public void Remove(object key) public void Remove(object key)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary.Remove(key); _dictionary.Remove(key);
else else
#endif _genericDictionary.Remove((TKey)key);
_genericDictionary.Remove((TKey)key);
} }
#if !NETFX_CORE
ICollection IDictionary.Values ICollection IDictionary.Values
{ {
get get
@@ -466,28 +379,23 @@ namespace Newtonsoft.Json.Utilities
return _dictionary.Values; return _dictionary.Values;
} }
} }
#endif
void ICollection.CopyTo(Array array, int index) void ICollection.CopyTo(Array array, int index)
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
_dictionary.CopyTo(array, index); _dictionary.CopyTo(array, index);
else else
#endif _genericDictionary.CopyTo((KeyValuePair<TKey, TValue>[])array, index);
_genericDictionary.CopyTo((KeyValuePair<TKey, TValue>[])array, index);
} }
bool ICollection.IsSynchronized bool ICollection.IsSynchronized
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary.IsSynchronized; return _dictionary.IsSynchronized;
else else
#endif return false;
return false;
} }
} }
@@ -506,13 +414,11 @@ namespace Newtonsoft.Json.Utilities
{ {
get get
{ {
#if !NETFX_CORE
if (_dictionary != null) if (_dictionary != null)
return _dictionary; return _dictionary;
else else
#endif return _genericDictionary;
return _genericDictionary;
} }
} }
} }
} }