Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json
This commit is contained in:
@@ -3249,6 +3249,7 @@ null//comment
|
||||
"Unexpected character encountered while parsing value: !. Path 'frameworks.dnxcore50.dependencies.['System.Xml.ReaderWriter'].source', line 6, position 21.");
|
||||
}
|
||||
|
||||
#if !DNXCORE50
|
||||
[Test]
|
||||
[Ignore("Fix this next major version")]
|
||||
public void LinePositionOnNewLine()
|
||||
@@ -3297,6 +3298,7 @@ null//comment
|
||||
|
||||
Assert.IsFalse(r.Read());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public class ToggleReaderError : TextReader
|
||||
|
||||
@@ -335,6 +335,7 @@
|
||||
<Compile Include="TestObjects\WidgetId1.cs" />
|
||||
<Compile Include="TestObjects\WidgetIdJsonConverter.cs" />
|
||||
<Compile Include="TestObjects\WithEnums.cs" />
|
||||
<Compile Include="Utilities\ConvertUtilsTests.cs" />
|
||||
<Compile Include="Utilities\ExpressionReflectionDelegateFactoryTests.cs" />
|
||||
<Compile Include="Utilities\DateTimeUtilsTests.cs" />
|
||||
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
|
||||
|
||||
@@ -181,6 +181,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
}", strJsonMainClass);
|
||||
}
|
||||
|
||||
#if !(PORTABLE || PORTABLE40 || NET20 || NET35)
|
||||
[Test]
|
||||
public void LargeIntegerAsString()
|
||||
{
|
||||
@@ -195,6 +196,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
public string Blah { get; set; }
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void CaseInsensitiveRequiredPropertyConstructorCreation()
|
||||
|
||||
@@ -116,8 +116,8 @@
|
||||
"System.Xml.XDocument": "4.0.10",
|
||||
"System.Xml.XmlDocument": "4.0.0",
|
||||
"System.Xml.XmlSerializer": "4.0.10",
|
||||
"xunit": "2.1.0-*",
|
||||
"xunit.runner.dnx": "2.1.0-*"
|
||||
"xunit": "2.1.0-rc1-build3118",
|
||||
"xunit.runner.dnx": "2.1.0-beta5-build156"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user