Fix MatchingRefApiCompat issues in Serialization libraries (#28552)

* Fixes: System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uap.txt

* fixes System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uapaot.txt

* Fixes: System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.netcoreapp.txt

* Fixes: System.Runtime.Serialization.Xml/src/MatchingRefApiCompatBaseline.txt

* Bring back ReadString() as it is used somewhere else

* fix build errors

Author: jiayi11

src/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs

@@ -92,16 +92,6 @@ internal DataContractSerializer(Type type, IEnumerable<Type> knownTypes, int max
             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)

src/System.Private.Xml/src/System/Xml/Serialization/ReflectionXmlSerializationReader.cs

@@ -693,7 +693,7 @@ private bool WriteMemberText(Member anyText)
                 {
                     if (special.TypeDesc.Kind == TypeKind.Node)
                     {
-                        value = Document.CreateTextNode(ReadString());
+                        value = Document.CreateTextNode(Reader.ReadString());
                     }
                     else
                     {
@@ -706,11 +706,11 @@ private bool WriteMemberText(Member anyText)
                     {
                         if (text.Mapping.TypeDesc.CollapseWhitespace)
                         {
-                            value = CollapseWhitespace(ReadString());
+                            value = CollapseWhitespace(Reader.ReadString());
                         }
                         else
                         {
-                            value = ReadString();
+                            value = Reader.ReadString();
                         }
                     }
                     else
@@ -721,7 +721,7 @@ private bool WriteMemberText(Member anyText)
                         }
                         else
                         {
-                            value = WritePrimitive(text.Mapping, (state) => ((ReflectionXmlSerializationReader)state).ReadString(), this);
+                            value = WritePrimitive(text.Mapping, (state) => ((ReflectionXmlSerializationReader)state).Reader.ReadString(), this);
                         }
                     }
                 }
