Migrate project.json to csproj (#1212)

This commit is contained in:
James Newton-King
2017-02-13 23:46:43 +13:00
committed by GitHub
parent 635feb1549
commit cc6d99aa60
20 changed files with 347 additions and 564 deletions
@@ -59,60 +59,63 @@ namespace Newtonsoft.Json.Tests.Converters
[TestFixture]
public class VersionConverterTests : TestFixtureBase
{
private void SerializeVersionClass(string version1, string version2)
internal static class VersionHelperClass
{
VersionClass versionClass = new VersionClass(version1, version2);
internal static void SerializeVersionClass(string version1, string version2)
{
VersionClass versionClass = new VersionClass(version1, version2);
string json = JsonConvert.SerializeObject(versionClass, Formatting.Indented, new VersionConverter());
string json = JsonConvert.SerializeObject(versionClass, Formatting.Indented, new VersionConverter());
string expectedJson = string.Format(@"{{
string expectedJson = string.Format(@"{{
""StringProperty1"": ""StringProperty1"",
""Version1"": ""{0}"",
""Version2"": ""{1}"",
""StringProperty2"": ""StringProperty2""
}}", version1, version2);
StringAssert.AreEqual(expectedJson, json);
StringAssert.AreEqual(expectedJson, json);
}
internal static void DeserializeVersionClass(string version1, string version2)
{
string json = string.Format(@"{{""StringProperty1"": ""StringProperty1"", ""Version1"": ""{0}"", ""Version2"": ""{1}"", ""StringProperty2"": ""StringProperty2""}}", version1, version2);
Version expectedVersion1 = new Version(version1);
Version expectedVersion2 = new Version(version2);
VersionClass versionClass = JsonConvert.DeserializeObject<VersionClass>(json, new VersionConverter());
Assert.AreEqual("StringProperty1", versionClass.StringProperty1);
Assert.AreEqual(expectedVersion1, versionClass.Version1);
Assert.AreEqual(expectedVersion2, versionClass.Version2);
Assert.AreEqual("StringProperty2", versionClass.StringProperty2);
}
}
[Test]
public void SerializeVersionClass()
{
SerializeVersionClass("1.0.0.0", "2.0.0.0");
SerializeVersionClass("1.2.0.0", "2.3.0.0");
SerializeVersionClass("1.2.3.0", "2.3.4.0");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
VersionHelperClass.SerializeVersionClass("1.0.0.0", "2.0.0.0");
VersionHelperClass.SerializeVersionClass("1.2.0.0", "2.3.0.0");
VersionHelperClass.SerializeVersionClass("1.2.3.0", "2.3.4.0");
VersionHelperClass.SerializeVersionClass("1.2.3.4", "2.3.4.5");
SerializeVersionClass("1.2", "2.3");
SerializeVersionClass("1.2.3", "2.3.4");
SerializeVersionClass("1.2.3.4", "2.3.4.5");
}
private void DeserializeVersionClass(string version1, string version2)
{
string json = string.Format(@"{{""StringProperty1"": ""StringProperty1"", ""Version1"": ""{0}"", ""Version2"": ""{1}"", ""StringProperty2"": ""StringProperty2""}}", version1, version2);
Version expectedVersion1 = new Version(version1);
Version expectedVersion2 = new Version(version2);
VersionClass versionClass = JsonConvert.DeserializeObject<VersionClass>(json, new VersionConverter());
Assert.AreEqual("StringProperty1", versionClass.StringProperty1);
Assert.AreEqual(expectedVersion1, versionClass.Version1);
Assert.AreEqual(expectedVersion2, versionClass.Version2);
Assert.AreEqual("StringProperty2", versionClass.StringProperty2);
VersionHelperClass.SerializeVersionClass("1.2", "2.3");
VersionHelperClass.SerializeVersionClass("1.2.3", "2.3.4");
VersionHelperClass.SerializeVersionClass("1.2.3.4", "2.3.4.5");
}
[Test]
public void DeserializeVersionClass()
{
DeserializeVersionClass("1.0.0.0", "2.0.0.0");
DeserializeVersionClass("1.2.0.0", "2.3.0.0");
DeserializeVersionClass("1.2.3.0", "2.3.4.0");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
VersionHelperClass.DeserializeVersionClass("1.0.0.0", "2.0.0.0");
VersionHelperClass.DeserializeVersionClass("1.2.0.0", "2.3.0.0");
VersionHelperClass.DeserializeVersionClass("1.2.3.0", "2.3.4.0");
VersionHelperClass.DeserializeVersionClass("1.2.3.4", "2.3.4.5");
DeserializeVersionClass("1.2", "2.3");
DeserializeVersionClass("1.2.3", "2.3.4");
DeserializeVersionClass("1.2.3.4", "2.3.4.5");
VersionHelperClass.DeserializeVersionClass("1.2", "2.3");
VersionHelperClass.DeserializeVersionClass("1.2.3", "2.3.4");
VersionHelperClass.DeserializeVersionClass("1.2.3.4", "2.3.4.5");
}
[Test]
+14 -9
View File
@@ -885,9 +885,11 @@ namespace Newtonsoft.Json.Tests
{
Console.WriteLine(name);
DateTimeResult result = new DateTimeResult();
DateTimeResult result = new DateTimeResult()
{
IsoDateRoundtrip = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.RoundtripKind)
};
result.IsoDateRoundtrip = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.RoundtripKind);
if (value is DateTime)
{
result.IsoDateLocal = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.Local);
@@ -1052,10 +1054,12 @@ namespace Newtonsoft.Json.Tests
var now = DateTimeOffset.Now;
var dict = new Dictionary<string, object> { { "foo", now } };
var settings = new JsonSerializerSettings();
settings.DateFormatHandling = DateFormatHandling.IsoDateFormat;
settings.DateParseHandling = DateParseHandling.DateTimeOffset;
settings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
var settings = new JsonSerializerSettings()
{
DateFormatHandling = DateFormatHandling.IsoDateFormat,
DateParseHandling = DateParseHandling.DateTimeOffset,
DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind
};
var json = JsonConvert.SerializeObject(dict, settings);
var newDict = new Dictionary<string, object>();
@@ -1101,9 +1105,10 @@ namespace Newtonsoft.Json.Tests
DateTime dt = DateTime.MaxValue;
StringWriter sw = new StringWriter();
JsonTextWriter writer = new JsonTextWriter(sw);
writer.DateFormatHandling = DateFormatHandling.MicrosoftDateFormat;
JsonTextWriter writer = new JsonTextWriter(sw)
{
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
};
writer.WriteValue(dt);
writer.Flush();
}
@@ -1026,7 +1026,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
#if !DNXCORE50
[Test]
[Ignore]
[Ignore("Probably not a Json.NET issue")]
public async Task ReadFromNetworkStreamAsync()
{
const int port = 11999;
@@ -1043,7 +1043,7 @@ namespace Newtonsoft.Json.Tests.JsonTextReaderTests
#if !DNXCORE50
[Test]
[Ignore]
[Ignore("Probably not a Json.NET issue")]
public void ReadFromNetworkStream()
{
const int port = 11999;
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>13e906ae-5a47-4354-8caf-e63e8ac541ed</ProjectGuid>
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
@@ -0,0 +1,99 @@
<Project Sdk="Microsoft.NET.Sdk">
<Target Name="WorkAroundPackageAndProjectReferenceConflict" BeforeTargets="ResolveLockFileReferences">
<ItemGroup>
<ResolvedCompileFileDefinitions Remove="@(ResolvedCompileFileDefinitions)" Condition="'%(ResolvedCompileFileDefinitions.Filename)' == 'Newtonsoft.Json'" />
</ItemGroup>
</Target>
<PropertyGroup>
<TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netcoreapp1.0</TargetFrameworks>
<TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netcoreapp1.0</TargetFrameworks>
<!--<TargetFrameworks>net45;net40;net35;net20;netcoreapp1.0</TargetFrameworks>-->
<VersionPrefix>10.0.1</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>
</PropertyGroup>
<ItemGroup>
<None Include="large.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Schema\Specs\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SpaceShipV2.bson">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="bunny_pancake.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="large_sample.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="PoisonText.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Roslyn.csproj" />
<PackageReference Include="NUnit" Version="3.6.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
<PackageReference Include="Autofac" Version="4.0.0-rc2-240" />
<PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" />
<PackageReference Include="System.Buffers" Version="4.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<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)'=='net45'">
<DefineConstants>NET45;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
<PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" />
<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)'=='net40'">
<DefineConstants>NET40;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net35'">
<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)'=='net35'">
<DefineConstants>NET35;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net20'">
<Reference Include="System.Web" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net20'">
<DefineConstants>NET20;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
<PackageReference Include="FSharp.Core" Version="4.0.1.7-alpha" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<PackageReference Include="System.Runtime.Serialization.Xml" Version="4.1.1" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
<PackageReference Include="xunit" Version="2.2.0-*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
<DefineConstants>NETSTANDARD1_1;DNXCORE50;PORTABLE;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
</Project>
@@ -50,6 +50,10 @@ using System.Security;
[assembly: AssemblyTitle("Json.NET Tests")]
#endif
#if DNXCORE50
[assembly: Xunit.CollectionBehavior(DisableTestParallelization = true)]
#endif
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Newtonsoft")]
@@ -78,5 +82,5 @@ using System.Security;
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("7.0.0.0")]
[assembly: AssemblyFileVersion("7.0.2.18802")]
[assembly: AssemblyVersion("10.0.0.0")]
[assembly: AssemblyFileVersion("10.0.0.0")]
@@ -82,6 +82,7 @@ using System.Dynamic;
#endif
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
using Action = Newtonsoft.Json.Serialization.Action;
#else
using System.Linq;
#endif
@@ -50,6 +50,7 @@ using System.Threading.Tasks;
#endif
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
using Action = Newtonsoft.Json.Serialization.Action;
#else
using System.Linq;
@@ -43,7 +43,6 @@ using Newtonsoft.Json.Tests.Serialization;
using Newtonsoft.Json.Utilities.LinqBridge;
#else
using System.Linq;
#endif
namespace Newtonsoft.Json.Tests.Utilities
@@ -101,7 +100,7 @@ namespace Newtonsoft.Json.Tests.Utilities
Person p = new Person();
p.Name = "Hi";
Func<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateGet<object>(typeof(Movie).GetProperty("Name"));
var setter = DynamicReflectionDelegateFactory.Instance.CreateGet<object>(typeof(Movie).GetProperty("Name"));
setter(p);
}, "Unable to cast object of type 'Newtonsoft.Json.Tests.TestObjects.Organization.Person' to type 'Newtonsoft.Json.Tests.TestObjects.Movie'.");
@@ -115,7 +114,7 @@ namespace Newtonsoft.Json.Tests.Utilities
Person p = new Person();
Movie m = new Movie();
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
var setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
setter(m, "Hi");
@@ -134,7 +133,7 @@ namespace Newtonsoft.Json.Tests.Utilities
{
object structTest = new StructTest();
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(StructTest).GetProperty("StringProperty"));
var setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(StructTest).GetProperty("StringProperty"));
setter(structTest, "Hi");
@@ -151,7 +150,7 @@ namespace Newtonsoft.Json.Tests.Utilities
{
Movie m = new Movie();
Action<object, object> setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
var setter = DynamicReflectionDelegateFactory.Instance.CreateSet<object>(typeof(Movie).GetProperty("Name"));
setter(m, new Version("1.1.1.1"));
}, "Unable to cast object of type 'System.Version' to type 'System.String'.");
@@ -194,11 +193,11 @@ namespace Newtonsoft.Json.Tests.Utilities
[Test]
public void ConstructorStruct()
{
Func<object> creator1 = DynamicReflectionDelegateFactory.Instance.CreateDefaultConstructor<object>(typeof(MyStruct));
var creator1 = DynamicReflectionDelegateFactory.Instance.CreateDefaultConstructor<object>(typeof(MyStruct));
MyStruct myStruct1 = (MyStruct)creator1.Invoke();
Assert.AreEqual(0, myStruct1.IntProperty);
Func<MyStruct> creator2 = DynamicReflectionDelegateFactory.Instance.CreateDefaultConstructor<MyStruct>(typeof(MyStruct));
var creator2 = DynamicReflectionDelegateFactory.Instance.CreateDefaultConstructor<MyStruct>(typeof(MyStruct));
MyStruct myStruct2 = creator2.Invoke();
Assert.AreEqual(0, myStruct2.IntProperty);
}
-108
View File
@@ -1,108 +0,0 @@
{
"version": "1.0.0-*",
"dependencies": {
"Newtonsoft.Json": {
"target": "project"
}
},
"testRunner": "xunit",
"frameworks": {
/*"net45": {
"frameworkAssemblies": {
"System.Collections": "",
"System.ComponentModel.DataAnnotations": "",
"System.Data": "",
"System.Data.DataSetExtensions": "",
"System.Data.Entity": "",
"System.Data.Linq": "",
"System.Drawing": "",
"System.Numerics": "",
"System.Runtime": "",
"System.Runtime.Serialization": "",
"System.Web": "",
"System.Web.Extensions": "",
"System.Xml": "",
"System.Xml.Linq": ""
},
"dependencies": {
"Autofac": "4.0.0-beta7-130",
"FSharp.Core": "4.0.0.1",
"NUnit": "2.6.4",
"System.Collections.Immutable": "1.1.37",
"System.Buffers": "4.0.0-rc2-23826"
}
},
"net40": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "",
"System.Data": "",
"System.Data.DataSetExtensions": "",
"System.Data.Entity": "",
"System.Data.Linq": "",
"System.Drawing": "",
"System.Numerics": "",
"System.Runtime.Serialization": "",
"System.Web": "",
"System.Web.Extensions": "",
"System.Xml": "",
"System.Xml.Linq": ""
},
"dependencies": {
"FSharp.Core": "4.0.0.1",
"NUnit": "2.6.4"
}
},
"net35": {
"frameworkAssemblies": {
"System.ComponentModel.DataAnnotations": "",
"System.Core": "",
"System.Data": "",
"System.Data.DataSetExtensions": "",
"System.Data.Entity": "",
"System.Data.Linq": "",
"System.Drawing": "",
"System.Runtime.Serialization": "",
"System.Web": "",
"System.Web.Extensions": "",
"System.Xml": "",
"System.Xml.Linq": ""
},
"dependencies": {
"NUnit": "2.6.4"
}
},
"net20": {
"frameworkAssemblies": {
"System.Data": "",
"System.Drawing": "",
"System.Web": "",
"System.Xml": ""
},
"dependencies": {
"NUnit": "2.6.4"
}
},*/
"netcoreapp1.0": {
"buildOptions": {
"define": [ "NETSTANDARD1_1", "DNXCORE50", "PORTABLE" ]
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
},
"System.Runtime.Serialization.Primitives": "4.1.1",
"System.Xml.XmlSerializer": "4.0.11",
"System.Runtime.Serialization.Json": "4.0.2",
"System.Runtime.Serialization.Xml": "4.1.1",
"System.ComponentModel.TypeConverter": "4.1.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "2.2.0-preview2-build1029"
},
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}