From 9c2a1d853d7b1818b83726cdbb5aaf6bbc7485fc Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 7 Dec 2014 16:31:52 +1300 Subject: [PATCH] -Fixed build --- .../Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs | 9 --------- Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs | 2 +- Src/Newtonsoft.Json/Properties/AssemblyInfo.cs | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs index 9c8d4d43..8a33554f 100644 --- a/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.7.18002")] +[assembly: AssemblyFileVersion("6.0.7.18007")] diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs index d9465a79..7a19a56c 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenTests.cs @@ -25,7 +25,6 @@ using System; using System.Collections.Generic; -using System.Xml.Linq; #if !(NET20 || NET35 || PORTABLE || ASPNETCORE50) using System.Numerics; #endif @@ -721,14 +720,6 @@ namespace Newtonsoft.Json.Tests.Linq [Test] public void DescendantsAndSelf() { - XElement e = new XElement("name"); - e.Add(new XElement("child")); - - var x = e.DescendantsAndSelf().ToList(); - Assert.AreEqual(2, x.Count); - Assert.AreEqual(e, x[0]); - Assert.AreEqual(e.Element("child"), x[1]); - JArray a = new JArray( 5, diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 5bfb1f25..991cb458 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -76,4 +76,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.7.18002")] +[assembly: AssemblyFileVersion("6.0.7.18007")] diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index ef762883..0ddff139 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -92,5 +92,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.7.18002")] +[assembly: AssemblyFileVersion("6.0.7.18007")] [assembly: CLSCompliant(true)]