Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractSerializerTest.cs

@@ -92,6 +92,35 @@ namespace MonoTests.System.Runtime.Serialization
                         var ser = new DataContractSerializer(typeof(MyObject));
 			ser.ReadObject (XmlReader.Create(new StringReader(s)));
 		}
-		
+
+		[Flags ()]
+		[Serializable]
+		public enum FlagsEnum
+		{
+			None = 0,
+			Flag1 = 0x10,
+			Flag2 = 0x20,
+			All = 0xffff,
+		};
+
+		[Serializable]
+		public class ClassWithFlagsEnum
+		{
+			public FlagsEnum Flags = FlagsEnum.All;
+		}
+
+		// Bug #21072
+		[Test]
+		public void FlagsEnumTest ()
+		{
+			var ser = new DataContractSerializer (typeof (ClassWithFlagsEnum));
+
+			using (var m = new MemoryStream ()) {
+				ser.WriteObject (m, new ClassWithFlagsEnum ());
+				var data = m.ToArray ();
+				var s = Encoding.UTF8.GetString (data, 0, (int) data.Length);
+				Assert.IsTrue (s.Contains ("<Flags>All</Flags>"));
+			}
+		}
 	}
 }

mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/KnownTypeAttributeTest.cs

@@ -25,7 +25,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System;
 using System.Collections.Generic;
@@ -167,4 +166,3 @@ namespace MonoTests.System.Runtime.Serialization
 		}
 	}
 }
-#endif