Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Hamons <chris.hamons@xamarin.com>2015-05-22 22:13:59 +0300
committerChris Hamons <chris.hamons@xamarin.com>2015-06-18 21:31:04 +0300
commitb044a27fe0006830b2793e3d34f45407b656b8b2 (patch)
tree124386480bb13d9fd4061eeb819ed77d48f5f1f5 /mcs/class/System.Messaging
parent521291560d0d569233f41b8b3aa8f4c891d93ae8 (diff)
Create xammac_net_4_5 profile for XM 4.5 Unified to remove references to unshippable assmblies
Diffstat (limited to 'mcs/class/System.Messaging')
-rw-r--r--mcs/class/System.Messaging/Makefile10
-rw-r--r--mcs/class/System.Messaging/System.Messaging.Design/QueuePathEditor.cs2
-rw-r--r--mcs/class/System.Messaging/System.Messaging/MessageQueue.cs6
-rw-r--r--mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs8
4 files changed, 23 insertions, 3 deletions
diff --git a/mcs/class/System.Messaging/Makefile b/mcs/class/System.Messaging/Makefile
index 6a4b96a572d..82ff954cebd 100644
--- a/mcs/class/System.Messaging/Makefile
+++ b/mcs/class/System.Messaging/Makefile
@@ -3,15 +3,21 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = System.Messaging.dll
-LIB_REFS = System System.Configuration.Install System.Drawing System.Windows.Forms System.Xml Mono.Messaging
+LIB_REFS = System System.Xml Mono.Messaging System.Configuration.Install
+
+ifndef NO_SYSTEM_DRAWING_DEPENDENCY
+LIB_REFS += System.Drawing
+endif
+
LIB_MCS_FLAGS = /resource:System.Messaging/MessageQueue.resx
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 \
/r:nunit.mocks.dll
EXTRA_DISTFILES = System.Messaging/MessageQueue.resx
-ifdef MESSAGING_NO_WINFORMS
+ifndef NO_WINFORMS_DEPENDENCY
LIB_MCS_FLAGS += -d:NO_WINFORMS_DEPENDENCY
+LIB_REFS += System.Windows.Forms
endif
include ../../build/library.make
diff --git a/mcs/class/System.Messaging/System.Messaging.Design/QueuePathEditor.cs b/mcs/class/System.Messaging/System.Messaging.Design/QueuePathEditor.cs
index d50c600ada0..88d8608d58c 100644
--- a/mcs/class/System.Messaging/System.Messaging.Design/QueuePathEditor.cs
+++ b/mcs/class/System.Messaging/System.Messaging.Design/QueuePathEditor.cs
@@ -28,6 +28,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.ComponentModel;
using System.Drawing.Design;
@@ -53,3 +54,4 @@ namespace System.Messaging.Design
}
}
}
+#endif \ No newline at end of file
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
index 8b3481b9d3e..7286d059121 100644
--- a/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
+++ b/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
@@ -32,7 +32,9 @@
using System;
using System.Collections;
using System.ComponentModel;
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.Drawing;
+#endif
using System.Messaging.Design;
using System.Threading;
@@ -258,7 +260,9 @@ namespace System.Messaging
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
+#endif
[MessagingDescription ("MQ_MaximumJournalSize")]
public long MaximumJournalSize {
get {
@@ -270,7 +274,9 @@ namespace System.Messaging
}
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
+#endif
[MessagingDescription ("MQ_MaximumQueueSize")]
public long MaximumQueueSize {
get {
diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs
index d3b9889a80d..4606e5ebd13 100644
--- a/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs
+++ b/mcs/class/System.Messaging/System.Messaging/MessageQueueInstaller.cs
@@ -31,7 +31,9 @@ using System;
using System.Collections;
using System.ComponentModel;
using System.Configuration.Install;
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
using System.Drawing;
+#endif
namespace System.Messaging
{
@@ -88,7 +90,9 @@ namespace System.Messaging
set {throw new NotImplementedException();}
}
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
+#endif
public long MaximumJournalSize {
[MonoTODO]
get {throw new NotImplementedException();}
@@ -96,7 +100,9 @@ namespace System.Messaging
set {throw new NotImplementedException();}
}
+#if !NO_SYSTEM_DRAWING_DEPENDENCY
[TypeConverter (typeof(SizeConverter))]
+#endif
public long MaximumQueueSize {
[MonoTODO]
get {throw new NotImplementedException();}
@@ -183,4 +189,4 @@ namespace System.Messaging
throw new NotImplementedException();
}
}
-}
+} \ No newline at end of file