diff --git a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs index c6b07a8c..5b88844c 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs @@ -23,6 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +using System.Text; #if !(NETFX_CORE || PORTABLE || PORTABLE40) using System; using System.Collections.Generic; @@ -144,8 +145,7 @@ namespace Newtonsoft.Json.Tests.Converters doc.LoadXml(""); json = JsonConvert.SerializeXmlNode(doc, Formatting.Indented, true); - Assert.AreEqual("null", json); - + Assert.AreEqual(@"""""", json); XDocument doc1 = XDocument.Parse(""); @@ -155,7 +155,7 @@ namespace Newtonsoft.Json.Tests.Converters doc1 = XDocument.Parse(""); json = JsonConvert.SerializeXNode(doc1, Formatting.Indented, true); - Assert.AreEqual("null", json); + Assert.AreEqual(@"""""", json); } [Test] @@ -345,6 +345,137 @@ namespace Newtonsoft.Json.Tests.Converters Console.WriteLine(); } + [Test] + public void XmlDocumentTypeSerialize() + { + string xml = @"00-16.310Dow Jones2014-04-17 15:50:370016460.4902014-04-17 15:50:3716408.54016368.14016424.140-0.099016424.8500DJII013618870011309.0009302.2800009.290NASDAQ2014-04-17 15:40:01004110.4602014-04-17 15:40:014095.5204064.7004080.3000.22704086.2300COMP017842101004371.7103154.9600Couldn't find ticker: SPIC?2"; + + string expected = @"{ + ""?xml"": { + ""@version"": ""1.0"", + ""@encoding"": ""utf-8"" + }, + ""!DOCTYPE"": { + ""@name"": ""STOCKQUOTE"", + ""@public"": ""-//W3C//DTD StockQuote 1.5//EN"", + ""@system"": ""http://www.irxml.org/dtd/stockquote_1.5.dtd"" + }, + ""STOCKQUOTE"": { + ""@ROWCOUNT"": ""2"", + ""RESULT"": { + ""ROW"": [ + { + ""ASK"": ""0"", + ""BID"": ""0"", + ""CHANGE"": ""-16.310"", + ""COMPANYNAME"": ""Dow Jones"", + ""DATETIME"": ""2014-04-17 15:50:37"", + ""DIVIDEND"": ""0"", + ""EPS"": ""0"", + ""EXCHANGE"": """", + ""HIGH"": ""16460.490"", + ""LASTDATETIME"": ""2014-04-17 15:50:37"", + ""LASTPRICE"": ""16408.540"", + ""LOW"": ""16368.140"", + ""OPEN"": ""16424.140"", + ""PCHANGE"": ""-0.099"", + ""PE"": ""0"", + ""PREVIOUSCLOSE"": ""16424.850"", + ""SHARES"": ""0"", + ""TICKER"": ""DJII"", + ""TRADES"": ""0"", + ""VOLUME"": ""136188700"", + ""YEARHIGH"": ""11309.000"", + ""YEARLOW"": ""9302.280"", + ""YIELD"": ""0"" + }, + { + ""ASK"": ""0"", + ""BID"": ""0"", + ""CHANGE"": ""9.290"", + ""COMPANYNAME"": ""NASDAQ"", + ""DATETIME"": ""2014-04-17 15:40:01"", + ""DIVIDEND"": ""0"", + ""EPS"": ""0"", + ""EXCHANGE"": """", + ""HIGH"": ""4110.460"", + ""LASTDATETIME"": ""2014-04-17 15:40:01"", + ""LASTPRICE"": ""4095.520"", + ""LOW"": ""4064.700"", + ""OPEN"": ""4080.300"", + ""PCHANGE"": ""0.227"", + ""PE"": ""0"", + ""PREVIOUSCLOSE"": ""4086.230"", + ""SHARES"": ""0"", + ""TICKER"": ""COMP"", + ""TRADES"": ""0"", + ""VOLUME"": ""1784210100"", + ""YEARHIGH"": ""4371.710"", + ""YEARLOW"": ""3154.960"", + ""YIELD"": ""0"" + } + ] + }, + ""STATUS"": ""Couldn't find ticker: SPIC?"", + ""STATUSCODE"": ""2"" + } +}"; + + XmlDocument doc1 = new XmlDocument(); + doc1.LoadXml(xml); + + string json1 = JsonConvert.SerializeXmlNode(doc1, Formatting.Indented); + + Assert.AreEqual(expected, json1); + + XmlDocument doc11 = JsonConvert.DeserializeXmlNode(json1); + + Assert.AreEqual(xml, ToStringWithDeclaration(doc11)); + +#if !NET20 + XDocument doc2 = XDocument.Parse(xml); + + string json2 = JsonConvert.SerializeXNode(doc2, Formatting.Indented); + + Assert.AreEqual(expected, json2); + + XDocument doc22 = JsonConvert.DeserializeXNode(json2); + + Assert.AreEqual(xml, ToStringWithDeclaration(doc22)); +#endif + } + + public class Utf8StringWriter : StringWriter + { + public override Encoding Encoding { get { return Encoding.UTF8; } } + + public Utf8StringWriter(StringBuilder sb) : base(sb) + { + } + } + +#if !NET20 + public static string ToStringWithDeclaration(XDocument doc, bool indent = false) + { + StringBuilder builder = new StringBuilder(); + using (var writer = XmlWriter.Create(new Utf8StringWriter(builder), new XmlWriterSettings { Indent = indent })) + { + doc.Save(writer); + } + return builder.ToString(); + } +#endif + + public static string ToStringWithDeclaration(XmlDocument doc, bool indent = false) + { + StringBuilder builder = new StringBuilder(); + using (var writer = XmlWriter.Create(new Utf8StringWriter(builder), new XmlWriterSettings { Indent = indent })) + { + doc.Save(writer); + } + return builder.ToString(); + } + [Test] public void NamespaceSerializeDeserialize() { @@ -1325,12 +1456,23 @@ namespace Newtonsoft.Json.Tests.Converters } ], ""C"": [ - null, - null + """", + """" ] } } }", json); + + XmlDocument d2 = JsonConvert.DeserializeXmlNode(json); + + Assert.AreEqual(@" + + + + + + +", ToStringWithDeclaration(d2, true)); } [Test] diff --git a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs index 90324656..4756e086 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/JTokenWriterTest.cs @@ -88,7 +88,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(0.99, (double)root[5]); Assert.AreEqual(0.000000000000000001d, (double)root[6]); Assert.AreEqual(0.000000000000000001m, (decimal)root[7]); - Assert.AreEqual(string.Empty, (string)root[8]); + Assert.AreEqual(null, (string)root[8]); Assert.AreEqual("This is a string.", (string)root[9]); Assert.AreEqual(null, ((JValue)root[10]).Value); Assert.AreEqual(null, ((JValue)root[11]).Value); diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj index c28811c6..11807c0d 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj @@ -39,9 +39,9 @@ ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - + False - ..\packages\Microsoft.Bcl.Immutable.1.0.27\lib\portable-net45+win8+wp8\System.Collections.Immutable.dll + ..\packages\Microsoft.Bcl.Immutable.1.1.20-beta\lib\portable-net45+win8\System.Collections.Immutable.dll diff --git a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs index 2a1f467f..f9655ecb 100644 --- a/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs @@ -75,4 +75,4 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.2.17209")] +[assembly: AssemblyFileVersion("6.0.2.17225")] diff --git a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs index d3124e08..de83bd17 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/ImmutableCollectionsTests.cs @@ -102,42 +102,49 @@ namespace Newtonsoft.Json.Tests.Serialization } #endregion - // #region Array - // [Test] - // public void SerializeArray() - // { - // ImmutableArray l = ImmutableArray.From(new List - // { - // "One", - // "II", - // "3" - // }); + #region Array + [Test] + public void SerializeArray() + { + ImmutableArray l = ImmutableArray.CreateRange(new List + { + "One", + "II", + "3" + }); - // string json = JsonConvert.SerializeObject(l, Formatting.Indented); - // Assert.AreEqual(@"[ - // ""One"", - // ""II"", - // ""3"" - //]", json); - // } + string json = JsonConvert.SerializeObject(l, Formatting.Indented); + Assert.AreEqual(@"[ + ""One"", + ""II"", + ""3"" +]", json); + } - // [Test] - // public void DeserializeArray() - // { - // string json = @"[ - // ""One"", - // ""II"", - // ""3"" - //]"; + [Test] + public void DeserializeArray() + { + string json = @"[ + ""One"", + ""II"", + ""3"" + ]"; - // ImmutableArray l = JsonConvert.DeserializeObject>(json); + ImmutableArray l = JsonConvert.DeserializeObject>(json); - // Assert.AreEqual(3, l.Length); - // Assert.AreEqual("One", l[0]); - // Assert.AreEqual("II", l[1]); - // Assert.AreEqual("3", l[2]); - // } - // #endregion + Assert.AreEqual(3, l.Length); + Assert.AreEqual("One", l[0]); + Assert.AreEqual("II", l[1]); + Assert.AreEqual("3", l[2]); + } + + [Test] + public void SerializeDefaultArray() + { + ExceptionAssert.Throws("Object reference not set to an instance of an object.", () => + JsonConvert.SerializeObject(default(ImmutableArray), Formatting.Indented)); + } + #endregion #region Queue [Test] diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 4532eb6f..1e8f26d3 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -548,6 +548,109 @@ namespace Newtonsoft.Json.Tests.Serialization Assert.AreEqual(RegexOptions.CultureInvariant, r2.Options); } + [Test] + public void EmbedJValueStringInNewJObject() + { + string s = null; + var v = new JValue(s); + var o = JObject.FromObject(new { title = v }); + + JObject oo = new JObject + { + {"title", v} + }; + + string output = o.ToString(); + + Assert.AreEqual(null, v.Value); + Assert.AreEqual(JTokenType.String, v.Type); + + Assert.AreEqual(@"{ + ""title"": null +}", output); + } + + // bug: the generic member (T) that hides the base member will not + // be used when serializing and deserializing the object, + // resulting in unexpected behavior during serialization and deserialization. + + public class Foo1 + { + public object foo { get; set; } + } + + public class Bar1 + { + public object bar { get; set; } + } + + public class Foo1 : Foo1 + { + public new T foo { get; set; } + + public T foo2 { get; set; } + } + + public class FooBar1 : Foo1 + { + public new Bar1 foo { get; set; } + } + + [Test] + public void BaseClassSerializesAsExpected() + { + var original = new Foo1 { foo = "value" }; + var json = JsonConvert.SerializeObject(original); + var expectedJson = @"{""foo"":""value""}"; + Assert.AreEqual(expectedJson, json); // passes + } + + [Test] + public void BaseClassDeserializesAsExpected() + { + var json = @"{""foo"":""value""}"; + var deserialized = JsonConvert.DeserializeObject(json); + Assert.AreEqual("value", deserialized.foo); // passes + } + + [Test] + public void DerivedClassHidingBasePropertySerializesAsExpected() + { + var original = new FooBar1 { foo = new Bar1 { bar = "value" } }; + var json = JsonConvert.SerializeObject(original); + var expectedJson = @"{""foo"":{""bar"":""value""}}"; + Assert.AreEqual(expectedJson, json); // passes + } + + [Test] + public void DerivedClassHidingBasePropertyDeserializesAsExpected() + { + var json = @"{""foo"":{""bar"":""value""}}"; + var deserialized = JsonConvert.DeserializeObject(json); + Assert.IsNotNull(deserialized.foo); // passes + Assert.AreEqual("value", deserialized.foo.bar); // passes + } + + [Test] + public void DerivedGenericClassHidingBasePropertySerializesAsExpected() + { + var original = new Foo1 { foo = new Bar1 { bar = "value" }, foo2 = new Bar1 { bar = "value2" } }; + var json = JsonConvert.SerializeObject(original); + var expectedJson = @"{""foo"":{""bar"":""value""},""foo2"":{""bar"":""value2""}}"; + Assert.AreEqual(expectedJson, json); + } + + [Test] + public void DerivedGenericClassHidingBasePropertyDeserializesAsExpected() + { + var json = @"{""foo"":{""bar"":""value""},""foo2"":{""bar"":""value2""}}"; + var deserialized = JsonConvert.DeserializeObject>(json); + Assert.IsNotNull(deserialized.foo2); // passes (bug only occurs for generics that /hide/ another property) + Assert.AreEqual("value2", deserialized.foo2.bar); // also passes, with no issue + Assert.IsNotNull(deserialized.foo); + Assert.AreEqual("value", deserialized.foo.bar); + } + [Test] public void ConversionOperator() { diff --git a/Src/Newtonsoft.Json.Tests/packages.config b/Src/Newtonsoft.Json.Tests/packages.config index 3f4320f3..792af049 100644 --- a/Src/Newtonsoft.Json.Tests/packages.config +++ b/Src/Newtonsoft.Json.Tests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs b/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs index c1de6ac5..70a397d3 100644 --- a/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs +++ b/Src/Newtonsoft.Json/Converters/StringEnumConverter.cs @@ -43,7 +43,7 @@ namespace Newtonsoft.Json.Converters /// public class StringEnumConverter : JsonConverter { - private readonly Dictionary> _enumMemberNamesPerType = new Dictionary>(); + private static readonly ThreadSafeStore> EnumMemberNamesPerType = new ThreadSafeStore>(InitializeEnumType); /// /// Gets or sets a value indicating whether the written enum text should be camel case. @@ -90,7 +90,7 @@ namespace Newtonsoft.Json.Converters } else { - BidirectionalDictionary map = GetEnumNameMap(e.GetType()); + BidirectionalDictionary map = EnumMemberNamesPerType.Get(e.GetType()); string[] names = enumName.Split(','); for (int i = 0; i < names.Length; i++) @@ -144,7 +144,7 @@ namespace Newtonsoft.Json.Converters string finalEnumText; - BidirectionalDictionary map = GetEnumNameMap(t); + BidirectionalDictionary map = EnumMemberNamesPerType.Get(t); if (enumText.IndexOf(',') != -1) { string[] names = enumText.Split(','); @@ -190,52 +190,6 @@ namespace Newtonsoft.Json.Converters return resolvedEnumName; } - private BidirectionalDictionary GetEnumNameMap(Type t) - { - BidirectionalDictionary map; - - if (!_enumMemberNamesPerType.TryGetValue(t, out map)) - { - lock (_enumMemberNamesPerType) - { - if (_enumMemberNamesPerType.TryGetValue(t, out map)) - return map; - - map = new BidirectionalDictionary( - StringComparer.OrdinalIgnoreCase, - StringComparer.OrdinalIgnoreCase); - - foreach (FieldInfo f in t.GetFields()) - { - string n1 = f.Name; - string n2; - -#if !NET20 - n2 = f.GetCustomAttributes(typeof(EnumMemberAttribute), true) - .Cast() - .Select(a => a.Value) - .SingleOrDefault() ?? f.Name; -#else - n2 = f.Name; -#endif - - string s; - if (map.TryGetBySecond(n2, out s)) - { - throw new InvalidOperationException("Enum name '{0}' already exists on enum '{1}'." - .FormatWith(CultureInfo.InvariantCulture, n2, t.Name)); - } - - map.Set(n1, n2); - } - - _enumMemberNamesPerType[t] = map; - } - } - - return map; - } - /// /// Determines whether this instance can convert the specified object type. /// @@ -251,5 +205,35 @@ namespace Newtonsoft.Json.Converters return t.IsEnum(); } + + private static BidirectionalDictionary InitializeEnumType(Type type) + { + BidirectionalDictionary map = new BidirectionalDictionary( + StringComparer.OrdinalIgnoreCase, + StringComparer.OrdinalIgnoreCase); + + foreach (FieldInfo f in type.GetFields()) + { + string n1 = f.Name; + string n2; + +#if !NET20 + n2 = f.GetCustomAttributes(typeof(EnumMemberAttribute), true) + .Cast() + .Select(a => a.Value) + .SingleOrDefault() ?? f.Name; +#else + n2 = f.Name; +#endif + + string s; + if (map.TryGetBySecond(n2, out s)) + throw new InvalidOperationException("Enum name '{0}' already exists on enum '{1}'.".FormatWith(CultureInfo.InvariantCulture, n2, type.Name)); + + map.Set(n1, n2); + } + + return map; + } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs index 62ba4d45..d1130e88 100644 --- a/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs +++ b/Src/Newtonsoft.Json/Converters/XmlNodeConverter.cs @@ -41,7 +41,6 @@ using System.Linq; namespace Newtonsoft.Json.Converters { - #region XmlNodeWrappers #if !NETFX_CORE && !PORTABLE && !PORTABLE40 internal class XmlDocumentWrapper : XmlNodeWrapper, IXmlDocument @@ -81,7 +80,12 @@ namespace Newtonsoft.Json.Converters public IXmlNode CreateXmlDeclaration(string version, string encoding, string standalone) { - return new XmlNodeWrapper(_document.CreateXmlDeclaration(version, encoding, standalone)); + return new XmlDeclarationWrapper(_document.CreateXmlDeclaration(version, encoding, standalone)); + } + + public IXmlNode CreateXmlDocumentType(string name, string publicId, string systemId, string internalSubset) + { + return new XmlDocumentTypeWrapper(_document.CreateDocumentType(name, publicId, systemId, null)); } public IXmlNode CreateProcessingInstruction(string target, string data) @@ -148,6 +152,11 @@ namespace Newtonsoft.Json.Converters { return _element.GetPrefixOfNamespace(namespaceUri); } + + public bool IsEmpty + { + get { return _element.IsEmpty; } + } } internal class XmlDeclarationWrapper : XmlNodeWrapper, IXmlDeclaration @@ -178,6 +187,42 @@ namespace Newtonsoft.Json.Converters } } + internal class XmlDocumentTypeWrapper : XmlNodeWrapper, IXmlDocumentType + { + private readonly XmlDocumentType _documentType; + + public XmlDocumentTypeWrapper(XmlDocumentType documentType) + : base(documentType) + { + _documentType = documentType; + } + + public string Name + { + get { return _documentType.Name; } + } + + public string System + { + get { return _documentType.SystemId; } + } + + public string Public + { + get { return _documentType.PublicId; } + } + + public string InternalSubset + { + get { return _documentType.InternalSubset; } + } + + public new string LocalName + { + get { return "DOCTYPE"; } + } + } + internal class XmlNodeWrapper : IXmlNode { private readonly XmlNode _node; @@ -215,6 +260,8 @@ namespace Newtonsoft.Json.Converters return new XmlElementWrapper((XmlElement)node); case XmlNodeType.XmlDeclaration: return new XmlDeclarationWrapper((XmlDeclaration)node); + case XmlNodeType.DocumentType: + return new XmlDocumentTypeWrapper((XmlDocumentType)node); default: return new XmlNodeWrapper(node); } @@ -277,6 +324,7 @@ namespace Newtonsoft.Json.Converters IXmlNode CreateWhitespace(string text); IXmlNode CreateSignificantWhitespace(string text); IXmlNode CreateXmlDeclaration(string version, string encoding, string standalone); + IXmlNode CreateXmlDocumentType(string name, string publicId, string systemId, string internalSubset); IXmlNode CreateProcessingInstruction(string target, string data); IXmlElement CreateElement(string elementName); IXmlElement CreateElement(string qualifiedName, string namespaceUri); @@ -293,10 +341,19 @@ namespace Newtonsoft.Json.Converters string Standalone { get; set; } } + internal interface IXmlDocumentType : IXmlNode + { + string Name { get; } + string System { get; } + string Public { get; } + string InternalSubset { get; } + } + internal interface IXmlElement : IXmlNode { void SetAttributeNode(IXmlNode attribute); string GetPrefixOfNamespace(string namespaceUri); + bool IsEmpty { get; } } internal interface IXmlNode @@ -348,6 +405,42 @@ namespace Newtonsoft.Json.Converters } } + internal class XDocumentTypeWrapper : XObjectWrapper, IXmlDocumentType + { + private readonly XDocumentType _documentType; + + public XDocumentTypeWrapper(XDocumentType documentType) + : base(documentType) + { + _documentType = documentType; + } + + public string Name + { + get { return _documentType.Name; } + } + + public string System + { + get { return _documentType.SystemId; } + } + + public string Public + { + get { return _documentType.PublicId; } + } + + public string InternalSubset + { + get { return _documentType.InternalSubset; } + } + + public new string LocalName + { + get { return "DOCTYPE"; } + } + } + internal class XDocumentWrapper : XContainerWrapper, IXmlDocument { private XDocument Document @@ -403,6 +496,11 @@ namespace Newtonsoft.Json.Converters return new XDeclarationWrapper(new XDeclaration(version, encoding, standalone)); } + public IXmlNode CreateXmlDocumentType(string name, string publicId, string systemId, string internalSubset) + { + return new XDocumentTypeWrapper(new XDocumentType(name, publicId, systemId, internalSubset)); + } + public IXmlNode CreateProcessingInstruction(string target, string data) { return new XProcessingInstructionWrapper(new XProcessingInstruction(target, data)); @@ -584,6 +682,8 @@ namespace Newtonsoft.Json.Converters return new XCommentWrapper((XComment)node); else if (node is XAttribute) return new XAttributeWrapper((XAttribute)node); + else if (node is XDocumentType) + return new XDocumentTypeWrapper((XDocumentType)node); else return new XObjectWrapper(node); } @@ -734,6 +834,11 @@ namespace Newtonsoft.Json.Converters { return Element.GetPrefixOfNamespace(namespaceUri); } + + public bool IsEmpty + { + get { return Element.IsEmpty; } + } } #endif #endregion @@ -868,6 +973,8 @@ namespace Newtonsoft.Json.Converters return ResolveFullName(node, manager); case XmlNodeType.ProcessingInstruction: return "?" + ResolveFullName(node, manager); + case XmlNodeType.DocumentType: + return "!" + ResolveFullName(node, manager); case XmlNodeType.XmlDeclaration: return DeclarationName; case XmlNodeType.SignificantWhitespace: @@ -990,8 +1097,13 @@ namespace Newtonsoft.Json.Converters } else if (node.ChildNodes.Count == 0 && CollectionUtils.IsNullOrEmpty(node.Attributes)) { + IXmlElement element = (IXmlElement)node; + // empty element - writer.WriteNull(); + if (element.IsEmpty) + writer.WriteNull(); + else + writer.WriteValue(string.Empty); } else { @@ -1055,6 +1167,34 @@ namespace Newtonsoft.Json.Converters writer.WriteValue(declaration.Standalone); } + writer.WriteEndObject(); + break; + case XmlNodeType.DocumentType: + IXmlDocumentType documentType = (IXmlDocumentType)node; + writer.WritePropertyName(GetPropertyName(node, manager)); + writer.WriteStartObject(); + + if (!string.IsNullOrEmpty(documentType.Name)) + { + writer.WritePropertyName("@name"); + writer.WriteValue(documentType.Name); + } + if (!string.IsNullOrEmpty(documentType.Public)) + { + writer.WritePropertyName("@public"); + writer.WriteValue(documentType.Public); + } + if (!string.IsNullOrEmpty(documentType.System)) + { + writer.WritePropertyName("@system"); + writer.WriteValue(documentType.System); + } + if (!string.IsNullOrEmpty(documentType.InternalSubset)) + { + writer.WritePropertyName("@internalSubset"); + writer.WriteValue(documentType.InternalSubset); + } + writer.WriteEndObject(); break; default: @@ -1157,6 +1297,10 @@ namespace Newtonsoft.Json.Converters { CreateInstruction(reader, document, currentNode, propertyName); } + else if (string.Equals(propertyName, "!DOCTYPE", StringComparison.OrdinalIgnoreCase)) + { + CreateDocumentType(reader, document, currentNode); + } else { if (reader.TokenType == JsonToken.StartArray) @@ -1185,12 +1329,12 @@ namespace Newtonsoft.Json.Converters if (propertyName.StartsWith("@")) { - var attributeName = propertyName.Substring(1); - var attributeValue = reader.Value.ToString(); + string attributeName = propertyName.Substring(1); + string attributeValue = reader.Value.ToString(); - var attributePrefix = MiscellaneousUtils.GetPrefix(attributeName); + string attributePrefix = MiscellaneousUtils.GetPrefix(attributeName); - var attribute = (!string.IsNullOrEmpty(attributePrefix)) + IXmlNode attribute = (!string.IsNullOrEmpty(attributePrefix)) ? document.CreateAttribute(attributeName, manager.LookupNamespace(attributePrefix), attributeValue) : document.CreateAttribute(attributeName, attributeValue); @@ -1449,6 +1593,41 @@ namespace Newtonsoft.Json.Converters } } + private void CreateDocumentType(JsonReader reader, IXmlDocument document, IXmlNode currentNode) + { + string name = null; + string publicId = null; + string systemId = null; + string internalSubset = null; + while (reader.Read() && reader.TokenType != JsonToken.EndObject) + { + switch (reader.Value.ToString()) + { + case "@name": + reader.Read(); + name = reader.Value.ToString(); + break; + case "@public": + reader.Read(); + publicId = reader.Value.ToString(); + break; + case "@system": + reader.Read(); + systemId = reader.Value.ToString(); + break; + case "@internalSubset": + reader.Read(); + internalSubset = reader.Value.ToString(); + break; + default: + throw new JsonSerializationException("Unexpected property name encountered while deserializing XmlDeclaration: " + reader.Value); + } + } + + IXmlNode documentType = document.CreateXmlDocumentType(name, publicId, systemId, internalSubset); + currentNode.AppendChild(documentType); + } + private IXmlElement CreateElement(string elementName, IXmlDocument document, string elementPrefix, XmlNamespaceManager manager) { string ns = string.IsNullOrEmpty(elementPrefix) ? manager.DefaultNamespace : manager.LookupNamespace(elementPrefix); diff --git a/Src/Newtonsoft.Json/Linq/JToken.cs b/Src/Newtonsoft.Json/Linq/JToken.cs index 86d2a8e2..d7f648ad 100644 --- a/Src/Newtonsoft.Json/Linq/JToken.cs +++ b/Src/Newtonsoft.Json/Linq/JToken.cs @@ -313,7 +313,8 @@ namespace Newtonsoft.Json.Linq { JToken token = this[key]; - return Extensions.Convert(token); + // null check to fix MonoTouch issue - https://github.com/dolbz/Newtonsoft.Json/commit/a24e3062846b30ee505f3271ac08862bb471b822 + return token == null ? default(T) : Extensions.Convert(token); } /// diff --git a/Src/Newtonsoft.Json/Linq/JTokenWriter.cs b/Src/Newtonsoft.Json/Linq/JTokenWriter.cs index 9235fab1..ac212c72 100644 --- a/Src/Newtonsoft.Json/Linq/JTokenWriter.cs +++ b/Src/Newtonsoft.Json/Linq/JTokenWriter.cs @@ -246,7 +246,7 @@ namespace Newtonsoft.Json.Linq public override void WriteValue(string value) { base.WriteValue(value); - AddValue(value ?? string.Empty, JsonToken.String); + AddValue(value, JsonToken.String); } /// diff --git a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs index 2fe52faf..0c32d858 100644 --- a/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs +++ b/Src/Newtonsoft.Json/Properties/AssemblyInfo.cs @@ -91,5 +91,5 @@ using System.Security; // by using the '*' as shown below: [assembly: AssemblyVersion("6.0.0.0")] -[assembly: AssemblyFileVersion("6.0.2.17209")] +[assembly: AssemblyFileVersion("6.0.2.17225")] [assembly: CLSCompliant(true)] diff --git a/Src/Newtonsoft.Json/Utilities/FSharpUtils.cs b/Src/Newtonsoft.Json/Utilities/FSharpUtils.cs index ee6bb3ce..b84bdd41 100644 --- a/Src/Newtonsoft.Json/Utilities/FSharpUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/FSharpUtils.cs @@ -23,6 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion +using System.Threading; #if !(NET35 || NET20 || NETFX_CORE) using System; using System.Collections.Generic; @@ -91,6 +92,9 @@ namespace Newtonsoft.Json.Utilities Type listModule = fsharpCoreAssembly.GetType("Microsoft.FSharp.Collections.ListModule"); _ofSeq = listModule.GetMethod("OfSeq"); +#if !(NETFX_CORE || PORTABLE) + Thread.MemoryBarrier(); +#endif _initialized = true; } } diff --git a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/License-Stable.rtf b/Src/packages/Microsoft.Bcl.Immutable.1.0.27/License-Stable.rtf deleted file mode 100644 index cf9df57f..00000000 --- a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/License-Stable.rtf +++ /dev/null @@ -1,98 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Tahoma;}{\f1\fnil\fcharset0 Times New Roman;}{\f2\fnil Tahoma;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 6.3.9416}\viewkind4\uc1 -\pard\sb120\sa120\sl240\slmult1\b\f0\fs20\lang9 MICROSOFT SOFTWARE LICENSE TERMS\par - -\pard\sb120\sa120\sl360\slmult1 MICROSOFT .NET FRAMEWORK .DLL PACKAGE\b0 \cf1\f1\par - -\pard\sb120\sa120\sl240\slmult1\cf0\b\f0\par -\b0 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-360\li360\sb120\sa120\sl240\slmult1\tx720\tx360 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\sb120\sa120\sl240\slmult1 for this software, unless other terms accompany those items. If so, those terms apply.\par -\b BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li357\sb120\sa120\sl240\slmult1\tx360 INSTALLATION AND USE RIGHTS. \b0\par -{\pntext\f3\'B7\tab}\b\fs19 DISTRIBUTABLE CODE. \b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720\b Right to Use and Distribute. \par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li1077\sb120\sa120\sl240\slmult1\tx360\tx1080\ul\b0\fs20 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720\ulnone\b\fs19 Distribution Requirements. For any Distributable Code you distribute, you must\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li1077\sb120\sa120\sl240\slmult1\tx1080\b0\fs20 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}for any Distributable Code having a filename extension of .lib, distribute only the results of running such Distributable Code through a linker with your program;\par -{\pntext\f3\'B7\tab}distribute Distributable Code included in a setup program only as part of that setup program without modification; \par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720\b\fs19 Distribution Restrictions. You may not\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li1077\sb120\sa120\sl240\slmult1\tx1080\b0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}distribute Distributable Code to run on a platform other than the Windows platform;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-358\li1435\sb120\sa120\sl240\slmult1\tx1437\fs19 the code be disclosed or distributed in source code form; or\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li1792\sb120\sa120\sl240\slmult1\tx1795\fs20 others have the right to modify it.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li357\sb120\sa120\sl240\slmult1\tx360\b SCOPE OF LICENSE.\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}make more copies of the software than specified in this agreement or allowed by applicable law, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li357\sb120\sa120\sl240\slmult1\tx360\b BACKUP COPY.\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -{\pntext\f3\'B7\tab}\b DOCUMENTATION.\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -{\pntext\f3\'B7\tab}\b EXPORT RESTRICTIONS.\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\cf2\ul{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting}}}}\f0\fs20 .\ul\par -{\pntext\f3\'B7\tab}\ulnone\b SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -{\pntext\f3\'B7\tab}\b ENTIRE AGREEMENT.\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-360\li360\sb120\sa120\sl240\slmult1\tx360\b APPLICABLE LAW.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720 United States.\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\pntext\f3\'B7\tab}\b Outside the United States.\b0 If you acquired the software in any other country, the laws of that country apply.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li357\sb120\sa120\sl240\slmult1\tx360\b LEGAL EFFECT.\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f3\'B7\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\li357\sb120\sa120\sl240\slmult1 FOR AUSTRALIA \f2\endash\f0 YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-357\li357\sb120\sa120\sl240\slmult1\tx360 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\li357\sb120\sa120\sl240\slmult1\b0 This limitation applies to\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-363\li720\sb120\sa120\sl240\slmult1\tx720 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\li360\sb120\sa120\sl240\slmult1 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par - -\pard\sb120\sa120\sl240\slmult1\b Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -\par -\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -EXON\'c9RATION DE GARANTIE.\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -Cette limitation concerne :\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\fi-360\li360\sb120\sa120\sl240\slmult1\tx720\tx360 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par - -\pard\sb120\sa120\sl240\slmult1 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b EFFET JURIDIQUE.\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\fs19\par -} - \ No newline at end of file diff --git a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nupkg b/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nupkg deleted file mode 100644 index ad8ce52b..00000000 Binary files a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nupkg and /dev/null differ diff --git a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nuspec b/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nuspec deleted file mode 100644 index b7535ead..00000000 --- a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/Microsoft.Bcl.Immutable.1.0.27.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - Microsoft.Bcl.Immutable - 1.0.27 - Microsoft Immutable Collections - Microsoft - Microsoft - http://go.microsoft.com/fwlink/?LinkID=313707 - http://go.microsoft.com/fwlink/?LinkID=310193 - http://go.microsoft.com/fwlink/?LinkID=288859 - true - This packages provides collections that are thread safe and guaranteed to never change their contents, also known as immutable collections. Like strings, any methods that perform modifications will not change the existing instance but instead return a new instance. For efficiency reasons, the implementation uses a sharing mechanism to ensure that newly created instances share as much data as possible with the previous instance while ensuring that operations have a predictable time complexity. - -Supported Platforms: -- .NET Framework 4.5 -- .NET for Windows Store apps -- Windows Phone 8 -- Portable Class Libraries - Provides immutable collections that allow CPU and memory efficient mutation via new references. - - Copyright © Microsoft Corporation - - BCL Microsoft System Immutable Collections - - \ No newline at end of file diff --git a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.dll b/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.dll deleted file mode 100644 index 835398de..00000000 Binary files a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.dll and /dev/null differ diff --git a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.xml b/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.xml deleted file mode 100644 index 649a5718..00000000 Binary files a/Src/packages/Microsoft.Bcl.Immutable.1.0.27/lib/portable-net45+win8+wp8/System.Collections.Immutable.xml and /dev/null differ