Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767

mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs

@@ -144,7 +144,7 @@ public class BinarySerializationTest
 		//Add Constraint
 		UniqueConstraint uniqueConstraint = new UniqueConstraint (tb1.Columns ["id"]);
 		tb1.Constraints.Add (uniqueConstraint);
-		tb1.RemotingFormat = SerializationFormat.Binary;
+		tb1.RemotingFormat = SerializationFormat.Xml;
 		tb1.AcceptChanges();
 
 		tb1.Rows[0][0] = 1;
@@ -284,7 +284,7 @@ public class BinarySerializationTest
 		tb1.Rows.Add (new object[] {null, null});
 
 		BinaryFormatter bf = new BinaryFormatter ();
-		tb1.RemotingFormat = SerializationFormat.Binary;
+		tb1.RemotingFormat = SerializationFormat.Xml;
 		FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb2.bin", FileMode.Open, FileAccess.Read);
 		BinaryReader r = new BinaryReader (fs);
 		byte [] serializedStream = r.ReadBytes ((int)fs.Length);
@@ -449,6 +449,7 @@ public class BinarySerializationTest
 		
 	}
 	[Test]
+	[Category("NotWorking")] // Ordering issue
 	public void DataSetSerializationTest2 ()
 	{
 		DataSet ds = new DataSet ();
@@ -475,7 +476,7 @@ public class BinarySerializationTest
 		ds.Relations.Add (rel);
 		//SerializeDataSet
 		BinaryFormatter bf = new BinaryFormatter ();
-		ds.RemotingFormat = SerializationFormat.Binary;
+		ds.RemotingFormat = SerializationFormat.Xml;
 		FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb4.bin", FileMode.Open, FileAccess.Read);
 		BinaryReader r = new BinaryReader (fs);
 		byte [] serializedStream = r.ReadBytes ((int) fs.Length);
@@ -645,6 +646,7 @@ public class BinarySerializationTest
 			Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]);
 	}
 	[Test]
+	[Category("NotWorking")] // Ordering issue
 	public void Constraint_Relations_Test2 ()
 	{
 		//Serialize DataSet
@@ -708,7 +710,7 @@ public class BinarySerializationTest
 
 		//SerializeDataSet
 		BinaryFormatter bf = new BinaryFormatter ();
-		ds.RemotingFormat = SerializationFormat.Binary;
+		ds.RemotingFormat = SerializationFormat.Xml;
 		FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb5.bin", FileMode.Open, FileAccess.Read);
 		BinaryReader r = new BinaryReader (fs);
 		byte [] serializedStream = r.ReadBytes ((int)fs.Length);