[bcl] Mobile profiles fixes

diff --git a/external/referencesource b/external/referencesource
index 1ef3d85190bc1beea5505710527c79ff658b94ce..c7f241ccafe3d45ac8eb9010a0bca84b3b6a940e 160000 (submodule)
--- a/external/referencesource
+++ b/external/referencesource
@@ -1 +1 @@
-Subproject commit 1ef3d85190bc1beea5505710527c79ff658b94ce
+Subproject commit c7f241ccafe3d45ac8eb9010a0bca84b3b6a940e

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
index 897d5649094fe65b770ec639fec3d31619806682..79ab3b7ea71983cc8f8f4a7c73ceef4a32a74ce8 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDecimalTest.cs
@@ -753,6 +753,7 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void ReadWriteXmlTest ()
                {
                        string xml1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?><decimal>4556.89756</decimal>";

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDoubleTest.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDoubleTest.cs
index 9c81091dfe048fb4c70ae86a62c061853f352d25..64c2da225ab80fd631d04ec08c30f074eddbd622 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDoubleTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlDoubleTest.cs
@@ -622,6 +622,7 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void ReadWriteXmlTest ()
                {
                        string xml1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?><double>4556.99999999999999999988</double>";

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt16Test.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt16Test.cs
index 4773b25fcf9efe184a7047ca441b957847116db1..b483600c9c2383ba1e66efe40c19e93b88e8694f 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt16Test.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt16Test.cs
@@ -727,6 +727,7 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void ReadWriteXmlTest ()
                {
                        string xml1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?><short>4556</short>";

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs
index 402c48d207e348ccac0540fa335be73a05b4767d..d76dd3ecbef2754536203b61c491561a8e4f4183 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs
@@ -493,6 +493,7 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void ReadWriteXmlTest ()
                {
                        string xml1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?><int>4556</int>";

diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt64Test.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt64Test.cs
index bf08213c7de49761a1310f0e2882279d171b9492..20f1b6ffcd2f072aadc3c75ac801dddf2eda9bdc 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt64Test.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt64Test.cs
@@ -694,6 +694,7 @@ namespace MonoTests.System.Data.SqlTypes
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void ReadWriteXmlTest ()
                {
                        string xml1 = "<?xml version=\"1.0\" encoding=\"utf-16\"?><long>4556</long>";

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs
index 043c5107eb0dddef9d09e45da2d0ffc09dd0a72b..a908eaf997f3b98a7caccbfcb120c88238850514 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs
@@ -44,6 +44,7 @@ namespace MonoTests.System.XmlSerialization
                
                [Test]
                [NUnit.Framework.Category ("NotDotNet")] // MS.NET results in compilation error (probably it generates bogus source.)
+               [NUnit.Framework.Category ("MobileNotWorking")]
                public void ReadLiteral ()
                {
                        XmlSerializer ss = new XmlSerializer (GetLiteralTypeMapping ());

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
index 77bbba9c0986c9f1b31f38c06fa75932cd8850f2..49a813e34bf49b5714465d0b7767a57f2a69575a 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/DeserializeTests.cs
@@ -817,6 +817,7 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void TestDeserializeObjectWithReadonlyNulCollection ()
                {
                        string s3 = "";

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapAttributesTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapAttributesTests.cs
index a517c856d78a25b50366dfbab8c4eba204d2df29..8413037846a36d9b58e67f78c5e053368052c61e 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapAttributesTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapAttributesTests.cs
@@ -20,6 +20,7 @@ namespace MonoTests.System.XmlSerialization
        public class SoapAttributesTests
        {
                [Test]
+               [Category ("MobileNotWorking")]
                public void Defaults ()
                {
                        SoapAttributes atts = new SoapAttributes ();

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlAttributesTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlAttributesTests.cs
index ef42de89b6c37dee551cb852a74cdc862f57271f..269ef05a6f350701d39548626754b077bb540ea4 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlAttributesTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlAttributesTests.cs
@@ -62,6 +62,7 @@ namespace MonoTests.System.XmlSerialization
                // Testcases.
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void NewXmlAttributes ()
                {
                        // seems not different from Type specified ctor().

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
index 7bfccdbaeaede8ede4dbcffb12e9cb0c830c13ea..afa18715f265781ce3dc1238facf90df61113d8f 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs
@@ -455,6 +455,7 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void TestWritePotentiallyReferencingElement ()
                {
                        XmlSerializarionWriterTester xsw = new XmlSerializarionWriterTester ();
@@ -1557,6 +1558,7 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void TestNullableDatesAndTimes ()
                {
                        DateTime dt = new DateTime (2012, 1, 3, 10, 0, 0, 0, DateTimeKind.Utc);

diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
index 712e9d1543adeb5f9812038200f2403f4cb1bdc3..4e51eceae03b32f848de53e915a039f8bb497709 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs
@@ -278,6 +278,7 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void TestSerializeEnumeration_FromValue_Encoded ()
                {
                        SerializeEncoded ((int) SimpleEnumeration.SECOND, typeof (SimpleEnumeration));
@@ -375,6 +376,7 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void TestSerializeEnumDefaultValue_Encoded ()
                {
                        SerializeEncoded (new EnumDefaultValue ());
@@ -1749,6 +1751,7 @@ namespace MonoTests.System.XmlSerialization
 
                [Test]
                [ExpectedException (typeof (InvalidOperationException))]
+               [Category ("MobileNotWorking")]
                public void TestSerializeXmlNodeArrayIncludesAttribute ()
                {
                        XmlDocument doc = new XmlDocument ();
@@ -2231,12 +2234,14 @@ namespace MonoTests.System.XmlSerialization
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void XmlArrayAttributeUnqualifiedWithNamespace ()
                {
                        new XmlSerializer (typeof (XmlArrayUnqualifiedWithNamespace));
                }
 
                [Test]
+               [Category ("MobileNotWorking")]
                public void XmlArrayItemAttributeUnqualifiedWithNamespace ()
                {
                        new XmlSerializer (typeof (XmlArrayItemUnqualifiedWithNamespace));

diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile
index e8218d7ed37e644beb237a9afbe8a0ea8275cc0e..27326fd9ac65340770a4e45f1240c28b2a6ff87c 100644 (file)
--- a/mcs/class/System.Xml.Linq/Makefile
+++ b/mcs/class/System.Xml.Linq/Makefile
@@ -6,21 +6,12 @@ LIBRARY = System.Xml.Linq.dll
 LIB_REFS = System System.Core System.Xml System.Runtime.Serialization
 LIB_MCS_FLAGS =
 
-ifneq (2.1, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5+ only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
+ifeq (2.1, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:MONO_HYBRID_SYSTEM_XML
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
-ifndef VALID_PROFILE
-LIBRARY_NAME = dummy-System.Xml.Linq.dll
-NO_INSTALL = yes
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-endif
-
 include ../../build/library.make