Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@ -36,8 +36,7 @@ namespace System.Xml.Serialization
/// <summary>
/// Summary description for XmlArrayAttribute.
/// </summary>
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]
public class XmlArrayAttribute : Attribute
{
private string elementName;

View File

@ -36,8 +36,7 @@ namespace System.Xml.Serialization
/// <summary>
/// Summary description for XmlChoiceIdentifierAttribute.
/// </summary>
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field
| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]
public class XmlChoiceIdentifierAttribute : Attribute
{
private string memberName;

View File

@ -43,10 +43,11 @@ using System.Xml.Serialization.Configuration;
namespace System.Xml.Serialization
{
public class XmlSchemaImporter
#if !MOBILE
: SchemaImporter
#if MOBILE
public abstract class SchemaImporter {}
#endif
public class XmlSchemaImporter : SchemaImporter
{
#region Fields

View File

@ -33,7 +33,7 @@ using System;
namespace System.Xml.Serialization
{
[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface | AttributeTargets.Enum)]
[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct, AllowMultiple=false)]
public sealed class XmlSerializerAssemblyAttribute : Attribute
{
string _assemblyName;