Merge pull request #1847 from dotnet-bot/from-tfs

Merge changes from TFS

Author: ericstj

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

@@ -155,14 +155,14 @@ public XmlSerializer(Type type, string defaultNamespace)
             if (type == null)
                 throw new ArgumentNullException("type");
 
+#if NET_NATIVE
             // The ctor is not supported, but we cannot throw PNSE unconditionally
             // because the ctor is used by ctor(Type) which passes in a null defaultNamespace.
             if (!string.IsNullOrEmpty(defaultNamespace))
             {
                 throw new PlatformNotSupportedException();
             }
 
-#if NET_NATIVE
             rootType = type;
 #endif
             _mapping = GetKnownMapping(type, defaultNamespace);
@@ -210,7 +210,21 @@ public XmlSerializer(Type type, string defaultNamespace)
         /// </devdoc>
         internal XmlSerializer(Type type, XmlAttributeOverrides overrides, Type[] extraTypes, XmlRootAttribute root, string defaultNamespace, object location, object evidence)
         {
+#if NET_NATIVE
             throw new PlatformNotSupportedException();
+#else
+            if (type == null)
+                throw new ArgumentNullException("type");
+
+            XmlReflectionImporter importer = new XmlReflectionImporter(overrides, defaultNamespace);
+            if (extraTypes != null)
+            {
+                for (int i = 0; i < extraTypes.Length; i++)
+                    importer.IncludeType(extraTypes[i]);
+            }
+            _mapping = importer.ImportTypeMapping(type, root, defaultNamespace);
+            _tempAssembly = GenerateTempAssembly(_mapping, type, defaultNamespace);
+#endif
         }
 
 

src/System.Xml.XmlSerializer/tests/XmlSerializerTests.cs

@@ -698,7 +698,6 @@ public static void Xml_JaggedArrayAsRoot()
     }
 
     [Fact]
-    [ActiveIssue(1831)]
     public static void Xml_DefaultNamespaceChangeTest()
     {
         Assert.StrictEqual(
@@ -708,7 +707,6 @@ public static void Xml_DefaultNamespaceChangeTest()
     }
 
     [Fact]
-    [ActiveIssue(1831)]
     public static void Xml_KnownTypesThroughConstructor()
     {
         KnownTypesThroughConstructor value = new KnownTypesThroughConstructor() { EnumValue = MyEnum.One, SimpleTypeValue = new SimpleKnownTypeValue() { StrProperty = "PropertyValue" } };