From ff24de45966f7acb850a4ed90443947a5b0ff98c Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 2 Aug 2016 10:22:05 +0200 Subject: [PATCH] [bcl] Don't build not installed mobile assemblies --- mcs/class/Makefile | 2 -- mcs/class/System.Runtime.Serialization/Makefile | 4 ++-- .../ReferenceSources/SchemaExporter_mobile.cs | 1 - .../System/Runtime/Serialization/Diagnostics/TraceUtility.cs | 2 ++ .../Runtime/Serialization/Json/DataContractJsonSerializer.cs | 2 ++ .../Runtime/Serialization/Json/JsonClassDataContract.cs | 2 ++ .../System/Runtime/Serialization/Json/JsonDataContract.cs | 2 ++ .../Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs | 2 ++ .../Runtime/Serialization/Json/JsonObjectDataContract.cs | 2 ++ .../System/Runtime/Serialization/Json/JsonReaderDelegator.cs | 2 ++ .../Runtime/Serialization/Json/JsonReaderWriterFactory.cs | 2 ++ .../System/Runtime/Serialization/Json/JsonWriterDelegator.cs | 2 ++ .../System/Runtime/Serialization/Json/XmlJsonReader.cs | 2 ++ .../System/Runtime/Serialization/Json/XmlJsonWriter.cs | 2 ++ .../Json/XmlObjectSerializerReadContextComplexJson.cs | 2 ++ .../Json/XmlObjectSerializerWriteContextComplexJson.cs | 2 ++ .../Runtime/Serialization/XmlObjectSerializerReadContext.cs | 2 ++ .../Runtime/Serialization/XmlObjectSerializerWriteContext.cs | 2 ++ 18 files changed, 32 insertions(+), 5 deletions(-) diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 1b16375f3fa..17b98d15d68 100644 --- 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 f95de7c2fec..07cd917a6ae 100644 --- 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 aa554402199..74ed3335acb 100644 --- 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 9b49ef0a45d..aca78cb6ef9 100644 --- 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 b190b0487f8..66a49e25c1c 100644 --- 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; 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 5441be39a03..cea778e8ca8 100644 --- 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 c595fce0624..35811e93f0f 100644 --- 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 3f756c1dcd5..d3f2b39d19c 100644 --- 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 3104947e453..06f8c9dc5e9 100644 --- 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 bb496121d14..36925108caf 100644 --- 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 befa2248400..79387fe4881 100644 --- 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 dc71490b990..54f0f3fa095 100644 --- 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 1ff02aed672..ccaca2af395 100644 --- 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 581e40aee0c..c87639bee1f 100644 --- 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 75e4a6b6407..4e3e602ace0 100644 --- 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 841bde9461b..bdf35e3a6a4 100644 --- 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 96abfad8744..38a78ece46c 100644 --- 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 a61836fc140..acd6282a73d 100644 --- 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; -- 2.25.1