Skip to content

Commit 0552aff

Browse files
JamesNKJamesNK
committed
-Renamed aspnetcore50 to dnxcore50
-Documentation
1 parent a5865a9 commit 0552aff

File tree

111 files changed

+293
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+293
-309
lines changed

‎Build/build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
$workingDir = "$baseDir\$workingName"
2222
$builds = @(
2323
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true},
24-
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+aspnetcore50"; Framework="net-4.0"; Sign=$true},
24+
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+dnxcore50"; Framework="net-4.0"; Sign=$true},
2525
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"; Sign=$true},
26-
#@{Name = $null; TestsName = "Newtonsoft.Json.Tests.AspNetCore50"; TestsFunction = "CoreClrTests"; Constants="ASPNETCORE50"; FinalDir="ASPNETCORE50"; NuGetDir = $null; Framework=$null; Sign=$null},
26+
#@{Name = $null; TestsName = "Newtonsoft.Json.Tests.DnxCore50"; TestsFunction = "CoreClrTests"; Constants="DNXCORE50"; FinalDir="DNXCORE50"; NuGetDir = $null; Framework=$null; Sign=$null},
2727
@{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
2828
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"; Sign=$true},
2929
@{Name = "Newtonsoft.Json.Net20"; TestsName = "Newtonsoft.Json.Tests.Net20"; TestsFunction = "NUnitTests"; Constants="NET20"; FinalDir="Net20"; NuGetDir = "net20"; Framework="net-2.0"; Sign=$true}

‎Doc/SerializationAttributes.aml

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<topic id="SerializationAttributes" revisionNumber="1">
33
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
4-
<!--
5-
<summary>
6-
<para>Optional summary abstract</para>
7-
</summary>
8-
-->
4+
95
<introduction>
10-
<!-- Uncomment this to generate an outline of the section and sub-section
11-
titles. Specify a numeric value as the inner text to limit it to
12-
a specific number of sub-topics when creating the outline. Specify
13-
zero (0) to limit it to top-level sections only. -->
14-
<!-- <autoOutline /> -->
156
<para>Attributes can be used to control how Json.NET serializes and deserializes .NET objects.</para>
16-
7+
178
<list class="bullet">
189
<listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonObjectAttribute</codeEntityReference> - Placed on classes to control how they should be serialized as a JSON object.</para></listItem>
1910
<listItem><para><codeEntityReference>T:Newtonsoft.Json.JsonArrayAttribute</codeEntityReference> - Placed on collections to control how they should be serialized as a JSON array.</para></listItem>
@@ -28,16 +19,13 @@
2819
<section>
2920
<title>Standard .NET Serialization Attributes</title>
3021
<content>
31-
<!-- Uncomment this to create a sub-section outline
32-
<autoOutline /> -->
3322
<para>As well as using the built-in Json.NET attributes, Json.NET also looks for the <codeEntityReference>T:System.SerializableAttribute</codeEntityReference>
3423
(if IgnoreSerializableAttribute on DefaultContractResolver is set to false)
3524
<codeEntityReference>T:System.Runtime.Serialization.DataContractAttribute</codeEntityReference>,
3625
<codeEntityReference>T:System.Runtime.Serialization.DataMemberAttribute</codeEntityReference>,
3726
and <codeEntityReference>T:System.NonSerializedAttribute</codeEntityReference> and attributes when determining how JSON is to be serialized and deserialized.
3827
</para>
3928

40-
4129
<alert class="note">
4230
<para>Json.NET attributes take precedence over standard .NET serialization attributes (e.g. if both JsonPropertyAttribute
4331
and DataMemberAttribute are present on a property and both customize the name,
@@ -55,8 +43,6 @@
5543
<section>
5644
<title>JsonObjectAttribute</title>
5745
<content>
58-
<!-- Uncomment this to create a sub-section outline
59-
<autoOutline /> -->
6046
<para>The MemberSerialization flag on this attribute specifies whether member serialization is opt-in
6147
(a member must have the JsonProperty or DataMember attribute to be serialized), opt-out (everything is
6248
serialized by default but can be ignored with the JsonIgnoreAttribute, Json.NET's default behavior) or
@@ -72,8 +58,6 @@
7258
<section>
7359
<title>JsonArrayAttribute/JsonDictionaryAttribute</title>
7460
<content>
75-
<!-- Uncomment this to create a sub-section outline
76-
<autoOutline /> -->
7761
<para>The JsonArrayAttribute and JsonDictionaryAttributes are used to specify whether a class is serialized as that collection type.</para>
7862
<para>The collection attributes have options to customize the JsonConverter, type name handling, and reference handling that are applied to collection items.</para>
7963
</content>
@@ -82,8 +66,6 @@
8266
<section>
8367
<title>JsonPropertyAttribute</title>
8468
<content>
85-
<!-- Uncomment this to create a sub-section outline
86-
<autoOutline /> -->
8769
<para>JsonPropertyAttribute has a number of uses:</para>
8870

8971
<list class="bullet">
@@ -110,9 +92,8 @@
11092
<section>
11193
<title>JsonConverterAttribute</title>
11294
<content>
113-
<!-- Uncomment this to create a sub-section outline
114-
<autoOutline /> -->
115-
<para>The JsonConverterAttribute specifies which JsonSerializer is used to convert an object.</para>
95+
<para>The <codeEntityReference>T:Newtonsoft.Json.JsonConverterAttribute</codeEntityReference> specifies which
96+
<codeEntityReference>T:Newtonsoft.Json.JsonConverter</codeEntityReference> is used to convert an object.</para>
11697
<para>The attribute can be placed on a class or a member. When placed on a class, the JsonConverter
11798
specified by the attribute will be the default way of serializing that class. When the attribute is
11899
on a field or property, then the specified JsonConverter will always be used to serialize that value.</para>
@@ -135,8 +116,10 @@
135116
<section>
136117
<title>JsonExtensionDataAttribute</title>
137118
<content>
138-
<para>Instructs the <codeEntityReference>T:Newtonsoft.Json.JsonSerializer</codeEntityReference> to deserialize properties with no matching class member
139-
into the specified collection and write values during serialization.</para>
119+
<para>The <codeEntityReference>T:Newtonsoft.Json.JsonExtensionDataAttribute</codeEntityReference> instructs the
120+
<codeEntityReference>T:Newtonsoft.Json.JsonSerializer</codeEntityReference> to deserialize properties with no matching field or property
121+
on the type into the specified collection. During serialization the values in this collection are written back to the instance's JSON object.</para>
122+
<para>This example shows the JsonExtensionDataAttribute being applied to a field, unmatched JSON properties being added to the field's collection during deserialization.</para>
140123
<code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Serializer\DeserializeExtensionData.cs" region="Types" title="Types" />
141124
<code lang="cs" source="..\Src\Newtonsoft.Json.Tests\Documentation\Samples\Serializer\DeserializeExtensionData.cs" region="Usage" title="Usage" />
142125
</content>
@@ -150,6 +133,7 @@
150133
<codeEntityReference>T:Newtonsoft.Json.JsonDictionaryAttribute</codeEntityReference>
151134
<codeEntityReference>T:Newtonsoft.Json.JsonPropertyAttribute</codeEntityReference>
152135
<codeEntityReference>T:Newtonsoft.Json.JsonConverterAttribute</codeEntityReference>
136+
<codeEntityReference>T:Newtonsoft.Json.JsonExtensionDataAttribute</codeEntityReference>
153137
</relatedTopics>
154138
</developerConceptualDocument>
155139
</topic>

‎Doc/doc.content

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
<Topic id="ca145ed0-f377-4f1c-9479-d1629082fc6e" visible="True" noFile="true" isExpanded="true" title="Reading and Writing JSON">
154154
<Topic id="ReadJsonWithJsonTextReader" visible="True" title="Read JSON with JsonTextReader" />
155155
<Topic id="WriteJsonWithJsonTextWriter" visible="True" title="Write JSON with JsonTextWriter" />
156-
<Topic id="ReadMultipleContentWithJsonReader" visible="True" isSelected="true" title="Read Multiple Content With JsonReader" />
156+
<Topic id="ReadMultipleContentWithJsonReader" visible="True" isSelected="true" title="Read Multiple Fragments With JsonReader" />
157157
<Topic id="CustomJsonReader" visible="True" title="Custom JsonReader" />
158158
<Topic id="CustomJsonWriter" visible="True" title="Custom JsonWriter" />
159159
</Topic>

‎Src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
using System.Runtime.Serialization;
3131
using Newtonsoft.Json.Serialization;
3232
using Newtonsoft.Json.Tests.TestObjects;
33-
#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50)
33+
#if !(NET20 || NET35 || PORTABLE || DNXCORE50)
3434
using System.Numerics;
3535
#endif
3636
using System.Text;
@@ -39,7 +39,7 @@
3939
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4040
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
4141
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
42-
#elif ASPNETCORE50
42+
#elif DNXCORE50
4343
using Xunit;
4444
using Test = Xunit.FactAttribute;
4545
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
@@ -1506,7 +1506,7 @@ public void Utf8Text()
15061506
}
15071507
#endif
15081508

1509-
#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40)
1509+
#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40)
15101510
public class BigIntegerTestClass
15111511
{
15121512
public BigInteger Blah { get; set; }

‎Src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
using System;
2727
using System.Collections.Generic;
28-
#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50)
28+
#if !(NET20 || NET35 || PORTABLE || DNXCORE50)
2929
using System.Numerics;
3030
#endif
3131
using System.Text;
@@ -34,7 +34,7 @@
3434
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3535
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3636
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
37-
#elif ASPNETCORE50
37+
#elif DNXCORE50
3838
using Xunit;
3939
using Test = Xunit.FactAttribute;
4040
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
@@ -803,7 +803,7 @@ public void WriteStringReadGuid()
803803
Assert.AreEqual(c.AGuid, c2.AGuid.ToString());
804804
}
805805

806-
#if !(NET20 || NET35 || PORTABLE || ASPNETCORE50 || PORTABLE40)
806+
#if !(NET20 || NET35 || PORTABLE || DNXCORE50 || PORTABLE40)
807807
[Test]
808808
public void WriteBigInteger()
809809
{

‎Src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
using System;
2727
using System.Collections.Generic;
28-
#if !(NET20 || NETFX_CORE || ASPNETCORE50)
28+
#if !(NET20 || NETFX_CORE || DNXCORE50)
2929
using System.Data.Linq;
3030
#endif
31-
#if !(NETFX_CORE || ASPNETCORE50)
31+
#if !(NETFX_CORE || DNXCORE50)
3232
using System.Data.SqlTypes;
3333
#endif
3434
using System.Text;
@@ -37,7 +37,7 @@
3737
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3838
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3939
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
40-
#elif ASPNETCORE50
40+
#elif DNXCORE50
4141
using Xunit;
4242
using Test = Xunit.FactAttribute;
4343
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
@@ -58,7 +58,7 @@ public class ByteArrayClass
5858
public byte[] NullByteArray { get; set; }
5959
}
6060

61-
#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50)
61+
#if !(NET20 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
6262
[Test]
6363
public void DeserializeBinaryClass()
6464
{
@@ -124,7 +124,7 @@ public void SerializeByteArrayClass()
124124
}", json);
125125
}
126126

127-
#if !(NETFX_CORE || PORTABLE || PORTABLE40 || ASPNETCORE50)
127+
#if !(NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
128128
public class SqlBinaryClass
129129
{
130130
public SqlBinary SqlBinary { get; set; }

‎Src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3131
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3232
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
33-
#elif ASPNETCORE50
33+
#elif DNXCORE50
3434
using Xunit;
3535
using Test = Xunit.FactAttribute;
3636
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26-
#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40)
26+
#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40)
2727
using System;
2828
using Newtonsoft.Json.Converters;
2929
#if NETFX_CORE
3030
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3131
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3232
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
33-
#elif ASPNETCORE50
33+
#elif DNXCORE50
3434
using Xunit;
3535
using Test = Xunit.FactAttribute;
3636
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/DataTableConverterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
using System.Text;
2828
using Newtonsoft.Json.Bson;
2929
using Newtonsoft.Json.Linq;
30-
#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40)
30+
#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40)
3131
using System;
3232
using System.Collections.Generic;
3333
#if NETFX_CORE
3434
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3535
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3636
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
37-
#elif ASPNETCORE50
37+
#elif DNXCORE50
3838
using Xunit;
3939
using Test = Xunit.FactAttribute;
4040
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/DiscriminatedUnionConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26-
#if !(NET35 || NET20 || NETFX_CORE || ASPNETCORE50)
26+
#if !(NET35 || NET20 || NETFX_CORE || DNXCORE50)
2727
using System.Diagnostics;
2828
using System.Reflection;
2929
using Microsoft.FSharp.Core;

‎Src/Newtonsoft.Json.Tests/Converters/ExpandoObjectConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3535
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3636
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
37-
#elif ASPNETCORE50
37+
#elif DNXCORE50
3838
using Xunit;
3939
using Test = Xunit.FactAttribute;
4040
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3030
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3131
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
32-
#elif ASPNETCORE50
32+
#elif DNXCORE50
3333
using Xunit;
3434
using Test = Xunit.FactAttribute;
3535
using Assert = Newtonsoft.Json.Tests.XUnitAssert;
@@ -126,7 +126,7 @@ public void SerializeCustomFormattedDateTime()
126126
Assert.AreEqual(2006, d.Year);
127127
}
128128

129-
#if !(NETFX_CORE || ASPNETCORE50)
129+
#if !(NETFX_CORE || DNXCORE50)
130130
[Test]
131131
public void SerializeFormattedDateTimeNewZealandCulture()
132132
{

‎Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3030
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3131
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
32-
#elif ASPNETCORE50
32+
#elif DNXCORE50
3333
using Xunit;
3434
using Test = Xunit.FactAttribute;
3535
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/KeyValuePairConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
88
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
99
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
10-
#elif ASPNETCORE50
10+
#elif DNXCORE50
1111
using Xunit;
1212
using Test = Xunit.FactAttribute;
1313
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/ObjectIdConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3131
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3232
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
33-
#elif ASPNETCORE50
33+
#elif DNXCORE50
3434
using Xunit;
3535
using Test = Xunit.FactAttribute;
3636
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/RegexConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3636
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3737
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
38-
#elif ASPNETCORE50
38+
#elif DNXCORE50
3939
using Xunit;
4040
using Test = Xunit.FactAttribute;
4141
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3636
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3737
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
38-
#elif ASPNETCORE50
38+
#elif DNXCORE50
3939
using Xunit;
4040
using Test = Xunit.FactAttribute;
4141
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/VersionConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3030
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3131
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
32-
#elif ASPNETCORE50
32+
#elif DNXCORE50
3333
using Xunit;
3434
using Test = Xunit.FactAttribute;
3535
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using System.Linq;
3030
#endif
3131
using System.Text;
32-
#if !(NETFX_CORE || PORTABLE || ASPNETCORE50 || PORTABLE40)
32+
#if !(NETFX_CORE || PORTABLE || DNXCORE50 || PORTABLE40)
3333
using System;
3434
using System.Collections.Generic;
3535
using Newtonsoft.Json.Tests.Serialization;
@@ -38,7 +38,7 @@
3838
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3939
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
4040
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
41-
#elif ASPNETCORE50
41+
#elif DNXCORE50
4242
using Xunit;
4343
using Test = Xunit.FactAttribute;
4444
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/DemoTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
3737
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
3838
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
39-
#elif ASPNETCORE50
39+
#elif DNXCORE50
4040
using Xunit;
4141
using Test = Xunit.FactAttribute;
4242
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

‎Src/Newtonsoft.Json.Tests/Documentation/ConditionalPropertiesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// OTHER DEALINGS IN THE SOFTWARE.
2424
#endregion
2525

26-
#if !(NET35 || NET20 || PORTABLE || ASPNETCORE50)
26+
#if !(NET35 || NET20 || PORTABLE || DNXCORE50)
2727
using System;
2828
using System.Collections.Generic;
2929
using System.ComponentModel;
@@ -41,7 +41,7 @@
4141
using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
4242
using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
4343
using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
44-
#elif ASPNETCORE50
44+
#elif DNXCORE50
4545
using Xunit;
4646
using Test = Xunit.FactAttribute;
4747
using Assert = Newtonsoft.Json.Tests.XUnitAssert;

0 commit comments

Comments
 (0)