From 55854f16821076fd1ee09fc8bd64e0d6cf39fb2d Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 8 Jun 2012 05:21:58 -0700 Subject: [PATCH] -Fixed time zone unit test failure -Removed Metro IDictionary copy -Fixed Metro build --- .../Bson/BsonReaderTests.cs | 6 +- .../Bson/BsonWriterTests.cs | 6 +- .../Converters/BinaryConverterTests.cs | 6 +- .../CustomCreationConverterTests.cs | 6 +- .../Converters/DataSetConverterTests.cs | 6 +- .../Converters/DataTableConverterTests.cs | 6 +- .../Converters/ExpandoObjectConverterTests.cs | 6 +- .../Converters/IsoDateTimeConverterTests.cs | 6 +- .../JavaScriptDateTimeConverterTests.cs | 6 +- .../Converters/ObjectIdConverterTests.cs | 6 +- .../Converters/RegexConverterTests.cs | 6 +- .../Converters/StringEnumConverterTests.cs | 6 +- .../Converters/VersionConverterTests.cs | 6 +- .../Converters/XmlNodeConverterTest.cs | 6 +- Src/Newtonsoft.Json.Tests/ExceptionTests.cs | 6 +- .../JsonArrayAttributeTests.cs | 6 +- Src/Newtonsoft.Json.Tests/JsonConvertTest.cs | 6 +- .../JsonTextReaderTest.cs | 6 +- .../JsonTextWriterTest.cs | 6 +- .../JsonValidatingReaderTests.cs | 6 +- .../Linq/DynamicTests.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs | 6 +- .../Linq/JConstructorTests.cs | 6 +- .../Linq/JObjectTests.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JPathTests.cs | 6 +- .../Linq/JPropertyTests.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs | 6 +- .../Linq/JTokenEqualityComparerTests.cs | 6 +- .../Linq/JTokenReaderTest.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs | 6 +- .../Linq/JTokenWriterTest.cs | 6 +- Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs | 6 +- .../Linq/LinqToJsonTest.cs | 6 +- ...wtonsoft.Json.Tests.Metro_TemporaryKey.pfx | Bin 2460 -> 2504 bytes .../Package.appxmanifest | 108 +++++++------- .../Properties/AssemblyInfo.cs | 2 +- .../Schema/ExtensionsTests.cs | 6 +- .../Schema/JsonSchemaBuilderTests.cs | 6 +- .../Schema/JsonSchemaGeneratorTests.cs | 6 +- .../Schema/JsonSchemaModelBuilderTests.cs | 6 +- .../Schema/JsonSchemaNodeTests.cs | 6 +- .../Schema/JsonSchemaTests.cs | 6 +- ...lCasePropertyNamesContractResolverTests.cs | 6 +- .../Serialization/ConstructorHandlingTests.cs | 6 +- .../Serialization/ContractResolverTests.cs | 6 +- .../DefaultValueHandlingTests.cs | 6 +- .../Serialization/DynamicTests.cs | 6 +- .../EntitiesSerializationTests.cs | 6 +- .../JsonPropertyCollectionTests.cs | 6 +- .../Serialization/JsonSerializerTest.cs | 12 +- .../MissingMemberHandlingTests.cs | 6 +- .../Serialization/NullValueHandlingTests.cs | 6 +- .../Serialization/PopulateTests.cs | 6 +- .../PreserveReferencesHandlingTests.cs | 6 +- .../ReferenceLoopHandlingTests.cs | 6 +- .../SerializationErrorHandlingTests.cs | 6 +- .../SerializationEventAttributeTests.cs | 6 +- .../Serialization/TypeNameHandlingTests.cs | 6 +- .../Serialization/WebApiIntegrationTests.cs | 6 +- Src/Newtonsoft.Json.Tests/SilverlightTests.cs | 6 +- Src/Newtonsoft.Json.Tests/TestFixtureBase.cs | 6 +- .../DynamicReflectionDelegateFactoryTests.cs | 6 +- .../Utilities/ReflectionUtilsTests.cs | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Serialization/JsonDictionaryContract.cs | 4 - .../Utilities/CollectionUtils.cs | 4 - .../Utilities/DictionaryWrapper.cs | 132 +++--------------- 67 files changed, 258 insertions(+), 360 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs index 55de1124..5dc7def5 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs @@ -29,9 +29,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Bson; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs index 21d09991..b988528d 100644 --- a/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs @@ -29,9 +29,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Bson; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs index af8b49c5..9a342cad 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs @@ -36,9 +36,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Converters diff --git a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs index 089c020c..ed95a7f9 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Converters diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index 34617755..9811095e 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs index c30dffea..e0263a56 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs @@ -28,9 +28,9 @@ using System; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif #if !NETFX_CORE using System.Data; diff --git a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs index 5773783f..f6a81127 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs @@ -40,9 +40,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs index 4b13bd72..534b33e9 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs @@ -28,9 +28,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Converters; using Newtonsoft.Json.Utilities; diff --git a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs index 86013d3c..85911653 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Converters; using Newtonsoft.Json.Tests.Serialization; diff --git a/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs index e39e8b42..1a9fd55b 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Utilities; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Converters diff --git a/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs index 418efd95..4b68a6f9 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs @@ -39,9 +39,9 @@ using Newtonsoft.Json.Utilities; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs index ed555f81..8d31e4ce 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs index 565943cf..6c1fb4fb 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs @@ -28,9 +28,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Converters diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index 1af0ea62..3b4cacfd 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -31,9 +31,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs index 55822572..39d38cad 100644 --- a/Src/Newtonsoft.Json.Tests/ExceptionTests.cs +++ b/Src/Newtonsoft.Json.Tests/ExceptionTests.cs @@ -28,9 +28,9 @@ using Newtonsoft.Json.Schema; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests diff --git a/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs index 34314539..b90fd052 100644 --- a/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonArrayAttributeTests.cs @@ -26,9 +26,9 @@ #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index 98ed8101..69066175 100644 --- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs @@ -40,9 +40,9 @@ using Newtonsoft.Json.Utilities; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs index 405b706a..0d2e6470 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs @@ -30,9 +30,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs index 4c950aa0..274f52ea 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs @@ -32,9 +32,9 @@ using System.Xml; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs index 69f8d766..07dc43a5 100644 --- a/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs +++ b/Src/Newtonsoft.Json.Tests/JsonValidatingReaderTests.cs @@ -33,9 +33,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using System.Xml; using System.Xml.Schema; diff --git a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs index 7b970330..80a16955 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs @@ -33,9 +33,9 @@ using Newtonsoft.Json.Linq; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Utilities; using System.Globalization; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs index 700d29af..059eb6d0 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JArrayTests.cs @@ -29,9 +29,9 @@ using System.ComponentModel; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; #if NET20 diff --git a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs index 45aa91be..6d7e4375 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JConstructorTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Linq; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using System.IO; #if NET20 diff --git a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs index 989db379..9913f031 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs @@ -31,9 +31,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPathTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPathTests.cs index 37d621cf..c3918422 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPathTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPathTests.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; #if NET20 diff --git a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs index 16daf771..724f97ab 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JPropertyTests.cs @@ -31,9 +31,9 @@ using Newtonsoft.Json.Linq; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs index 2eae7dce..31cbba64 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JRawTests.cs @@ -26,9 +26,9 @@ #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs index b3bd8eb0..f4ec6838 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenEqualityComparerTests.cs @@ -27,9 +27,9 @@ using System.Collections.Generic; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs index c569965e..777545f9 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenReaderTest.cs @@ -29,9 +29,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index ac5d9e6f..ebd327db 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs @@ -30,9 +30,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs index 24eb6c55..fd67f2f1 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs @@ -29,9 +29,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs index 32ebb260..c6bff24b 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JValueTests.cs @@ -29,9 +29,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; using System.Globalization; diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index c0b12d2f..1c6f8369 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -30,9 +30,9 @@ using System.Globalization; using System.IO; using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Converters; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Metro_TemporaryKey.pfx index 75e05db9a4357d11a7ace246383960ecccea6904..5daa45a9ea7af5e0e3ca393fc66b610590554732 100644 GIT binary patch delta 2318 zcmV+p3Gw!v6UY-HFoFrh0s#Xsf(d{I2`Yw2hW8Bt2LYgh32_9132iWf32BicMt?HX zBlJD|%UuEj2haq91lZxph2Vkeh!&RGb@;-y`QjJ3mdmI$tg&M7_vOgTBPau~xe*Ta zAU*ie=WbY%F;|i$@W0T6h-R;w5@{3L5bHf}f9>w_782I(m)^OB?@gX(TbUimN`kuH2UBV2OT zZHerwG_f;(@SUOf#eLCKZC1$Sbf2{!`gx8!mBvkVbnih+2-erYg_M@SOt=Ln!z%og zJVQ$qCgtv|W!$S|M1*^Q8WUSLO!1(*>dA9og(XRY>MxGjQh$QmM~K`R zoLh$%W}*VF;g3Zi+E|i=qV?Lb^Vz237}`$En$gA8OfoEdmicH-BPTI&9r);mB?bJD zOu@c;Dv4KiUQWK2S=XVGy`dHS{nd9f=HRL!e9FTQzyX(BXv+Ykqleh>$4%y*-9;aRuGVM)$Fy z-FPWeQ!#vwIj7^?g*yk$ywj!GkZd>)83NihogY6Y!r{?cZOOlVXMd!{ro@}xmOv$Z zpR3Gx6T67ACAE7^-=2iSn5mp!LLeG7JoktaX7V{Gn`;yK}^DAlB+j)=mOtQS&Sy(qkl4Ii^P?!i6^h- zi*XgnU%RX4b+PtOBUe;N?d$O8<;wqAr1x5|TBjj{7vdD@D#im_!HU{$%76CxO>4Zx zNsR~*Nx!+dIdgGda);6m7_ul}>k*oQ0A2QN-Cr^GFf|IlI)59M>f90-@Ay6VRmO8e z#(c7_$71W=0Bc`R-xm~Wp?c$*r8{~D1^k)Wq`7DF3vG=*4Rt26$n-HyQku=2ILh-B zNNq+|>?YA&9T8~u60?M1A8q*i{p(yR0HC~&J*8}P<=?$5MAe?hwogjzq3Wc5UdzXF zcz14`RvPlpYkyNu#Ej@wUHPD5WhF2Myq4W|Nh$~$Ci4E$yRtCbt(yj3q{icdd%$a2 zA5^4GZ@9p~+lWyY)(r1;0uYq<$yvE~G3G*%N6isE%h!6)*Gs3=#2z7wSWyyq&=A9} z<_WjjwZdSAnhkYhbrnjM2g7RB6T(|#Iq;*K*b^s{w}0_$Np}Fo6%eJrRB0Cp2tJB^ zZ1S1c!us@}GGJRA_$u~>)jJ^ux*Rxu)X9HF+C8bIk4703dBb=(%9CQPX7D2@(5|jn zF!4AK@H#*bq^-r&(Ryh~S#4s6ixMT;DvX9+kDZ+owZx!(aMO;86DbBRHaY zh0EU!lx5%HzeH_X*gk!8mu~s^3LJFZlaK&LNQUt&l2l8l)F&Ej=Q+sN zX%SEu70pTgslZSb`*p0v-g%bGFy*;TV$p`|I?`-hm)&jkn0v&ezbOE)|9m|#2-cWg zsz}XOaQ!Kn2Y;u7(4xjp#Na&ZS7J?9sc{dEHz!TshdV;0#7#iQMKok6ICJij`Loz>j0#PhPd3f_#En9=Y!CoPC4NnhrjjOO`u*m#D(jlR1 zvh{hY&Kg0Lg!Dy(G33b3M-cAt40Q(5rZhzr8HyzTH7N*6Dx{cv|B01exjRz(Hxj?4WLh9*d!yBEh;?;El_PVX8fO7>2 zh_+Aex%5fsS4`<(bmt-mAs>Fguw~%R%YUka$%Bt9himIdQ5g~`@)%v>Snm|E zY-Bzc;to4^Y2niDWbOV`t1L8{B18prYa3_GM0mWGwReod_rTcqz%9&e7j7Z$f4 zv`9$2nZPZ;ZLDaSExvqRA}H~T(X^exkaH#K;+0TB3-tr7l45!F56h6Z=}uN49+ULf zII7ODO2Zlwp%7^A=top%t^6+k>7F6aeRY|-Fgq|GFb4(&D-Ht!8Uz#)UrP<`QV4=!t5;ZlrNmM}O0;cxQ2;wa+AHJ_M1gu@!v#7-iP9)*i9-`M*)DijgYjH% zFOg(3p<%^I$Yzc21%MICFOJ6PM;U)THb2iGG9fhzN-GIXn**aTEPq8i^{{3Px9FDR z0?^*wfioc!UHZkR>o91JOFJF1p`>TS-Axwa0$C^5uKcQc0RHSN^*3okm|DvDSKx8T zXd$wNG^dBL^`xJJ7&G)oO%DHa-TVm#)sa;2?FxHCi=AVc@fjI09z`>$UrAOYp|r`3 zHt|m$ZrnN00DjMmtAEhhs`TeG6G*Gf?Ns*YB4O{+!t9F?Y!k`0FIzvj8#K3ys6bTX zSQoZSiSX=dgO_j%Qxypqm+_Y4S*)$izZ&s&o13spc?~P?`gUV)MDaT8ouoQlbAdk; z_pPGVC35(`lzA-M{|5ZsIAhc)0YYZ+gG2Lt$X$k-UQD@IE*-^~>ddbXIw+iVzxnuf-^hJV+L2JMV^fus0Fn-dC)Mko2) zzfpjbF0*nC*DWHbgG728&*v4;xt8Zp$a57H#X&1n?rPQkJ@$cX&LNQUL z1r0c$tVzWAf&rc@gu!_p&o3GH|9el0cGo`yOt10sapo$jB_ndof*v;>J~T15)QhFwCMmO3gxj;DkqLLLjttD% zj#J2Uw~sBnVwEzBD|gVzjcPo zYJWvm#kzQu=XRuI;$9!Rj$#UQ5Y=MRfRG85w96k61cUz - - - - - - UnitTestProject1 - James - Images\UnitTestStoreLogo.png - UnitTestProject1 - - - - 6.2 - 6.2 - - - - - - - - - - - - - - - - - - - - - + + + + + + + Newtonsoft.Json.Tests.Metro + James + Images\UnitTestStoreLogo.png + Newtonsoft.Json.Tests.Metro + + + + 6.2 + 6.2 + + + + + + + + + + + + + + + + + + + + + diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index d358fc24..c83ccf1d 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -72,5 +72,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.5.6.14930")] +[assembly: AssemblyFileVersion("4.5.6.15008")] #endif diff --git a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs index 57f825cd..8d8ef640 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Schema; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs index 17216b3c..add1c858 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaBuilderTests.cs @@ -27,9 +27,9 @@ using System; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Schema; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs index 88cd8a0d..073d2986 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaGeneratorTests.cs @@ -34,9 +34,9 @@ using Newtonsoft.Json.Utilities; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Schema; using System.IO; diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs index dcea800f..23cc0aea 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaModelBuilderTests.cs @@ -27,9 +27,9 @@ using Newtonsoft.Json.Schema; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Schema diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs index 60c5e48b..82a78743 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaNodeTests.cs @@ -27,9 +27,9 @@ using Newtonsoft.Json.Schema; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Schema diff --git a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs index ec0b48b3..8f8d6081 100644 --- a/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs +++ b/Src/Newtonsoft.Json.Tests/Schema/JsonSchemaTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Schema; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Schema diff --git a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs index 47205adb..cf83dbdb 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/CamelCasePropertyNamesContractResolverTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Serialization; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Tests.TestObjects; using Newtonsoft.Json.Linq; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs index 2b765017..78e80fb8 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ConstructorHandlingTests.cs @@ -28,9 +28,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs index 0be5db32..d432931c 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ContractResolverTests.cs @@ -29,9 +29,9 @@ using System.Runtime.Serialization; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif #if NET20 using Newtonsoft.Json.Utilities.LinqBridge; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs index c3693861..96c6f131 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DefaultValueHandlingTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs index 6be8cd25..efd0bbc8 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/DynamicTests.cs @@ -39,9 +39,9 @@ using Newtonsoft.Json.Utilities; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs index 67bfc89b..ff958d49 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/EntitiesSerializationTests.cs @@ -33,9 +33,9 @@ using Newtonsoft.Json.Converters; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs index 8b2c6b62..a025ef6f 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonPropertyCollectionTests.cs @@ -26,9 +26,9 @@ #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Tests.TestObjects; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 8e8513ef..987b2f8f 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -40,9 +40,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json; using System.IO; @@ -6319,9 +6319,9 @@ Parameter name: value", Venue = "Gryphon Theatre", Performances = new List { - DateTime.Parse("8 Tue May 2012, 6:30pm"), - DateTime.Parse("9 Wed May 2012, 6:30pm"), - DateTime.Parse("10 Thu May 2012, 8:00pm") + JsonConvert.ConvertJavaScriptTicksToDateTime(1336458600000), + JsonConvert.ConvertJavaScriptTicksToDateTime(1336545000000), + JsonConvert.ConvertJavaScriptTicksToDateTime(1336636800000) } }; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs index 6ed5f0cd..d101539b 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/MissingMemberHandlingTests.cs @@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs index d5783331..48facbb2 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/NullValueHandlingTests.cs @@ -29,9 +29,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs index 7dff9084..2f0b9722 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs @@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs index 0845da74..5bc7fa46 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs @@ -32,9 +32,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs index 488b9f0f..17800bbf 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ReferenceLoopHandlingTests.cs @@ -27,9 +27,9 @@ using System.Collections.Generic; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests.Serialization diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs index e559f04f..9e70659b 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs @@ -30,9 +30,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using System.IO; using ErrorEventArgs=Newtonsoft.Json.Serialization.ErrorEventArgs; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs index defd8ed4..8b0a701a 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/SerializationEventAttributeTests.cs @@ -34,9 +34,9 @@ using Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Linq; using Newtonsoft.Json.Utilities; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs index 00f04c93..9c532305 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs @@ -39,9 +39,9 @@ using global::Newtonsoft.Json.Tests.TestObjects; #if !NETFX_CORE using global::NUnit.Framework; #else -using global::Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using global::Newtonsoft.Json.Utilities; using global::System.Net; diff --git a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs index 03b5d7ce..014081f9 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/WebApiIntegrationTests.cs @@ -33,9 +33,9 @@ using System.Text; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif #if !(SILVERLIGHT || NETFX_CORE || NET20) using System.Runtime.Serialization.Json; diff --git a/Src/Newtonsoft.Json.Tests/SilverlightTests.cs b/Src/Newtonsoft.Json.Tests/SilverlightTests.cs index 92dbb396..c7a4b7d0 100644 --- a/Src/Newtonsoft.Json.Tests/SilverlightTests.cs +++ b/Src/Newtonsoft.Json.Tests/SilverlightTests.cs @@ -28,9 +28,9 @@ using System.Reflection; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif namespace Newtonsoft.Json.Tests diff --git a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs index 54c8dce8..bd9f4350 100644 --- a/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs +++ b/Src/Newtonsoft.Json.Tests/TestFixtureBase.cs @@ -36,9 +36,9 @@ using System.Threading; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using TestMethod = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using TestMethod = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Utilities; using System.Collections; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs index fb2ba0da..4cf32aa3 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/DynamicReflectionDelegateFactoryTests.cs @@ -29,9 +29,9 @@ using System.Reflection; #if !NETFX_CORE using NUnit.Framework; #else -using Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Utilities; diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs index 89721eb0..f8510d32 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ReflectionUtilsTests.cs @@ -30,9 +30,9 @@ using global::System.Runtime.Serialization.Formatters; #if !NETFX_CORE using global::NUnit.Framework; #else -using global::Microsoft.VisualStudio.TestTools.UnitTesting; -using TestFixture = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute; -using Test = global::Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; +using global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework; +using TestFixture = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute; +using Test = global::Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute; #endif using global::Newtonsoft.Json.Utilities; diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index f3280614..b7e67a0e 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -90,7 +90,7 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("4.5.0.0")] #if !PocketPC -[assembly: AssemblyFileVersion("4.5.6.14930")] +[assembly: AssemblyFileVersion("4.5.6.15008")] #endif [assembly: CLSCompliant(true)] diff --git a/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs b/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs index 3fecc844..03e3e6bc 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs @@ -94,20 +94,16 @@ namespace Newtonsoft.Json.Serialization { CreatedType = ReflectionUtils.MakeGenericType(typeof(Dictionary<,>), keyType, valueType); } -#if !NETFX_CORE else if (UnderlyingType == typeof(IDictionary)) { CreatedType = typeof (Dictionary); } -#endif } internal IWrappedDictionary CreateWrapper(object dictionary) { -#if !(NETFX_CORE) if (dictionary is IDictionary && (DictionaryValueType == null || !_isDictionaryValueTypeNullableType)) return new DictionaryWrapper((IDictionary)dictionary); -#endif if (_genericWrapperCreator == null) { diff --git a/Src/Newtonsoft.Json/Utilities/CollectionUtils.cs b/Src/Newtonsoft.Json/Utilities/CollectionUtils.cs index c5450dde..1d3ccf95 100644 --- a/Src/Newtonsoft.Json/Utilities/CollectionUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/CollectionUtils.cs @@ -102,10 +102,8 @@ namespace Newtonsoft.Json.Utilities { ValidationUtils.ArgumentNotNull(type, "type"); -#if !NETFX_CORE if (typeof(IDictionary).IsAssignableFrom(type)) return true; -#endif if (ReflectionUtils.ImplementsGenericDefinition(type, typeof (IDictionary<,>))) return true; @@ -159,12 +157,10 @@ namespace Newtonsoft.Json.Utilities return (IWrappedDictionary)ReflectionUtils.CreateGeneric(typeof(DictionaryWrapper<,>), new[] { dictionaryKeyType, dictionaryValueType }, instanceCreator, dictionary); } -#if !NETFX_CORE else if (dictionary is IDictionary) { return new DictionaryWrapper((IDictionary)dictionary); } -#endif else { throw new ArgumentException("Can not create DictionaryWrapper for type {0}.".FormatWith(CultureInfo.InvariantCulture, dictionary.GetType()), "dictionary"); diff --git a/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs b/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs index 3b4870a6..8d45e664 100644 --- a/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs +++ b/Src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs @@ -35,44 +35,6 @@ using System.Linq; 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 : IDictionary { @@ -81,20 +43,16 @@ namespace Newtonsoft.Json.Utilities internal class DictionaryWrapper : IDictionary, IWrappedDictionary { -#if !(NETFX_CORE) private readonly IDictionary _dictionary; -#endif private readonly IDictionary _genericDictionary; private object _syncRoot; -#if !(NETFX_CORE) public DictionaryWrapper(IDictionary dictionary) { ValidationUtils.ArgumentNotNull(dictionary, "dictionary"); _dictionary = dictionary; } -#endif public DictionaryWrapper(IDictionary dictionary) { @@ -105,40 +63,33 @@ namespace Newtonsoft.Json.Utilities public void Add(TKey key, TValue value) { -#if !NETFX_CORE if (_dictionary != null) _dictionary.Add(key, value); else -#endif - _genericDictionary.Add(key, value); + _genericDictionary.Add(key, value); } public bool ContainsKey(TKey key) { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.Contains(key); else -#endif - return _genericDictionary.ContainsKey(key); + return _genericDictionary.ContainsKey(key); } public ICollection Keys { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.Keys.Cast().ToList(); else -#endif - return _genericDictionary.Keys; + return _genericDictionary.Keys; } } public bool Remove(TKey key) { -#if !NETFX_CORE if (_dictionary != null) { if (_dictionary.Contains(key)) @@ -151,14 +102,12 @@ namespace Newtonsoft.Json.Utilities return false; } } -#endif return _genericDictionary.Remove(key); } public bool TryGetValue(TKey key, out TValue value) { -#if !NETFX_CORE if (_dictionary != null) { if (!_dictionary.Contains(key)) @@ -172,7 +121,6 @@ namespace Newtonsoft.Json.Utilities return true; } } -#endif return _genericDictionary.TryGetValue(key, out value); } @@ -181,11 +129,9 @@ namespace Newtonsoft.Json.Utilities { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.Values.Cast().ToList(); else -#endif return _genericDictionary.Values; } } @@ -194,56 +140,45 @@ namespace Newtonsoft.Json.Utilities { get { -#if !NETFX_CORE if (_dictionary != null) return (TValue)_dictionary[key]; -#endif return _genericDictionary[key]; } set { -#if !NETFX_CORE if (_dictionary != null) _dictionary[key] = value; else -#endif - _genericDictionary[key] = value; + _genericDictionary[key] = value; } } public void Add(KeyValuePair item) { -#if !NETFX_CORE if (_dictionary != null) ((IList)_dictionary).Add(item); else -#endif - _genericDictionary.Add(item); + _genericDictionary.Add(item); } public void Clear() { -#if !NETFX_CORE if (_dictionary != null) _dictionary.Clear(); else -#endif - _genericDictionary.Clear(); + _genericDictionary.Clear(); } public bool Contains(KeyValuePair item) { -#if !NETFX_CORE if (_dictionary != null) return ((IList)_dictionary).Contains(item); else -#endif - return _genericDictionary.Contains(item); + return _genericDictionary.Contains(item); } public void CopyTo(KeyValuePair[] array, int arrayIndex) { -#if !NETFX_CORE if (_dictionary != null) { foreach (DictionaryEntry item in _dictionary) @@ -252,7 +187,6 @@ namespace Newtonsoft.Json.Utilities } } else -#endif { _genericDictionary.CopyTo(array, arrayIndex); } @@ -262,12 +196,10 @@ namespace Newtonsoft.Json.Utilities { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.Count; else -#endif - return _genericDictionary.Count; + return _genericDictionary.Count; } } @@ -275,18 +207,15 @@ namespace Newtonsoft.Json.Utilities { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.IsReadOnly; else -#endif - return _genericDictionary.IsReadOnly; + return _genericDictionary.IsReadOnly; } } public bool Remove(KeyValuePair item) { -#if !NETFX_CORE if (_dictionary != null) { if (_dictionary.Contains(item.Key)) @@ -309,7 +238,6 @@ namespace Newtonsoft.Json.Utilities } } else -#endif { return _genericDictionary.Remove(item); } @@ -317,12 +245,10 @@ namespace Newtonsoft.Json.Utilities public IEnumerator> GetEnumerator() { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.Cast().Select(de => new KeyValuePair((TKey)de.Key, (TValue)de.Value)).GetEnumerator(); else -#endif - return _genericDictionary.GetEnumerator(); + return _genericDictionary.GetEnumerator(); } IEnumerator IEnumerable.GetEnumerator() @@ -332,33 +258,27 @@ namespace Newtonsoft.Json.Utilities void IDictionary.Add(object key, object value) { -#if !NETFX_CORE if (_dictionary != null) _dictionary.Add(key, value); else -#endif - _genericDictionary.Add((TKey)key, (TValue)value); + _genericDictionary.Add((TKey)key, (TValue)value); } object IDictionary.this[object key] { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary[key]; else -#endif - return _genericDictionary[(TKey)key]; + return _genericDictionary[(TKey)key]; } set { -#if !NETFX_CORE if (_dictionary != null) _dictionary[key] = value; else -#endif - _genericDictionary[(TKey)key] = (TValue)value; + _genericDictionary[(TKey)key] = (TValue)value; } } @@ -405,15 +325,12 @@ namespace Newtonsoft.Json.Utilities IDictionaryEnumerator IDictionary.GetEnumerator() { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.GetEnumerator(); else -#endif - return new DictionaryEnumerator(_genericDictionary.GetEnumerator()); + return new DictionaryEnumerator(_genericDictionary.GetEnumerator()); } -#if !NETFX_CORE bool IDictionary.Contains(object key) { if (_genericDictionary != null) @@ -443,19 +360,15 @@ namespace Newtonsoft.Json.Utilities return _dictionary.Keys; } } -#endif public void Remove(object key) { -#if !NETFX_CORE if (_dictionary != null) _dictionary.Remove(key); else -#endif - _genericDictionary.Remove((TKey)key); + _genericDictionary.Remove((TKey)key); } -#if !NETFX_CORE ICollection IDictionary.Values { get @@ -466,28 +379,23 @@ namespace Newtonsoft.Json.Utilities return _dictionary.Values; } } -#endif void ICollection.CopyTo(Array array, int index) { -#if !NETFX_CORE if (_dictionary != null) _dictionary.CopyTo(array, index); else -#endif - _genericDictionary.CopyTo((KeyValuePair[])array, index); + _genericDictionary.CopyTo((KeyValuePair[])array, index); } bool ICollection.IsSynchronized { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary.IsSynchronized; else -#endif - return false; + return false; } } @@ -506,13 +414,11 @@ namespace Newtonsoft.Json.Utilities { get { -#if !NETFX_CORE if (_dictionary != null) return _dictionary; else -#endif - return _genericDictionary; + return _genericDictionary; } } } -} +} \ No newline at end of file