@@ -1832,7 +1832,7 @@ private bool WriteEnumAndArrayTypes(out object o, StructMapping mapping, XmlQual
                         Func<object, string> functor = (state) =>
                         {
                             var reader = (ReflectionXmlSerializationReader)state;
-                            return reader.CollapseWhitespace(reader.ReadString());
+                            return reader.CollapseWhitespace(reader.Reader.ReadString());
                         };
                         o = WriteEnumMethod(enumMapping, functor, this);
                         ReadEndElement();

src/System.Private.Xml/src/System/Xml/Serialization/XmlSchemaImporter.cs

@@ -37,19 +37,6 @@ public class XmlSchemaImporter : SchemaImporter
         /// </devdoc>
         public XmlSchemaImporter(XmlSchemas schemas, CodeIdentifiers typeIdentifiers) : base(schemas, CodeGenerationOptions.GenerateProperties, new ImportContext(typeIdentifiers, false)) { }
 
-        /// <include file='doc\XmlSchemaImporter.uex' path='docs/doc[@for="XmlSchemaImporter.XmlSchemaImporter2"]/*' />
-        /// <devdoc>
-        ///    <para>[To be supplied.]</para>
-        /// </devdoc>
-        public XmlSchemaImporter(XmlSchemas schemas, CodeIdentifiers typeIdentifiers, CodeGenerationOptions options) : base(schemas, options, new ImportContext(typeIdentifiers, false)) { }
-
-        /// <include file='doc\XmlSchemaImporter.uex' path='docs/doc[@for="XmlSchemaImporter.XmlSchemaImporter3"]/*' />
-        /// <devdoc>
-        ///    <para>[To be supplied.]</para>
-        /// </devdoc>
-        public XmlSchemaImporter(XmlSchemas schemas, CodeGenerationOptions options, ImportContext context) : base(schemas, options, context) { }
-
-
         /// <include file='doc\XmlSchemaImporter.uex' path='docs/doc[@for="XmlSchemaImporter.ImportDerivedTypeMapping"]/*' />
         /// <devdoc>
         ///    <para>[To be supplied.]</para>

src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializationReader.cs

@@ -1428,40 +1428,6 @@ protected Array ShrinkArray(Array a, int length, Type elementType, bool isNullab
             Array.Copy(a, b, length);
             return b;
         }
-        // This is copied from Core's XmlReader.ReadString, as it is not exposed in the Contract.
-        protected virtual string ReadString()
-        {
-            if (Reader.ReadState != ReadState.Interactive)
-            {
-                return string.Empty;
-            }
-            Reader.MoveToElement();
-            if (Reader.NodeType == XmlNodeType.Element)
-            {
-                if (Reader.IsEmptyElement)
-                {
-                    return string.Empty;
-                }
-                else if (!Reader.Read())
-                {
-                    throw new InvalidOperationException(SR.Xml_InvalidOperation);
-                }
-                if (Reader.NodeType == XmlNodeType.EndElement)
-                {
-                    return string.Empty;
-                }
-            }
-            string result = string.Empty;
-            while (IsTextualNode(Reader.NodeType))
-            {
-                result += Reader.Value;
-                if (!Reader.Read())
-                {
-                    break;
-                }
-            }
-            return result;
-        }
 
         // 0x6018
         private static uint s_isTextualNodeBitmap = (1 << (int)XmlNodeType.Text) | (1 << (int)XmlNodeType.CDATA) | (1 << (int)XmlNodeType.Whitespace) | (1 << (int)XmlNodeType.SignificantWhitespace);

src/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs

@@ -807,7 +807,7 @@ private static XmlSerializer[] GetReflectionBasedSerializers(XmlMapping[] mappin
 #if !FEATURE_SERIALIZATION_UAPAOT
         [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
         [ResourceExposure(ResourceScope.None)]
-        public static bool GenerateSerializer(Type[] types, XmlMapping[] mappings, Stream stream)
+        internal static bool GenerateSerializer(Type[] types, XmlMapping[] mappings, Stream stream)
         {
             if (types == null || types.Length == 0)
                 return false;

src/System.Runtime.Serialization.Xml/src/MatchingRefApiCompatBaseline.txt

@@ -1,3 +1,2 @@
 Compat issues with assembly System.Runtime.Serialization.Xml:
-MembersMustExist : Member 'System.Runtime.Serialization.DataContractSerializer..ctor(System.Type, System.Xml.XmlDictionaryString, System.Xml.XmlDictionaryString, System.Collections.Generic.IEnumerable<System.Type>, System.Int32, System.Boolean, System.Boolean, System.Runtime.Serialization.DataContractResolver)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 1
+

src/System.Xml.XmlSerializer/ref/System.Xml.XmlSerializer.cs

@@ -382,8 +382,8 @@ public void ExportMembersMapping(System.Xml.Serialization.XmlMembersMapping xmlM
         public System.Xml.XmlQualifiedName ExportTypeMapping(System.Xml.Serialization.XmlMembersMapping xmlMembersMapping) { throw null; }
         public void ExportTypeMapping(System.Xml.Serialization.XmlTypeMapping xmlTypeMapping) { }
     }
-    public partial class XmlSchemaImporter
-//CodeDOM : System.Xml.Serialization.SchemaImporter
+    public partial class XmlSchemaImporter : SchemaImporter
+    //CodeDOM : System.Xml.Serialization.SchemaImporter
     {
         public XmlSchemaImporter(System.Xml.Serialization.XmlSchemas schemas) { }
 //CODEDOM        public XmlSchemaImporter(System.Xml.Serialization.XmlSchemas schemas, System.Xml.Serialization.CodeGenerationOptions options, System.CodeDom.Compiler.CodeDomProvider codeProvider, System.Xml.Serialization.ImportContext context) { }
@@ -402,6 +402,10 @@ public XmlSchemaImporter(System.Xml.Serialization.XmlSchemas schemas, System.Xml
         public System.Xml.Serialization.XmlTypeMapping ImportSchemaType(System.Xml.XmlQualifiedName typeName, System.Type baseType, bool baseTypeCanBeIndirect) { throw null; }
         public System.Xml.Serialization.XmlTypeMapping ImportTypeMapping(System.Xml.XmlQualifiedName name) { throw null; }
     }
+    public abstract class SchemaImporter
+    {
+        internal SchemaImporter() { }
+    }
     public partial class XmlSchemas : System.Collections.CollectionBase, System.Collections.Generic.IEnumerable<System.Xml.Schema.XmlSchema>, System.Collections.IEnumerable
     {
         public XmlSchemas() { }

src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.netcoreapp.txt

@@ -1,7 +1,2 @@
 Compat issues with assembly System.Xml.XmlSerializer:
-CannotRemoveBaseTypeOrInterface : Type 'System.Xml.Serialization.XmlSchemaImporter' does not inherit from base type 'System.Xml.Serialization.SchemaImporter' in the implementation but it does in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeGenerationOptions, System.Xml.Serialization.ImportContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeIdentifiers, System.Xml.Serialization.CodeGenerationOptions)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSerializationReader.ReadString()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.GenerateSerializer(System.Type[], System.Xml.Serialization.XmlMapping[], System.IO.Stream)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 5
+

src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uap.txt

@@ -1,7 +1 @@
-Compat issues with assembly System.Xml.XmlSerializer:
-CannotRemoveBaseTypeOrInterface : Type 'System.Xml.Serialization.XmlSchemaImporter' does not inherit from base type 'System.Xml.Serialization.SchemaImporter' in the implementation but it does in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeGenerationOptions, System.Xml.Serialization.ImportContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeIdentifiers, System.Xml.Serialization.CodeGenerationOptions)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSerializationReader.ReadString()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.GenerateSerializer(System.Type[], System.Xml.Serialization.XmlMapping[], System.IO.Stream)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 5
+Compat issues with assembly System.Xml.XmlSerializer:

src/System.Xml.XmlSerializer/src/MatchingRefApiCompatBaseline.uapaot.txt

@@ -1,10 +1,7 @@
 Compat issues with assembly System.Xml.XmlSerializer:
-CannotRemoveBaseTypeOrInterface : Type 'System.Xml.Serialization.XmlSchemaImporter' does not inherit from base type 'System.Xml.Serialization.SchemaImporter' in the implementation but it does in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeGenerationOptions, System.Xml.Serialization.ImportContext)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSchemaImporter..ctor(System.Xml.Serialization.XmlSchemas, System.Xml.Serialization.CodeIdentifiers, System.Xml.Serialization.CodeGenerationOptions)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Xml.Serialization.XmlSerializationReader.ReadString()' does not exist in the implementation but it does exist in the contract.
+# Used by uap tooling for serializer generation
 MembersMustExist : Member 'System.String System.Xml.Serialization.XmlSerializer.DefaultNamespace' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.Mode.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.Mode.set(System.Xml.Serialization.SerializationMode)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Xml.Serialization.XmlSerializer.SetXmlSerializerContract(System.Xml.Serialization.XmlSerializerImplementation)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 8
+