[bcl] Don't build not installed mobile assemblies

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1b16375f3fa099563acfb64fca80ad44a351ace4..17b98d15d68fdef66e12fdb8ee37a826b94db4cd 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -27,7 +27,6 @@ mobile_common_dirs := \
        System.XML      \
        I18N            \
        System.ServiceModel.Internals   \
-       SMDiagnostics   \
        System.Runtime.Serialization    \
        System.Xml.Linq \
        System.ServiceModel     \
@@ -39,7 +38,6 @@ mobile_common_dirs := \
        System.Numerics \
        System.Numerics.Vectors         \
        System.Data     \
-       Mono.Cairo      \
        Mono.Data.Sqlite        \
        System.Data.Services.Client \
        System.IO.Compression \

diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile
index f95de7c2feca58f286113e0b514250374b64cdda..07cd917a6ae5fcc054e2b357d86d6e3f2d071910 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/Makefile
+++ b/mcs/class/System.Runtime.Serialization/Makefile
@@ -5,7 +5,7 @@ include ../../build/rules.make
 RESOURCE_FILES =
 
 LIBRARY = System.Runtime.Serialization.dll
-LIB_REFS = System System.Xml System.Core System.ServiceModel.Internals SMDiagnostics
+LIB_REFS = System System.Xml System.Core System.ServiceModel.Internals
 LIB_MCS_FLAGS = \
                -unsafe \
                -d:NO_DYNAMIC_CODEGEN \
@@ -14,7 +14,7 @@ LIB_MCS_FLAGS = \
 TXT_RESOURCE_STRINGS = ../referencesource/System.Runtime.Serialization/System.Runtime.Serialization.txt
 
 ifneq (2.1, $(FRAMEWORK_VERSION))
-LIB_REFS += System.Data System.Configuration
+LIB_REFS += System.Data System.Configuration SMDiagnostics
 LIB_MCS_FLAGS += /d:NET_3_0
 else
 LIB_MCS_FLAGS += /d:NO_CONFIGURATION /d:NO_SECURITY_ATTRIBUTES /d:NO_CODEDOM /d:NO_DESKTOP_SECURITY

diff --git a/mcs/class/System.Runtime.Serialization/ReferenceSources/SchemaExporter_mobile.cs b/mcs/class/System.Runtime.Serialization/ReferenceSources/SchemaExporter_mobile.cs
index aa55440219971bb1f2468dc81f519df93cb49797..74ed3335acb89306584341d1642cb1371a64b870 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ReferenceSources/SchemaExporter_mobile.cs
+++ b/mcs/class/System.Runtime.Serialization/ReferenceSources/SchemaExporter_mobile.cs
@@ -10,7 +10,6 @@ namespace System.Runtime.Serialization
        using System.IO;
        using System.Reflection;
        using System.Runtime.Diagnostics;
-       using System.ServiceModel.Diagnostics;
        using System.Security;
        using System.Xml;
        using System.Xml.Schema;

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs
index 9b49ef0a45d78148f71e19299a39eb84a14867b5..aca78cb6ef92ec3c02066e19139e4b123d455f9e 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Diagnostics/TraceUtility.cs
@@ -9,7 +9,9 @@ namespace System.Runtime.Serialization.Diagnostics
     using System.Globalization;
     using System.Runtime;
     using System.Runtime.Diagnostics;
+#if !MONO
     using System.ServiceModel.Diagnostics;
