mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs vendored
View File

@@ -92,16 +92,6 @@ namespace System.Runtime.Serialization
Initialize(type, knownTypes, maxItemsInObjectGraph, ignoreExtensionDataObject, preserveObjectReferences, null, false);
}
public DataContractSerializer(Type type, XmlDictionaryString rootName, XmlDictionaryString rootNamespace,
IEnumerable<Type> knownTypes,
int maxItemsInObjectGraph,
bool ignoreExtensionDataObject,
bool preserveObjectReferences,
DataContractResolver dataContractResolver)
{
Initialize(type, rootName, rootNamespace, knownTypes, maxItemsInObjectGraph, ignoreExtensionDataObject, preserveObjectReferences, /*dataContractSurrogate,*/ dataContractResolver, false);
}
public DataContractSerializer(Type type, DataContractSerializerSettings settings)
{
if (settings == null)

7
external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/SurrogateDataContract.cs vendored
View File

@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All rights reserved.
//-----------------------------------------------------------------------------
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information
namespace System.Runtime.Serialization
{
using System;

2
external/corefx/src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlReaderDelegator.cs vendored
View File

@@ -502,7 +502,7 @@ namespace System.Runtime.Serialization
public virtual byte[] ReadContentAsBase64()
{
if (isEndOfEmptyElement)
return new byte[0];
return Array.Empty<byte>();
if (dictionaryReader == null)
{

5
external/corefx/src/System.Private.DataContractSerialization/src/System/Xml/XmlDictionaryReader.cs vendored
View File

@@ -1322,11 +1322,6 @@ namespace System.Xml
return ReadArray(XmlDictionaryString.GetString(localName), XmlDictionaryString.GetString(namespaceUri), array, offset, count);
}
public override void Close()
{
base.Dispose();
}
private class XmlWrappedReader : XmlDictionaryReader, IXmlLineInfo
{
private XmlReader _reader;