Pyit Phyo Aung 0115df6e39 Merge branch 'master' into Move-classes-to-files-under-TestObjects ...

# Conflicts:
#	Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs
#	Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs
#	Src/Newtonsoft.Json.Tests/Schema/ExtensionsTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/ExtensionDataTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/PopulateTests.cs
#	Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
#	Src/Newtonsoft.Json.Tests/TestObjects/Money/Currency.cs

2016-10-13 14:49:15 +13:00

..

Bson

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Converters

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Documentation

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Linq

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

LinqToSql

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

Properties

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

Schema

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Serialization

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

TestObjects

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Utilities

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

bunny_pancake.jpg

…

DemoTests.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

ExceptionTests.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

FileSystemEntityModel.Designer.cs

-Added additional frameworks to project.json files

2015-08-22 19:08:40 +12:00

FileSystemEntityModel.edmx

-Formatting

2015-12-04 23:54:38 +13:00

JsonArrayAttributeTests.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

JsonConvertTest.cs

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

JsonTextReaderTest.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

JsonTextWriterTest.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

JsonValidatingReaderTests.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

large_sample.xml

-Formatting

2015-12-04 23:54:38 +13:00

large.json

-Fixed null reference error when using JEnumerable created with default constructor

2014-09-25 20:28:47 +12:00

Newtonsoft.Json.Tests.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Dotnet.xproj

-Documentation

2016-05-15 19:49:42 +12:00

Newtonsoft.Json.Tests.Net20.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Net20.project.json

-Formatting

2015-12-04 23:54:38 +13:00

Newtonsoft.Json.Tests.Net35.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Net35.project.json

-Formatting

2015-12-04 23:54:38 +13:00

Newtonsoft.Json.Tests.Net40.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Net40.project.json

-Formatting

2015-12-04 23:54:38 +13:00

Newtonsoft.Json.Tests.Portable40.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Portable40.project.json

-Formatting

2015-12-04 23:54:38 +13:00

Newtonsoft.Json.Tests.Portable.csproj

Merge branch 'master' into Move-classes-to-files-under-TestObjects

2016-10-13 14:49:15 +13:00

Newtonsoft.Json.Tests.Portable.project.json

-Array pool perf test

2015-12-25 20:01:13 +13:00

Newtonsoft.Json.Tests.project.json

-Build

2016-06-13 23:03:56 +12:00

PerformanceTests.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00

PoisonText.txt

-Missing file

2011-11-19 07:37:53 +00:00

project.json

-Added netstandard1.1 with BigInteger support

2016-09-10 23:54:44 +12:00

SpaceShipV2.bson

-Fixed test

2014-09-11 15:34:20 +12:00

TestFixtureBase.cs

Clean up NETFX_CORE directive usage

2016-10-11 14:14:13 +13:00