LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Build

Browse Source
This commit is contained in:
James Newton-King
2017-04-08 14:59:31 +12:00
parent 3531e705a1
commit c89b5b45aa
37 changed files with 173 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Net20.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Net20", "Newtonsoft.Json\Newtonsoft.Json.Net20.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
EndProject
Src/Newtonsoft.Json.Net35.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Net35", "Newtonsoft.Json\Newtonsoft.Json.Net35.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
EndProject
Src/Newtonsoft.Json.Net40.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Net40", "Newtonsoft.Json\Newtonsoft.Json.Net40.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
EndProject
Src/Newtonsoft.Json.Portable.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Portable", "Newtonsoft.Json\Newtonsoft.Json.Portable.csproj", "{959F7F85-C98B-4876-971A-9036224578E4}"
EndProject
Src/Newtonsoft.Json.Portable40.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json.Portable40", "Newtonsoft.Json\Newtonsoft.Json.Portable40.csproj", "{959F7F85-C98B-4876-971A-9036224578E4}"
EndProject
Src/Newtonsoft.Json.Tests/Benchmarks/BenchmarkConstants.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
namespace Newtonsoft.Json.Tests.Benchmarks
{
Src/Newtonsoft.Json.Tests/Benchmarks/DeserializeBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/DeserializeComparisonBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/JTokenBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/JValueConvertBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/JsonTextReaderBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System.IO;
using System.Linq;
Src/Newtonsoft.Json.Tests/Benchmarks/JsonTextWriterBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System.IO;
using BenchmarkDotNet.Attributes;
Src/Newtonsoft.Json.Tests/Benchmarks/LargeJArrayBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/LowLevelBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/Runner.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/SerializeBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/SerializeComparisonBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Benchmarks/XmlNodeConverterBenchmarks.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || PORTABLE || PORTABLE40) || DNXCORE50
#if HAVE_BENCHMARKS
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/ConvertingJsonAndXmlTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || PORTABLE || DNXCORE50)
#if !(NET35 || NET20 || PORTABLE || PORTABLE40 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.ComponentModel;
Src/Newtonsoft.Json.Tests/Documentation/LinqToJsonTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || PORTABLE || DNXCORE50)
#if !(NET35 || NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.ComponentModel;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/CreateJsonDynamic.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35)
#if !(NET20 || NET35 || PORTABLE40)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Linq/QueryJsonDynamic.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35)
#if !(NET20 || NET35 || PORTABLE40)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeDataSet.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !DNXCORE50
#if !(DNXCORE50 || PORTABLE || PORTABLE40)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/DeserializeWithDependencyInjection.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET20 || NET35 || NET40 || DNXCORE50)
#if !(NET20 || NET35 || NET40 || DNXCORE50 || PORTABLE40 || PORTABLE)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Serializer/SerializeDataSet.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !DNXCORE50
#if !(DNXCORE50 || PORTABLE || PORTABLE40)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertJsonToXml.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !NET20
#if !(NET20 || PORTABLE40)
using System;
using System.Collections.Generic;
Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJson.cs
+1 -1
View File
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif
#if !(DNXCORE50 || NET20)
#if !(DNXCORE50 || NET20 || PORTABLE || PORTABLE40)
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{
Src/Newtonsoft.Json.Tests/Documentation/Samples/Xml/ConvertXmlToJsonForceArray.cs
+1 -1
View File
@@ -36,7 +36,7 @@ using NUnit.Framework;
#endif
#if !(NET20 || DNXCORE50)
#if !(NET20 || DNXCORE50 || PORTABLE || PORTABLE40)
namespace Newtonsoft.Json.Tests.Documentation.Samples.Xml
{
Src/Newtonsoft.Json.Tests/Documentation/TraceWriterTests.cs
+1 -1
View File
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET35 || NET20 || PORTABLE || DNXCORE50)
#if !(NET35 || NET20 || DNXCORE50)
using System;
using System.Collections.Generic;
using System.ComponentModel;
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj
+1
View File
@@ -326,6 +326,7 @@
<Compile Include="TestObjects\WidgetId1.cs" />
<Compile Include="TestObjects\WidgetIdJsonConverter.cs" />
<Compile Include="TestObjects\WithEnums.cs" />
<Compile Include="Utilities\ConvertUtilsTests.cs" />
<Compile Include="Utilities\DateTimeUtilsTests.cs" />
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
<Compile Include="Utilities\ExpressionReflectionDelegateFactoryTests.cs" />
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Roslyn.csproj
+74 -11
View File
@@ -6,18 +6,19 @@
</ItemGroup>
</Target>
<PropertyGroup>
<TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netcoreapp1.1</TargetFrameworks>
<TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netcoreapp1.1</TargetFrameworks>
<VersionPrefix>10.0.1</VersionPrefix>
<TargetFrameworks>net45;net451;net452;net40;net35;net20;netcoreapp1.1;netcoreapp1.0</TargetFrameworks>
<VersionPrefix>1.0</VersionPrefix>
<Authors>James Newton-King</Authors>
<NeutralLanguage>en-US</NeutralLanguage>
<Copyright>Copyright © James Newton-King 2008</Copyright>
<AssemblyName>Newtonsoft.Json.Tests</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<!-- Workaround for https://github.com/nunit/nunit3-vs-adapter/issues/296 -->
<DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.1'">Full</DebugType>
<DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0' AND '$(TargetFramework)' != 'netcoreapp1.1'">Full</DebugType>
</PropertyGroup>
<ItemGroup>
<!-- Tracking for removal https://github.com/Microsoft/vstest/issues/472 -->
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
<None Remove="**\*.orig" />
<None Include="large.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -39,6 +40,7 @@
</None>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Roslyn.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
@@ -57,8 +59,53 @@
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<DefineConstants>NET45;$(AdditionalConstants)</DefineConstants>
<DefineConstants>NET45;HAVE_BENCHMARKS;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net451'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
<PackageReference Include="Autofac" Version="4.4.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
<PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.Buffers" Version="4.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net451'">
<ReferringTargetFrameworkForProjectReferences>.NETPortable,Version=v0.0,Profile=Profile328</ReferringTargetFrameworkForProjectReferences>
<DefineConstants>PORTABLE40;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
<PackageReference Include="Autofac" Version="4.4.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
<PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.Buffers" Version="4.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net452'">
<ReferringTargetFrameworkForProjectReferences>.NETPortable,Version=v0.0,Profile=Profile259</ReferringTargetFrameworkForProjectReferences>
<DefineConstants>PORTABLE;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
@@ -75,6 +122,7 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net40'">
<DefineConstants>NET40;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net35'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
@@ -88,6 +136,7 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net35'">
<DefineConstants>NET35;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net20'">
<PackageReference Include="NUnit" Version="3.6.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.7.0" />
@@ -96,6 +145,7 @@
<PropertyGroup Condition="'$(TargetFramework)'=='net20'">
<DefineConstants>NET20;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
<PackageReference Include="FSharp.Core" Version="4.1.2" />
@@ -105,16 +155,29 @@
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
</ItemGroup>
<ItemGroup>
<!-- Tracking for removal https://github.com/Microsoft/vstest/issues/472 -->
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
<DefineConstants>NETSTANDARD1_3;DNXCORE50;PORTABLE;$(AdditionalConstants)</DefineConstants>
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v1.3</ReferringTargetFrameworkForProjectReferences>
<DefineConstants>NETSTANDARD1_3;DNXCORE50;PORTABLE;HAVE_BENCHMARKS;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
<PackageReference Include="FSharp.Core" Version="4.1.2" />
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v1.0</ReferringTargetFrameworkForProjectReferences>
<DefineConstants>NETSTANDARD1_0;DNXCORE50;PORTABLE;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
</Project>
Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs
+3
View File
@@ -215,7 +215,10 @@ namespace Newtonsoft.Json.Tests.Utilities
AssertDecimalTryParse("1.2345678901234567890123456789e-26", ParseResult.Success, 0.0000000000000000000000000123M);
AssertDecimalTryParse("1.2345678901234567890123456789e-28", ParseResult.Success, 0.0000000000000000000000000001M);
AssertDecimalTryParse("1.2345678901234567890123456789e-29", ParseResult.Success, 0M);
#if !(NET20 || NET35)
AssertDecimalTryParse("1E-999", ParseResult.Success, 0M);
#endif
for (decimal i = -100; i < 100; i += 0.1m)
{
Src/Newtonsoft.Json.sln
+2 -2
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.26228.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json", "Newtonsoft.Json\Newtonsoft.Json.csproj", "{EEEA67F9-9089-481D-A4DC-0966DEC9FD7D}"
EndProject
Src/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs
+6 -4
View File
@@ -124,10 +124,6 @@ namespace Newtonsoft.Json.Converters
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
bool nullable = ReflectionUtils.IsNullableType(objectType);
Type t = (nullable)
? Nullable.GetUnderlyingType(objectType)
: objectType;
if (reader.TokenType == JsonToken.Null)
{
if (!ReflectionUtils.IsNullableType(objectType))
@@ -138,6 +134,12 @@ namespace Newtonsoft.Json.Converters
return null;
}
#if HAVE_DATE_TIME_OFFSET
Type t = (nullable)
? Nullable.GetUnderlyingType(objectType)
: objectType;
#endif
if (reader.TokenType == JsonToken.Date)
{
#if HAVE_DATE_TIME_OFFSET
Src/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs
+1 -1
View File
@@ -111,10 +111,10 @@ namespace Newtonsoft.Json.Converters
throw JsonSerializationException.Create(reader, "Unexpected token parsing date. Expected EndConstructor, got {0}.".FormatWith(CultureInfo.InvariantCulture, reader.TokenType));
}
#if HAVE_DATE_TIME_OFFSET
Type t = (ReflectionUtils.IsNullableType(objectType))
? Nullable.GetUnderlyingType(objectType)
: objectType;
#if HAVE_DATE_TIME_OFFSET
if (t == typeof(DateTimeOffset))
{
return new DateTimeOffset(d);
Src/Newtonsoft.Json/Newtonsoft.Json.Roslyn.csproj
+2 -1
View File
@@ -23,7 +23,8 @@
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<None Include="../../LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
<None Include="..\..\LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
<None Include="..\..\Build\install.ps1" Pack="true" PackagePath="tools\install.ps1" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<AssemblyTitle>Json.NET</AssemblyTitle>