From c9b658d1d433ad5b90881009d868067970e1e39f Mon Sep 17 00:00:00 2001 From: Seonyoung Park <48307770+seonyounggg@users.noreply.github.com> Date: Wed, 2 Sep 2020 07:39:37 +0900 Subject: [PATCH] Remove unused USE_REFEMIT define in System.Private.DataContractSerialization (#41664) --- .../Runtime/Serialization/ClassDataContract.cs | 4 - .../Serialization/CollectionDataContract.cs | 12 --- .../System/Runtime/Serialization/DataContract.cs | 8 -- .../Runtime/Serialization/DateTimeOffsetAdapter.cs | 4 - .../Runtime/Serialization/DictionaryGlobals.cs | 4 - .../Runtime/Serialization/ExtensionDataObject.cs | 17 +--- .../Runtime/Serialization/ExtensionDataReader.cs | 8 -- .../Json/JsonFormatReaderGenerator.cs | 5 - .../Json/JsonFormatWriterGenerator.cs | 5 +- .../Serialization/Json/JsonReaderDelegator.cs | 4 - .../Serialization/KnownTypeDataContractResolver.cs | 4 - .../Serialization/XmlFormatReaderGenerator.cs | 12 +-- .../Serialization/XmlFormatWriterGenerator.cs | 14 --- .../Serialization/XmlObjectSerializerContext.cs | 13 --- .../XmlObjectSerializerReadContext.cs | 101 --------------------- .../XmlObjectSerializerReadContextComplex.cs | 4 - .../XmlObjectSerializerWriteContext.cs | 96 +------------------- .../XmlObjectSerializerWriteContextComplex.cs | 4 - 18 files changed, 7 insertions(+), 312 deletions(-) diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs index fd5e9ac..fa8f950 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs @@ -19,11 +19,7 @@ namespace System.Runtime.Serialization using System.Linq; using System.Diagnostics.CodeAnalysis; -#if USE_REFEMIT - public sealed class ClassDataContract : DataContract -#else internal sealed class ClassDataContract : DataContract -#endif { public XmlDictionaryString[]? ContractNamespaces; diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs index 7c23c21..a675990 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/CollectionDataContract.cs @@ -65,22 +65,14 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public interface IKeyValue -#else internal interface IKeyValue -#endif { object? Key { get; set; } object? Value { get; set; } } [DataContract(Namespace = "http://schemas.microsoft.com/2003/10/Serialization/Arrays")] -#if USE_REFEMIT - public struct KeyValue : IKeyValue -#else internal struct KeyValue : IKeyValue -#endif { private K _key; private V _value; @@ -132,11 +124,7 @@ namespace System.Runtime.Serialization Array, } -#if USE_REFEMIT - public sealed class CollectionDataContract : DataContract -#else internal sealed class CollectionDataContract : DataContract -#endif { private XmlDictionaryString _collectionItemName; diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs index 93c069a..3b79cf7 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContract.cs @@ -18,11 +18,7 @@ namespace System.Runtime.Serialization using System.Diagnostics.CodeAnalysis; using System.Diagnostics; -#if USE_REFEMIT - public abstract class DataContract -#else internal abstract class DataContract -#endif { private XmlDictionaryString _name; @@ -159,11 +155,7 @@ namespace System.Runtime.Serialization DataContractCriticalHelper.ThrowInvalidDataContractException(message, type); } -#if USE_REFEMIT - internal DataContractCriticalHelper Helper -#else protected DataContractCriticalHelper Helper -#endif { get { return _helper; } diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DateTimeOffsetAdapter.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DateTimeOffsetAdapter.cs index d155cad..20cb054 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DateTimeOffsetAdapter.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DateTimeOffsetAdapter.cs @@ -10,11 +10,7 @@ using System.Globalization; namespace System.Runtime.Serialization { [DataContract(Name = "DateTimeOffset", Namespace = "http://schemas.datacontract.org/2004/07/System")] -#if USE_REFEMIT - public struct DateTimeOffsetAdapter -#else internal struct DateTimeOffsetAdapter -#endif { private DateTime _utcDateTime; private short _offsetMinutes; diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DictionaryGlobals.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DictionaryGlobals.cs index 23a83c2..2008f76 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DictionaryGlobals.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DictionaryGlobals.cs @@ -5,11 +5,7 @@ using System.Xml; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public static class DictionaryGlobals -#else internal static class DictionaryGlobals -#endif { // Update array size when adding new strings or templates private static readonly XmlDictionary s_dictionary = new XmlDictionary(61); diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataObject.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataObject.cs index 1ba1ff2..ade1186 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataObject.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataObject.cs @@ -12,30 +12,19 @@ namespace System.Runtime.Serialization { private IList? _members; -#if USE_REFEMIT - public ExtensionDataObject() -#else internal ExtensionDataObject() -#endif { } -#if USE_REFEMIT - public IList? Members -#else internal IList? Members -#endif { get { return _members; } set { _members = value; } } } -#if USE_REFEMIT - public class ExtensionDataMember -#else + internal class ExtensionDataMember -#endif { private IDataNode? _value; private int _memberIndex; @@ -63,11 +52,7 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public interface IDataNode -#else internal interface IDataNode -#endif { Type DataType { get; } object? Value { get; set; } // boxes for primitives diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataReader.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataReader.cs index 4f31147..6457f16 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataReader.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ExtensionDataReader.cs @@ -509,11 +509,7 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public class AttributeData -#else internal class AttributeData -#endif { public string? prefix; public string? ns; @@ -521,11 +517,7 @@ namespace System.Runtime.Serialization public string? value; } -#if USE_REFEMIT - public class ElementData -#else internal class ElementData -#endif { public string? localName; public string? ns; diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatReaderGenerator.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatReaderGenerator.cs index 5f03267..ca65220 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatReaderGenerator.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatReaderGenerator.cs @@ -164,10 +164,6 @@ namespace System.Runtime.Serialization.Json private void BeginMethod(CodeGenerator ilg, string methodName, Type delegateType, bool allowPrivateMemberAccess) { -#if USE_REFEMIT - ilg.BeginMethod(methodName, delegateType, allowPrivateMemberAccess); -#else - MethodInfo signature = delegateType.GetMethod("Invoke")!; ParameterInfo[] parameters = signature.GetParameters(); Type[] paramTypes = new Type[parameters.Length]; @@ -176,7 +172,6 @@ namespace System.Runtime.Serialization.Json DynamicMethod dynamicMethod = new DynamicMethod(methodName, signature.ReturnType, paramTypes, typeof(JsonFormatReaderGenerator).Module, allowPrivateMemberAccess); ilg.BeginMethod(dynamicMethod, delegateType, methodName, paramTypes, allowPrivateMemberAccess); -#endif } private void InitArgs() diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatWriterGenerator.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatWriterGenerator.cs index 606d464..c219893 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatWriterGenerator.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonFormatWriterGenerator.cs @@ -100,9 +100,7 @@ namespace System.Runtime.Serialization.Json private void BeginMethod(CodeGenerator ilg, string methodName, Type delegateType, bool allowPrivateMemberAccess) { -#if USE_REFEMIT - ilg.BeginMethod(methodName, delegateType, allowPrivateMemberAccess); -#else + MethodInfo signature = delegateType.GetMethod("Invoke")!; ParameterInfo[] parameters = signature.GetParameters(); Type[] paramTypes = new Type[parameters.Length]; @@ -111,7 +109,6 @@ namespace System.Runtime.Serialization.Json DynamicMethod dynamicMethod = new DynamicMethod(methodName, signature.ReturnType, paramTypes, typeof(JsonFormatWriterGenerator).Module, allowPrivateMemberAccess); ilg.BeginMethod(dynamicMethod, delegateType, methodName, paramTypes, allowPrivateMemberAccess); -#endif } private void InitArgs(Type objType) diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonReaderDelegator.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonReaderDelegator.cs index d1ae4d9..083877a 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonReaderDelegator.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/Json/JsonReaderDelegator.cs @@ -236,11 +236,7 @@ namespace System.Runtime.Serialization.Json return ParseJsonDate(ReadElementContentAsString(), _dateTimeFormat); } -#if USE_REFEMIT - public override bool TryReadDateTimeArray(XmlObjectSerializerReadContext context, -#else internal override bool TryReadDateTimeArray(XmlObjectSerializerReadContext context, -#endif XmlDictionaryString itemName, XmlDictionaryString itemNamespace, int arrayLength, [NotNullWhen(true)] out DateTime[]? array) { diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/KnownTypeDataContractResolver.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/KnownTypeDataContractResolver.cs index 79cd6fb..5c5a929 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/KnownTypeDataContractResolver.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/KnownTypeDataContractResolver.cs @@ -6,11 +6,7 @@ using System.Reflection; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public sealed class KnownTypeDataContractResolver : DataContractResolver -#else internal sealed class KnownTypeDataContractResolver : DataContractResolver -#endif { private readonly XmlObjectSerializerContext _context; diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs index 7452f50..3008064 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatReaderGenerator.cs @@ -16,19 +16,12 @@ using System.Diagnostics.CodeAnalysis; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public delegate object XmlFormatClassReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext context, XmlDictionaryString[] memberNames, XmlDictionaryString[] memberNamespaces); - public delegate object XmlFormatCollectionReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext context, XmlDictionaryString itemName, XmlDictionaryString itemNamespace, CollectionDataContract collectionContract); - public delegate void XmlFormatGetOnlyCollectionReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext context, XmlDictionaryString itemName, XmlDictionaryString itemNamespace, CollectionDataContract collectionContract); - public sealed class XmlFormatReaderGenerator -#else internal delegate object? XmlFormatClassReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext? context, XmlDictionaryString[]? memberNames, XmlDictionaryString[]? memberNamespaces); internal delegate object XmlFormatCollectionReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext context, XmlDictionaryString itemName, XmlDictionaryString itemNamespace, CollectionDataContract collectionContract); internal delegate void XmlFormatGetOnlyCollectionReaderDelegate(XmlReaderDelegator xmlReader, XmlObjectSerializerReadContext context, XmlDictionaryString itemName, XmlDictionaryString itemNamespace, CollectionDataContract collectionContract); internal sealed class XmlFormatReaderGenerator -#endif { private readonly CriticalHelper _helper; @@ -957,11 +950,8 @@ namespace System.Runtime.Serialization /// Safe - marked as such so that it's callable from transparent generated IL. Takes id as parameter which /// is guaranteed to be in internal serialization cache. /// -#if USE_REFEMIT - public static object UnsafeGetUninitializedObject(int id) -#else + internal static object UnsafeGetUninitializedObject(int id) -#endif { var type = DataContract.GetDataContractForInitialization(id).TypeForInitialization; return UnsafeGetUninitializedObject(type); diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatWriterGenerator.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatWriterGenerator.cs index 119bf08..3dcec49 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatWriterGenerator.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlFormatWriterGenerator.cs @@ -15,15 +15,9 @@ using System.Diagnostics; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public delegate void XmlFormatClassWriterDelegate(XmlWriterDelegator xmlWriter, object obj, XmlObjectSerializerWriteContext context, ClassDataContract dataContract); - public delegate void XmlFormatCollectionWriterDelegate(XmlWriterDelegator xmlWriter, object obj, XmlObjectSerializerWriteContext context, CollectionDataContract dataContract); - public sealed class XmlFormatWriterGenerator -#else internal delegate void XmlFormatClassWriterDelegate(XmlWriterDelegator xmlWriter, object obj, XmlObjectSerializerWriteContext context, ClassDataContract dataContract); internal delegate void XmlFormatCollectionWriterDelegate(XmlWriterDelegator xmlWriter, object obj, XmlObjectSerializerWriteContext context, CollectionDataContract dataContract); internal sealed class XmlFormatWriterGenerator -#endif { private readonly CriticalHelper _helper; @@ -77,9 +71,6 @@ namespace System.Runtime.Serialization } else { -#if USE_REFEMIT - throw new InvalidOperationException("Cannot generate class writer"); -#else _ilg = new CodeGenerator(); bool memberAccessFlag = classContract.RequiresMemberAccessForWrite(null); try @@ -100,7 +91,6 @@ namespace System.Runtime.Serialization InitArgs(classContract.UnderlyingType); WriteClass(classContract); return (XmlFormatClassWriterDelegate)_ilg.EndMethod(); -#endif } } @@ -117,9 +107,6 @@ namespace System.Runtime.Serialization } else { -#if USE_REFEMIT - throw new InvalidOperationException("Cannot generate class writer"); -#else _ilg = new CodeGenerator(); bool memberAccessFlag = collectionContract.RequiresMemberAccessForWrite(null); try @@ -140,7 +127,6 @@ namespace System.Runtime.Serialization InitArgs(collectionContract.UnderlyingType); WriteCollection(collectionContract); return (XmlFormatCollectionWriterDelegate)_ilg.EndMethod(); -#endif } } diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerContext.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerContext.cs index 7dd8deb..765f02b 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerContext.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerContext.cs @@ -11,11 +11,7 @@ namespace System.Runtime.Serialization using System.Xml; using DataContractDictionary = System.Collections.Generic.Dictionary; -#if USE_REFEMIT - public class XmlObjectSerializerContext -#else internal class XmlObjectSerializerContext -#endif { protected XmlObjectSerializer serializer; protected DataContract? rootTypeDataContract; @@ -71,21 +67,12 @@ namespace System.Runtime.Serialization } - -#if USE_REFEMIT - public StreamingContext GetStreamingContext() -#else internal StreamingContext GetStreamingContext() -#endif { return _streamingContext; } -#if USE_REFEMIT - public void IncrementItemCount(int count) -#else internal void IncrementItemCount(int count) -#endif { if (count > _maxItemsInObjectGraph - _itemCount) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(XmlObjectSerializer.CreateSerializationException(SR.Format(SR.ExceededMaxItemsQuota, _maxItemsInObjectGraph))); diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs index 6a36eb7..e29728f 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs @@ -14,11 +14,7 @@ namespace System.Runtime.Serialization using DataContractDictionary = System.Collections.Generic.Dictionary; using System.Diagnostics.CodeAnalysis; -#if USE_REFEMIT - public class XmlObjectSerializerReadContext : XmlObjectSerializerContext -#else internal class XmlObjectSerializerReadContext : XmlObjectSerializerContext -#endif { internal Attributes? attributes; private HybridObjectCache? _deserializedObjects; @@ -47,21 +43,12 @@ namespace System.Runtime.Serialization set { _isGetOnlyCollection = value; } } - -#if USE_REFEMIT - public object? GetCollectionMember() -#else internal object? GetCollectionMember() -#endif { return _getOnlyCollectionValue; } -#if USE_REFEMIT - public void StoreCollectionMemberInfo(object? collectionMember) -#else internal void StoreCollectionMemberInfo(object? collectionMember) -#endif { _getOnlyCollectionValue = collectionMember; _isGetOnlyCollection = true; @@ -74,21 +61,13 @@ namespace System.Runtime.Serialization } [DoesNotReturn] -#if USE_REFEMIT - public static void ThrowNullValueReturnedForGetOnlyCollectionException(Type type) -#else internal static void ThrowNullValueReturnedForGetOnlyCollectionException(Type type) -#endif { throw System.Runtime.Serialization.DiagnosticUtility.ExceptionUtility.ThrowHelperError(XmlObjectSerializer.CreateSerializationException(SR.Format(SR.NullValueReturnedForGetOnlyCollection, DataContract.GetClrTypeFullName(type)))); } [DoesNotReturn] -#if USE_REFEMIT - public static void ThrowArrayExceededSizeException(int arraySize, Type type) -#else internal static void ThrowArrayExceededSizeException(int arraySize, Type type) -#endif { throw System.Runtime.Serialization.DiagnosticUtility.ExceptionUtility.ThrowHelperError(XmlObjectSerializer.CreateSerializationException(SR.Format(SR.ArrayExceededSize, arraySize, DataContract.GetClrTypeFullName(type)))); } @@ -112,11 +91,7 @@ namespace System.Runtime.Serialization } -#if USE_REFEMIT - public virtual object? InternalDeserialize(XmlReaderDelegator xmlReader, int id, RuntimeTypeHandle declaredTypeHandle, string name, string ns) -#else internal virtual object? InternalDeserialize(XmlReaderDelegator xmlReader, int id, RuntimeTypeHandle declaredTypeHandle, string name, string ns) -#endif { DataContract dataContract = GetDataContract(id, declaredTypeHandle); return InternalDeserialize(xmlReader, name, ns, Type.GetTypeFromHandle(declaredTypeHandle), ref dataContract); @@ -234,20 +209,12 @@ namespace System.Runtime.Serialization return knownTypesAddedInCurrentScope; } -#if USE_REFEMIT - public static bool MoveToNextElement(XmlReaderDelegator xmlReader) -#else internal static bool MoveToNextElement(XmlReaderDelegator xmlReader) -#endif { return (xmlReader.MoveToContent() != XmlNodeType.EndElement); } -#if USE_REFEMIT - public int GetMemberIndex(XmlReaderDelegator xmlReader, XmlDictionaryString[] memberNames, XmlDictionaryString[] memberNamespaces, int memberIndex, ExtensionDataObject? extensionData) -#else internal int GetMemberIndex(XmlReaderDelegator xmlReader, XmlDictionaryString[] memberNames, XmlDictionaryString[] memberNamespaces, int memberIndex, ExtensionDataObject? extensionData) -#endif { for (int i = memberIndex + 1; i < memberNames.Length; i++) { @@ -258,11 +225,7 @@ namespace System.Runtime.Serialization return memberNames.Length; } -#if USE_REFEMIT - public int GetMemberIndexWithRequiredMembers(XmlReaderDelegator xmlReader, XmlDictionaryString[] memberNames, XmlDictionaryString[] memberNamespaces, int memberIndex, int requiredIndex, ExtensionDataObject? extensionData) -#else internal int GetMemberIndexWithRequiredMembers(XmlReaderDelegator xmlReader, XmlDictionaryString[] memberNames, XmlDictionaryString[] memberNamespaces, int memberIndex, int requiredIndex, ExtensionDataObject? extensionData) -#endif { for (int i = memberIndex + 1; i < memberNames.Length; i++) { @@ -278,11 +241,7 @@ namespace System.Runtime.Serialization } [DoesNotReturn] -#if USE_REFEMIT - public static void ThrowRequiredMemberMissingException(XmlReaderDelegator xmlReader, int memberIndex, int requiredIndex, XmlDictionaryString[] memberNames) -#else internal static void ThrowRequiredMemberMissingException(XmlReaderDelegator xmlReader, int memberIndex, int requiredIndex, XmlDictionaryString[] memberNames) -#endif { StringBuilder stringBuilder = new StringBuilder(); if (requiredIndex == memberNames.Length) @@ -315,21 +274,13 @@ namespace System.Runtime.Serialization extensionData.Members.Add(ReadExtensionDataMember(xmlReader, memberIndex)); } -#if USE_REFEMIT - public void SkipUnknownElement(XmlReaderDelegator xmlReader) -#else internal void SkipUnknownElement(XmlReaderDelegator xmlReader) -#endif { ReadAttributes(xmlReader); xmlReader.Skip(); } -#if USE_REFEMIT - public string ReadIfNullOrRef(XmlReaderDelegator xmlReader, Type memberType, bool isMemberTypeSerializable) -#else internal string ReadIfNullOrRef(XmlReaderDelegator xmlReader, Type memberType, bool isMemberTypeSerializable) -#endif { Debug.Assert(attributes != null); @@ -349,63 +300,39 @@ namespace System.Runtime.Serialization } [MemberNotNull(nameof(attributes))] -#if USE_REFEMIT - public virtual void ReadAttributes(XmlReaderDelegator xmlReader) -#else internal virtual void ReadAttributes(XmlReaderDelegator xmlReader) -#endif { if (attributes == null) attributes = new Attributes(); attributes.Read(xmlReader); } -#if USE_REFEMIT - public void ResetAttributes() -#else internal void ResetAttributes() -#endif { if (attributes != null) attributes.Reset(); } -#if USE_REFEMIT - public string GetObjectId() -#else internal string GetObjectId() -#endif { Debug.Assert(attributes != null); return attributes.Id; } -#if USE_REFEMIT - public virtual int GetArraySize() -#else internal virtual int GetArraySize() -#endif { return -1; } -#if USE_REFEMIT - public void AddNewObject(object? obj) -#else internal void AddNewObject(object? obj) -#endif { Debug.Assert(attributes != null); AddNewObjectWithId(attributes.Id, obj); } -#if USE_REFEMIT - public void AddNewObjectWithId(string id, object? obj) -#else internal void AddNewObjectWithId(string id, object? obj) -#endif { if (id != Globals.NewObjectId) DeserializedObjects.Add(id, obj); @@ -435,11 +362,7 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public object GetExistingObject(string id, Type? type, string? name, string? ns) -#else internal object GetExistingObject(string id, Type? type, string? name, string? ns) -#endif { object? retObj = DeserializedObjects.GetObject(id); if (retObj == null) @@ -474,11 +397,7 @@ namespace System.Runtime.Serialization return realObj; } -#if USE_REFEMIT - public static void Read(XmlReaderDelegator xmlReader) -#else internal static void Read(XmlReaderDelegator xmlReader) -#endif { if (!xmlReader.Read()) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(XmlObjectSerializer.CreateSerializationException(SR.UnexpectedEndOfFile)); @@ -494,11 +413,7 @@ namespace System.Runtime.Serialization ns = xmlReader.LookupNamespace(prefix); } -#if USE_REFEMIT - public static T[] EnsureArraySize(T[] array, int index) -#else internal static T[] EnsureArraySize(T[] array, int index) -#endif { if (array.Length <= index) { @@ -517,11 +432,7 @@ namespace System.Runtime.Serialization return array; } -#if USE_REFEMIT - public static T[] TrimArraySize(T[] array, int size) -#else internal static T[] TrimArraySize(T[] array, int size) -#endif { if (size != array.Length) { @@ -532,11 +443,7 @@ namespace System.Runtime.Serialization return array; } -#if USE_REFEMIT - public void CheckEndOfArray(XmlReaderDelegator xmlReader, int arraySize, XmlDictionaryString itemName, XmlDictionaryString itemNamespace) -#else internal void CheckEndOfArray(XmlReaderDelegator xmlReader, int arraySize, XmlDictionaryString itemName, XmlDictionaryString itemNamespace) -#endif { if (xmlReader.NodeType == XmlNodeType.EndElement) return; @@ -1111,21 +1018,13 @@ namespace System.Runtime.Serialization return attribute; } -#if USE_REFEMIT - public static Exception CreateUnexpectedStateException(XmlNodeType expectedState, XmlReaderDelegator xmlReader) -#else internal static Exception CreateUnexpectedStateException(XmlNodeType expectedState, XmlReaderDelegator xmlReader) -#endif { return XmlObjectSerializer.CreateSerializationExceptionWithReaderDetails(SR.Format(SR.ExpectingState, expectedState), xmlReader); } //Silverlight only helper function to create SerializationException -#if USE_REFEMIT - public static Exception CreateSerializationException(string message) -#else internal static Exception CreateSerializationException(string message) -#endif { return XmlObjectSerializer.CreateSerializationException(message); } diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs index 6531828..60d6d37 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs @@ -211,11 +211,7 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public override int GetArraySize() -#else internal override int GetArraySize() -#endif { Debug.Assert(attributes != null); diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs index 1c1948c..76cc63f 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs @@ -18,11 +18,7 @@ using System.Diagnostics.CodeAnalysis; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public class XmlObjectSerializerWriteContext : XmlObjectSerializerContext -#else internal class XmlObjectSerializerWriteContext : XmlObjectSerializerContext -#endif { private ObjectReferenceStack _byValObjectsInScope; private XmlSerializableWriter? _xmlSerializableWriter; @@ -55,11 +51,7 @@ namespace System.Runtime.Serialization _unsafeTypeForwardingEnabled = true; } -#if USE_REFEMIT - internal ObjectToIdCache SerializedObjects -#else protected ObjectToIdCache SerializedObjects -#endif { get { @@ -85,11 +77,7 @@ namespace System.Runtime.Serialization get { return _unsafeTypeForwardingEnabled; } } -#if USE_REFEMIT - public void StoreIsGetOnlyCollection() -#else internal void StoreIsGetOnlyCollection() -#endif { _isGetOnlyCollection = true; } @@ -99,22 +87,14 @@ namespace System.Runtime.Serialization _isGetOnlyCollection = false; } -#if USE_REFEMIT - public void InternalSerializeReference(XmlWriterDelegator xmlWriter, object obj, bool isDeclaredType, bool writeXsiType, int declaredTypeID, RuntimeTypeHandle declaredTypeHandle) -#else internal void InternalSerializeReference(XmlWriterDelegator xmlWriter, object obj, bool isDeclaredType, bool writeXsiType, int declaredTypeID, RuntimeTypeHandle declaredTypeHandle) -#endif { if (!OnHandleReference(xmlWriter, obj, true /*canContainCyclicReference*/)) InternalSerialize(xmlWriter, obj, isDeclaredType, writeXsiType, declaredTypeID, declaredTypeHandle); OnEndHandleReference(xmlWriter, obj, true /*canContainCyclicReference*/); } -#if USE_REFEMIT - public virtual void InternalSerialize(XmlWriterDelegator xmlWriter, object obj, bool isDeclaredType, bool writeXsiType, int declaredTypeID, RuntimeTypeHandle declaredTypeHandle) -#else internal virtual void InternalSerialize(XmlWriterDelegator xmlWriter, object obj, bool isDeclaredType, bool writeXsiType, int declaredTypeID, RuntimeTypeHandle declaredTypeHandle) -#endif { if (writeXsiType) { @@ -295,28 +275,17 @@ namespace System.Runtime.Serialization return false; } -#if USE_REFEMIT - public virtual void WriteAnyType(XmlWriterDelegator xmlWriter, object value) -#else internal virtual void WriteAnyType(XmlWriterDelegator xmlWriter, object value) -#endif { xmlWriter.WriteAnyType(value); } -#if USE_REFEMIT - public virtual void WriteString(XmlWriterDelegator xmlWriter, string value) -#else internal virtual void WriteString(XmlWriterDelegator xmlWriter, string value) -#endif { xmlWriter.WriteString(value); } -#if USE_REFEMIT - public virtual void WriteString(XmlWriterDelegator xmlWriter, string? value, XmlDictionaryString name, XmlDictionaryString ns) -#else + internal virtual void WriteString(XmlWriterDelegator xmlWriter, string? value, XmlDictionaryString name, XmlDictionaryString? ns) -#endif { if (value == null) WriteNull(xmlWriter, typeof(string), true/*isMemberTypeSerializable*/, name, ns); @@ -328,19 +297,12 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public virtual void WriteBase64(XmlWriterDelegator xmlWriter, byte[] value) -#else internal virtual void WriteBase64(XmlWriterDelegator xmlWriter, byte[] value) -#endif { xmlWriter.WriteBase64(value); } -#if USE_REFEMIT - public virtual void WriteBase64(XmlWriterDelegator xmlWriter, byte[] value, XmlDictionaryString name, XmlDictionaryString ns) -#else + internal virtual void WriteBase64(XmlWriterDelegator xmlWriter, byte[] value, XmlDictionaryString name, XmlDictionaryString ns) -#endif { if (value == null) WriteNull(xmlWriter, typeof(byte[]), true/*isMemberTypeSerializable*/, name, ns); @@ -352,19 +314,12 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public virtual void WriteUri(XmlWriterDelegator xmlWriter, Uri value) -#else internal virtual void WriteUri(XmlWriterDelegator xmlWriter, Uri value) -#endif { xmlWriter.WriteUri(value); } -#if USE_REFEMIT - public virtual void WriteUri(XmlWriterDelegator xmlWriter, Uri value, XmlDictionaryString name, XmlDictionaryString ns) -#else + internal virtual void WriteUri(XmlWriterDelegator xmlWriter, Uri value, XmlDictionaryString name, XmlDictionaryString ns) -#endif { if (value == null) WriteNull(xmlWriter, typeof(Uri), true/*isMemberTypeSerializable*/, name, ns); @@ -376,19 +331,12 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public virtual void WriteQName(XmlWriterDelegator xmlWriter, XmlQualifiedName value) -#else internal virtual void WriteQName(XmlWriterDelegator xmlWriter, XmlQualifiedName value) -#endif { xmlWriter.WriteQName(value); } -#if USE_REFEMIT - public virtual void WriteQName(XmlWriterDelegator xmlWriter, XmlQualifiedName? value, XmlDictionaryString name, XmlDictionaryString ns) -#else + internal virtual void WriteQName(XmlWriterDelegator xmlWriter, XmlQualifiedName? value, XmlDictionaryString name, XmlDictionaryString? ns) -#endif { if (value == null) WriteNull(xmlWriter, typeof(XmlQualifiedName), true/*isMemberTypeSerializable*/, name, ns); @@ -437,11 +385,7 @@ namespace System.Runtime.Serialization } } -#if USE_REFEMIT - public void WriteNull(XmlWriterDelegator xmlWriter, Type memberType, bool isMemberTypeSerializable) -#else internal void WriteNull(XmlWriterDelegator xmlWriter, Type memberType, bool isMemberTypeSerializable) -#endif { CheckIfTypeSerializable(memberType, isMemberTypeSerializable); WriteNull(xmlWriter); @@ -454,29 +398,17 @@ namespace System.Runtime.Serialization xmlWriter.WriteEndElement(); } -#if USE_REFEMIT - public void IncrementArrayCount(XmlWriterDelegator xmlWriter, Array array) -#else internal void IncrementArrayCount(XmlWriterDelegator xmlWriter, Array array) -#endif { IncrementCollectionCount(xmlWriter, array.GetLength(0)); } -#if USE_REFEMIT - public void IncrementCollectionCount(XmlWriterDelegator xmlWriter, ICollection collection) -#else internal void IncrementCollectionCount(XmlWriterDelegator xmlWriter, ICollection collection) -#endif { IncrementCollectionCount(xmlWriter, collection.Count); } -#if USE_REFEMIT - public void IncrementCollectionCountGeneric(XmlWriterDelegator xmlWriter, ICollection collection) -#else internal void IncrementCollectionCountGeneric(XmlWriterDelegator xmlWriter, ICollection collection) -#endif { IncrementCollectionCount(xmlWriter, collection.Count); } @@ -491,11 +423,7 @@ namespace System.Runtime.Serialization { } -#if USE_REFEMIT - public static bool IsMemberTypeSameAsMemberValue(object obj, Type memberType) -#else internal static bool IsMemberTypeSameAsMemberValue(object obj, Type memberType) -#endif { if (obj == null || memberType == null) return false; @@ -503,39 +431,23 @@ namespace System.Runtime.Serialization return obj.GetType().TypeHandle.Equals(memberType.TypeHandle); } -#if USE_REFEMIT - public static T GetDefaultValue() -#else internal static T GetDefaultValue() -#endif { return default(T)!; } -#if USE_REFEMIT - public static T GetNullableValue(Nullable value) where T : struct -#else internal static T GetNullableValue(Nullable value) where T : struct -#endif { // value.Value will throw if hasValue is false return value!.Value; } -#if USE_REFEMIT - public static void ThrowRequiredMemberMustBeEmitted(string memberName, Type type) -#else internal static void ThrowRequiredMemberMustBeEmitted(string memberName, Type type) -#endif { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new SerializationException(SR.Format(SR.RequiredMemberMustBeEmitted, memberName, type.FullName))); } -#if USE_REFEMIT - public static bool GetHasValue(Nullable value) where T : struct -#else internal static bool GetHasValue(Nullable value) where T : struct -#endif { return value.HasValue; } diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContextComplex.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContextComplex.cs index cac1276..be3223a 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContextComplex.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/XmlObjectSerializerWriteContextComplex.cs @@ -15,11 +15,7 @@ using System.Runtime.CompilerServices; namespace System.Runtime.Serialization { -#if USE_REFEMIT - public class XmlObjectSerializerWriteContextComplex : XmlObjectSerializerWriteContext -#else internal class XmlObjectSerializerWriteContextComplex : XmlObjectSerializerWriteContext -#endif { private readonly ISerializationSurrogateProvider? _serializationSurrogateProvider; private readonly SerializationMode _mode; -- 2.7.4