+#endif
 
     static class TraceUtility
     {

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/DataContractJsonSerializer.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/DataContractJsonSerializer.cs
index b190b0487f8d2d430107f88233a94a249e3c8ce9..66a49e25c1c00d2b3349eefbbd89a49da6f5ac32 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/DataContractJsonSerializer.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/DataContractJsonSerializer.cs
@@ -11,7 +11,9 @@ namespace System.Runtime.Serialization.Json
     using System.IO;
     using System.Text;
     using System.Xml;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Collections;
     using DataContractDictionary = System.Collections.Generic.Dictionary<System.Xml.XmlQualifiedName, DataContract>;
     using System.Runtime.CompilerServices;

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonClassDataContract.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonClassDataContract.cs
index 5441be39a0336e2806ac3277fca4c8b516b0225e..cea778e8ca802f6a36fdb89a74fb29d97233df90 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonClassDataContract.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonClassDataContract.cs
@@ -7,7 +7,9 @@ namespace System.Runtime.Serialization.Json
     using System.Threading;
     using System.Xml;
     using System.Diagnostics;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Collections.Generic;
     using System.Security;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonDataContract.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonDataContract.cs
index c595fce0624e9d7e8d7aeb7bb4b3501d92cb1d04..35811e93f0f6146554b9beb13bf3ed6e2750dd76 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonDataContract.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonDataContract.cs
@@ -9,7 +9,9 @@ namespace System.Runtime.Serialization.Json
     using System.Runtime.Serialization;
     using System.Security;
     using System.Reflection;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Xml;
 
 #if USE_REFEMIT

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs
index 3f756c1dcd527791aca59a32bc9d34ac23ead0e7..d3f2b39d19c905dfa46b0059d6a5969d6820a761 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs
@@ -7,7 +7,9 @@
 namespace System.Runtime.Serialization.Json
 {
     using System.IO;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Text;
     using System.Xml;
     using System.Security;

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonObjectDataContract.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonObjectDataContract.cs
index 3104947e45353db406cc4221210a2cbde85d4aec..06f8c9dc5e9758f4cff4485360b8f04d030fefa6 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonObjectDataContract.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonObjectDataContract.cs
@@ -5,7 +5,9 @@
 namespace System.Runtime.Serialization.Json
 {
     using System.Xml;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Runtime.Serialization;
     using System.Globalization;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderDelegator.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderDelegator.cs
index bb496121d14db43bd6cedea7380dfc103c8cc6de..36925108caf6041eec10f1cda61d76679a9c7dd5 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderDelegator.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderDelegator.cs
@@ -5,7 +5,9 @@
 namespace System.Runtime.Serialization.Json
 {
     using System.Xml;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Runtime.Serialization;
     using System.Globalization;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderWriterFactory.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderWriterFactory.cs
index befa224840000a09cb0f08579a6d13eeaf3d388a..79387fe4881dad06881f9e796117db52566c09af 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderWriterFactory.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonReaderWriterFactory.cs
@@ -9,7 +9,9 @@ namespace System.Runtime.Serialization.Json
     using System.Text;
     using System.Xml;
     using System.IO;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Runtime.Serialization.Json;
     using System.Runtime.CompilerServices;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs
index dc71490b99091a74dc877f42c8f87d389758097f..54f0f3fa0955228a4e7e6461966df61615fea011 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs
@@ -6,7 +6,9 @@ namespace System.Runtime.Serialization.Json
 {
     using System.Xml;
     using System.Globalization;
+#if !MONO
     using System.ServiceModel;
+#endif
 
 #if USE_REFEMIT
     public class JsonWriterDelegator : XmlWriterDelegator

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonReader.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonReader.cs
index 1ff02aed672d000f4de6c3b50dcbd20f906a198c..ccaca2af395dad6d36489ac2d9b7154feff954f6 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonReader.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonReader.cs
@@ -6,7 +6,9 @@ namespace System.Runtime.Serialization.Json
 {
     using System.Globalization;
     using System.IO;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Text;
     using System.Runtime.Serialization;
     using System.Collections.Generic;

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs
index 581e40aee0c5acbc0851fdfe67967c60eb5818ad..c87639bee1f9ece40ccbf1299e1638d2833f2e57 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs
@@ -10,7 +10,9 @@ namespace System.Runtime.Serialization.Json
     using System.Runtime;
     using System.Runtime.Serialization;
     using System.Security;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Text;
     using System.Xml;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs
index 75e4a6b6407cc82a837849d51fe20a03fdc12575..4e3e602ace0943e4d6300f55a58de8809a2562bf 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerReadContextComplexJson.cs
@@ -8,7 +8,9 @@ namespace System.Runtime.Serialization.Json
     using System.Collections.Generic;
     using System.Runtime;
     using System.Security;
+#if !MONO
     using System.ServiceModel;
+#endif
     using System.Text;
     using System.Xml;
 

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerWriteContextComplexJson.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerWriteContextComplexJson.cs
index 841bde9461bbf6b652daaa2484ed10a9315c4ff3..bdf35e3a6a45395640428649b5d339b2b87ddf4a 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerWriteContextComplexJson.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlObjectSerializerWriteContextComplexJson.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Text;
 using System.Xml;
 using System.Reflection;
+#if !MONO
 using System.ServiceModel;
+#endif
 using System.Collections;
 
 namespace System.Runtime.Serialization.Json

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs
index 96abfad8744745e43b444a02773a97fa01115a6c..38a78ece46cf99cc303f3344b043c34822a6b5ce 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContext.cs
@@ -9,7 +9,9 @@ namespace System.Runtime.Serialization
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Runtime.Diagnostics;
+#if !MONO
     using System.ServiceModel.Diagnostics;
+#endif
     using System.Text;
     using System.Xml;
     using System.Xml.Serialization;

diff --git a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
index a61836fc14025f8b41574bdfbb12c977188054c9..acd6282a73dff284bc937b44d4044c66852f7f11 100644 (file)
--- a/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
+++ b/mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerWriteContext.cs
@@ -14,7 +14,9 @@ namespace System.Runtime.Serialization
     using System.Xml;
     using System.Collections.Generic;
     using System.Xml.Serialization;
+#if !MONO
     using System.ServiceModel.Diagnostics;
+#endif
     using System.Security;
     using System.Security.Permissions;
     using System.Runtime.CompilerServices;