Migrate project.json to csproj (#1212)
This commit is contained in:
James Newton-King
committed by
GitHub
GitHub
parent
635feb1549
commit
cc6d99aa60
@@ -1,34 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B520C700-7D45-4D82-BFB5-218FA68CF5CF}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
global.json = global.json
|
||||
NuGet.Config = NuGet.Config
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Dotnet", "Newtonsoft.Json\Newtonsoft.Json.Dotnet.xproj", "{779E052E-7218-4DA3-B419-FFB0F4C95081}"
|
||||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Tests.Dotnet", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Dotnet.xproj", "{13E906AE-5A47-4354-8CAF-E63E8AC541ED}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -0,0 +1,54 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26206.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B520C700-7D45-4D82-BFB5-218FA68CF5CF}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
global.json = global.json
|
||||
NuGet.Config = NuGet.Config
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Newtonsoft.Json.Roslyn", "Newtonsoft.Json\Newtonsoft.Json.Roslyn.csproj", "{A97A4CB3-51AD-4605-BA9F-D6861E582C85}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Newtonsoft.Json.Tests.Roslyn", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Roslyn.csproj", "{462EA9B9-8532-4330-9160-DF3450C70880}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|x64.Build.0 = Debug|x64
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Debug|x86.Build.0 = Debug|x86
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|x64.ActiveCfg = Release|x64
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|x64.Build.0 = Release|x64
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|x86.ActiveCfg = Release|x86
|
||||
{A97A4CB3-51AD-4605-BA9F-D6861E582C85}.Release|x86.Build.0 = Release|x86
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|x64.Build.0 = Debug|x64
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Debug|x86.Build.0 = Debug|x86
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|x64.ActiveCfg = Release|x64
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|x64.Build.0 = Release|x64
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|x86.ActiveCfg = Release|x86
|
||||
{462EA9B9-8532-4330-9160-DF3450C70880}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -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]
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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>779e052e-7218-4da3-b419-ffb0f4c95081</ProjectGuid>
|
||||
<RootNamespace>Newtonsoft.Json</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>
|
||||
@@ -19,8 +19,8 @@
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\Portable\</OutputPath>
|
||||
<IntermediateOutputPath>obj\Debug\Portable\</IntermediateOutputPath>
|
||||
<OutputPath>bin\Debug\portable-net45+win8+wpa81+wp8\</OutputPath>
|
||||
<IntermediateOutputPath>obj\Debug\portable-net45+win8+wpa81+wp8\</IntermediateOutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
@@ -30,11 +30,12 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\Portable\</OutputPath>
|
||||
<IntermediateOutputPath>obj\Release\Portable\</IntermediateOutputPath>
|
||||
<DefineConstants>TRACE;CODE_ANALYSIS;$(DefineConstants);$(AdditionalConstants)</DefineConstants><ErrorReport>prompt</ErrorReport>
|
||||
<OutputPath>bin\Release\portable-net45+win8+wpa81+wp8\</OutputPath>
|
||||
<IntermediateOutputPath>obj\Release\portable-net45+win8+wpa81+wp8\</IntermediateOutputPath>
|
||||
<DefineConstants>TRACE;CODE_ANALYSIS;$(DefineConstants);$(AdditionalConstants)</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<DocumentationFile>bin\Release\Portable\Newtonsoft.Json.xml</DocumentationFile>
|
||||
<DocumentationFile>bin\Release\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.xml</DocumentationFile>
|
||||
<RunCodeAnalysis>true</RunCodeAnalysis>
|
||||
<CodeAnalysisRuleSet>Newtonsoft.Json.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks Condition="'$(DotnetOnly)'==''">net45;net40;net35;net20;netstandard1.0;netstandard1.1;portable-net45+win8+wpa81+wp8</TargetFrameworks>
|
||||
<TargetFrameworks Condition="'$(DotnetOnly)'=='true'">netstandard1.0;netstandard1.1</TargetFrameworks>
|
||||
<!--<TargetFrameworks>net45;net40;net35;net20;netstandard1.0;portable-net45+win8+wpa81+wp8</TargetFrameworks>-->
|
||||
<VersionPrefix>10.0.1</VersionPrefix>
|
||||
<VersionSuffix>beta1</VersionSuffix>
|
||||
<Authors>James Newton-King</Authors>
|
||||
<Company>Newtonsoft</Company>
|
||||
<AssemblyTitle>Json.NET</AssemblyTitle>
|
||||
<Description>Json.NET is a popular high-performance JSON framework for .NET</Description>
|
||||
<Copyright>Copyright © James Newton-King 2008</Copyright>
|
||||
<Summary>Json.NET is a popular high-performance JSON framework for .NET</Summary>
|
||||
<NeutralLanguage>en-US</NeutralLanguage>
|
||||
<PackageId>Newtonsoft.Json</PackageId>
|
||||
<PackageTags>json</PackageTags>
|
||||
<PackageIconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</PackageIconUrl>
|
||||
<PackageProjectUrl>http://www.newtonsoft.com/json</PackageProjectUrl>
|
||||
<PackageLicenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</PackageLicenseUrl>
|
||||
<RepositoryUrl>https://github.com/JamesNK/Newtonsoft.Json</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<AssemblyName>Newtonsoft.Json</AssemblyName>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
|
||||
<AssemblyTitle>Json.NET</AssemblyTitle>
|
||||
<DefineConstants>HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)'=='net40'">
|
||||
<DefineConstants>NET40;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_BIG_INTEGER;HAVE_BINARY_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_REFLECTION_EMIT;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)'=='net35'">
|
||||
<DefineConstants>NET35;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_BINARY_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_FULL_REFLECTION;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_REFLECTION_EMIT;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_XLINQ;HAVE_XML_DOCUMENT;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)'=='net20'">
|
||||
<DefineConstants>NET20;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_BINARY_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_DB_NULL_TYPE_CODE;HAVE_EMPTY_TYPES;HAVE_FULL_REFLECTION;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_MEMORY_BARRIER;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_REFLECTION_EMIT;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_XML_DOCUMENT;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
|
||||
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.1.0" />
|
||||
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
|
||||
<AssemblyTitle>Json.NET .NET Standard 1.0</AssemblyTitle>
|
||||
<DefineConstants>NETSTANDARD1_0;PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
|
||||
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.1.0" />
|
||||
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
|
||||
<AssemblyTitle>Json.NET .NET Standard 1.1</AssemblyTitle>
|
||||
<DefineConstants>NETSTANDARD1_1;PORTABLE;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;$(AdditionalConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'portable-net45+win8+wpa81+wp8'">
|
||||
<DefineConstants>PORTABLE;HAVE_ASYNC;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DYNAMIC;HAVE_EXPRESSIONS;HAVE_FSHARP_TYPES;HAVE_GUID_TRY_PARSE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_IMMUTABLE_COLLECTIONS;HAVE_ISET;HAVE_LINQ;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_BINDER;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_INOTIFY_COLLECTION_CHANGED;$(AdditionalConstants)</DefineConstants>
|
||||
<TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
|
||||
<NugetTargetMoniker>.NETPortable,Version=v0.0,Profile=Profile259</NugetTargetMoniker>
|
||||
<LanguageTargets>$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets</LanguageTargets>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -96,6 +96,6 @@ 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")]
|
||||
[assembly: CLSCompliant(true)]
|
||||
@@ -1,269 +0,0 @@
|
||||
{
|
||||
"version": "1.0.0-*",
|
||||
"title": "Json.NET",
|
||||
"description": "Json.NET is a popular high-performance JSON framework for .NET",
|
||||
"language": "en-US",
|
||||
"authors": [ "James Newton-King" ],
|
||||
"packOptions": {
|
||||
"projectUrl": "http://www.newtonsoft.com/json",
|
||||
"tags": [ "json" ],
|
||||
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
|
||||
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/JamesNK/Newtonsoft.Json"
|
||||
}
|
||||
},
|
||||
"frameworks": {
|
||||
"net45": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Data": "",
|
||||
"System.Numerics": "",
|
||||
"System.Runtime.Serialization": "",
|
||||
"System.Xml": "",
|
||||
"System.Xml.Linq": ""
|
||||
}
|
||||
},
|
||||
"net40": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Data": "",
|
||||
"System.Numerics": "",
|
||||
"System.Runtime.Serialization": "",
|
||||
"System.Xml": "",
|
||||
"System.Xml.Linq": ""
|
||||
}
|
||||
},
|
||||
"net35": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Core": "",
|
||||
"System.Data": "",
|
||||
"System.Runtime.Serialization": "",
|
||||
"System.Xml": "",
|
||||
"System.Xml.Linq": ""
|
||||
}
|
||||
},
|
||||
"net20": {
|
||||
"frameworkAssemblies": {
|
||||
"System.Data": "",
|
||||
"System.Xml": ""
|
||||
}
|
||||
},
|
||||
".NETPortable,Version=v4.5,Profile=Profile259": {
|
||||
"buildOptions": {
|
||||
"define": [
|
||||
"PORTABLE",
|
||||
"HAVE_ASYNC",
|
||||
"HAVE_COVARIANT_GENERICS",
|
||||
"HAVE_DATA_CONTRACTS",
|
||||
"HAVE_DATE_TIME_OFFSET",
|
||||
"HAVE_DYNAMIC",
|
||||
"HAVE_EXPRESSIONS",
|
||||
"HAVE_FSHARP_TYPES",
|
||||
"HAVE_GUID_TRY_PARSE",
|
||||
"HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE",
|
||||
"HAVE_IMMUTABLE_COLLECTIONS",
|
||||
"HAVE_ISET",
|
||||
"HAVE_LINQ",
|
||||
"HAVE_METHOD_IMPL_ATTRIBUTE",
|
||||
"HAVE_READ_ONLY_COLLECTIONS",
|
||||
"HAVE_REFLECTION_BINDER",
|
||||
"HAVE_SERIALIZATION_BINDER_BIND_TO_NAME",
|
||||
"HAVE_STRING_JOIN_WITH_ENUMERABLE",
|
||||
"HAVE_TIME_SPAN_PARSE_WITH_CULTURE",
|
||||
"HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE",
|
||||
"HAVE_TIME_ZONE_INFO",
|
||||
"HAVE_VARIANT_TYPE_PARAMETERS",
|
||||
"HAVE_VERSION_TRY_PARSE",
|
||||
"HAVE_XLINQ",
|
||||
"HAVE_INOTIFY_COLLECTION_CHANGED"
|
||||
]
|
||||
},
|
||||
"frameworkAssemblies": {
|
||||
"Microsoft.CSharp": "",
|
||||
"System": "",
|
||||
"System.Collections": "",
|
||||
"System.Core": "",
|
||||
"System.Diagnostics.Debug": "",
|
||||
"System.Dynamic.Runtime": "",
|
||||
"System.Globalization": "",
|
||||
"System.IO": "",
|
||||
"System.Linq": "",
|
||||
"System.Linq.Expressions": "",
|
||||
"System.ObjectModel": "",
|
||||
"System.Reflection": "",
|
||||
"System.Reflection.Extensions": "",
|
||||
"System.Resources.ResourceManager": "",
|
||||
"System.Runtime": "",
|
||||
"System.Runtime.Extensions": "",
|
||||
"System.Runtime.Serialization": "",
|
||||
"System.Runtime.Serialization.Primitives": "",
|
||||
"System.Text.Encoding": "",
|
||||
"System.Text.Encoding.Extensions": "",
|
||||
"System.Text.RegularExpressions": "",
|
||||
"System.Threading": "",
|
||||
"System.Threading.Tasks": "",
|
||||
"System.Xml": "",
|
||||
"System.Xml.Linq": "",
|
||||
"System.Xml.ReaderWriter": "",
|
||||
"System.Xml.XDocument": ""
|
||||
}
|
||||
},
|
||||
".NETPortable,Version=v4.0,Profile=Profile328": {
|
||||
"buildOptions": {
|
||||
"define": [
|
||||
"PORTABLE40",
|
||||
"HAVE_CHAR_TO_LOWER_WITH_CULTURE",
|
||||
"HAVE_DATA_CONTRACTS",
|
||||
"HAVE_DATE_TIME_OFFSET",
|
||||
"HAVE_DB_NULL_TYPE_CODE",
|
||||
"HAVE_FSHARP_TYPES",
|
||||
"HAVE_FULL_REFLECTION",
|
||||
"HAVE_GUID_TRY_PARSE",
|
||||
"HAVE_ICONVERTIBLE",
|
||||
"HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE",
|
||||
"HAVE_IMMUTABLE_COLLECTIONS",
|
||||
"HAVE_ISET",
|
||||
"HAVE_LINQ",
|
||||
"HAVE_MEMORY_BARRIER",
|
||||
"HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE",
|
||||
"HAVE_SERIALIZATION_BINDER_BIND_TO_NAME",
|
||||
"HAVE_STRING_JOIN_WITH_ENUMERABLE",
|
||||
"HAVE_TIME_SPAN_PARSE_WITH_CULTURE",
|
||||
"HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE",
|
||||
"HAVE_TIME_ZONE_INFO",
|
||||
"HAVE_VARIANT_TYPE_PARAMETERS",
|
||||
"HAVE_VERSION_TRY_PARSE"
|
||||
]
|
||||
},
|
||||
"frameworkAssemblies": {
|
||||
"mscorlib": "",
|
||||
"System": "",
|
||||
"System.Core": "",
|
||||
"System.Runtime.Serialization": "",
|
||||
"System.Xml": ""
|
||||
}
|
||||
},
|
||||
"netstandard1.0": {
|
||||
"buildOptions": {
|
||||
"define": [
|
||||
"NETSTANDARD1_0",
|
||||
"PORTABLE",
|
||||
"HAVE_ASYNC",
|
||||
"HAVE_COVARIANT_GENERICS",
|
||||
"HAVE_DATA_CONTRACTS",
|
||||
"HAVE_DATE_TIME_OFFSET",
|
||||
"HAVE_DYNAMIC",
|
||||
"HAVE_EXPRESSIONS",
|
||||
"HAVE_FSHARP_TYPES",
|
||||
"HAVE_GUID_TRY_PARSE",
|
||||
"HAVE_HASH_SET",
|
||||
"HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE",
|
||||
"HAVE_IMMUTABLE_COLLECTIONS",
|
||||
"HAVE_INOTIFY_COLLECTION_CHANGED",
|
||||
"HAVE_ISET",
|
||||
"HAVE_LINQ",
|
||||
"HAVE_METHOD_IMPL_ATTRIBUTE",
|
||||
"HAVE_READ_ONLY_COLLECTIONS",
|
||||
"HAVE_REFLECTION_BINDER",
|
||||
"HAVE_SERIALIZATION_BINDER_BIND_TO_NAME",
|
||||
"HAVE_STRING_JOIN_WITH_ENUMERABLE",
|
||||
"HAVE_TIME_SPAN_PARSE_WITH_CULTURE",
|
||||
"HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE",
|
||||
"HAVE_TIME_ZONE_INFO",
|
||||
"HAVE_TYPE_DESCRIPTOR",
|
||||
"HAVE_UNICODE_SURROGATE_DETECTION",
|
||||
"HAVE_VARIANT_TYPE_PARAMETERS",
|
||||
"HAVE_VERSION_TRY_PARSE",
|
||||
"HAVE_XLINQ"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"Microsoft.CSharp": "4.0.1",
|
||||
"System.Collections": "4.0.11",
|
||||
"System.ComponentModel.TypeConverter": "4.1.0",
|
||||
"System.Diagnostics.Debug": "4.0.11",
|
||||
"System.Dynamic.Runtime": "4.0.11",
|
||||
"System.Globalization": "4.0.11",
|
||||
"System.IO": "4.1.0",
|
||||
"System.Linq": "4.1.0",
|
||||
"System.Linq.Expressions": "4.1.0",
|
||||
"System.ObjectModel": "4.0.12",
|
||||
"System.Reflection": "4.1.0",
|
||||
"System.Reflection.Extensions": "4.0.1",
|
||||
"System.Resources.ResourceManager": "4.0.1",
|
||||
"System.Runtime": "4.1.0",
|
||||
"System.Runtime.Extensions": "4.1.0",
|
||||
"System.Runtime.Serialization.Primitives": "4.1.1",
|
||||
"System.Text.Encoding": "4.0.11",
|
||||
"System.Text.Encoding.Extensions": "4.0.11",
|
||||
"System.Text.RegularExpressions": "4.1.0",
|
||||
"System.Threading": "4.0.11",
|
||||
"System.Threading.Tasks": "4.0.11",
|
||||
"System.Xml.ReaderWriter": "4.0.11",
|
||||
"System.Xml.XDocument": "4.0.11"
|
||||
}
|
||||
},
|
||||
"netstandard1.1": {
|
||||
"buildOptions": {
|
||||
"define": [
|
||||
"NETSTANDARD1_1",
|
||||
"PORTABLE",
|
||||
"HAVE_ASYNC",
|
||||
"HAVE_BIG_INTEGER",
|
||||
"HAVE_COVARIANT_GENERICS",
|
||||
"HAVE_DATA_CONTRACTS",
|
||||
"HAVE_DATE_TIME_OFFSET",
|
||||
"HAVE_DYNAMIC",
|
||||
"HAVE_EXPRESSIONS",
|
||||
"HAVE_FSHARP_TYPES",
|
||||
"HAVE_GUID_TRY_PARSE",
|
||||
"HAVE_HASH_SET",
|
||||
"HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE",
|
||||
"HAVE_IMMUTABLE_COLLECTIONS",
|
||||
"HAVE_INOTIFY_COLLECTION_CHANGED",
|
||||
"HAVE_ISET",
|
||||
"HAVE_LINQ",
|
||||
"HAVE_METHOD_IMPL_ATTRIBUTE",
|
||||
"HAVE_READ_ONLY_COLLECTIONS",
|
||||
"HAVE_REFLECTION_BINDER",
|
||||
"HAVE_SERIALIZATION_BINDER_BIND_TO_NAME",
|
||||
"HAVE_STRING_JOIN_WITH_ENUMERABLE",
|
||||
"HAVE_TIME_SPAN_PARSE_WITH_CULTURE",
|
||||
"HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE",
|
||||
"HAVE_TIME_ZONE_INFO",
|
||||
"HAVE_TYPE_DESCRIPTOR",
|
||||
"HAVE_UNICODE_SURROGATE_DETECTION",
|
||||
"HAVE_VARIANT_TYPE_PARAMETERS",
|
||||
"HAVE_VERSION_TRY_PARSE",
|
||||
"HAVE_XLINQ"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"Microsoft.CSharp": "4.0.1",
|
||||
"System.Collections": "4.0.11",
|
||||
"System.ComponentModel.TypeConverter": "4.1.0",
|
||||
"System.Diagnostics.Debug": "4.0.11",
|
||||
"System.Dynamic.Runtime": "4.0.11",
|
||||
"System.Globalization": "4.0.11",
|
||||
"System.IO": "4.1.0",
|
||||
"System.Linq": "4.1.0",
|
||||
"System.Linq.Expressions": "4.1.0",
|
||||
"System.ObjectModel": "4.0.12",
|
||||
"System.Reflection": "4.1.0",
|
||||
"System.Reflection.Extensions": "4.0.1",
|
||||
"System.Resources.ResourceManager": "4.0.1",
|
||||
"System.Runtime": "4.1.0",
|
||||
"System.Runtime.Extensions": "4.1.0",
|
||||
"System.Runtime.Numerics": "4.0.1",
|
||||
"System.Runtime.Serialization.Primitives": "4.1.1",
|
||||
"System.Text.Encoding": "4.0.11",
|
||||
"System.Text.Encoding.Extensions": "4.0.11",
|
||||
"System.Text.RegularExpressions": "4.1.0",
|
||||
"System.Threading": "4.0.11",
|
||||
"System.Threading.Tasks": "4.0.11",
|
||||
"System.Xml.ReaderWriter": "4.0.11",
|
||||
"System.Xml.XDocument": "4.0.11"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-4
@@ -1,6 +1,3 @@
|
||||
{
|
||||
"projects": [ "src" ],
|
||||
"sdk": {
|
||||
"version": "1.0.0-preview2-003121"
|
||||
}
|
||||
"projects": [ "src" ]
|
||||
}
|
||||
Reference in New Issue
Block a user