From cc7f45676f60d99b4362fe699d8540e9040a2496 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 15 Jul 2016 16:37:28 +0200 Subject: [PATCH] [Facades] System.Drawing.Primitives use type fowarders in monotouch profile when available --- mcs/class/Facades/System.Drawing.Primitives/Makefile | 2 +- .../embedded_System.Drawing.Primitives.dll.sources | 8 ++++++++ .../mobile_static_System.Drawing.Primitives.dll.sources | 1 - .../monotouch_System.Drawing.Primitives.dll.sources | 1 - .../monotouch_tv_System.Drawing.Primitives.dll.sources | 1 - .../monotouch_watch_System.Drawing.Primitives.dll.sources | 2 +- .../xammac_System.Drawing.Primitives.dll.sources | 1 - .../xammac_net_4_5_System.Drawing.Primitives.dll.sources | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources delete mode 100644 mcs/class/Facades/System.Drawing.Primitives/mobile_static_System.Drawing.Primitives.dll.sources delete mode 100644 mcs/class/Facades/System.Drawing.Primitives/monotouch_System.Drawing.Primitives.dll.sources delete mode 100644 mcs/class/Facades/System.Drawing.Primitives/monotouch_tv_System.Drawing.Primitives.dll.sources delete mode 100644 mcs/class/Facades/System.Drawing.Primitives/xammac_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/Makefile b/mcs/class/Facades/System.Drawing.Primitives/Makefile index e788928d5b3..a42f4bc608a 100644 --- a/mcs/class/Facades/System.Drawing.Primitives/Makefile +++ b/mcs/class/Facades/System.Drawing.Primitives/Makefile @@ -12,7 +12,7 @@ LIBRARY = System.Drawing.Primitives.dll KEY_FILE = ../../msfinal.pub SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) +LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) ifneq (2.1, $(FRAMEWORK_VERSION)) ifndef XAMMAC_4_5 diff --git a/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources new file mode 100644 index 00000000000..dd5e4210119 --- /dev/null +++ b/mcs/class/Facades/System.Drawing.Primitives/embedded_System.Drawing.Primitives.dll.sources @@ -0,0 +1,8 @@ +AssemblyInfo.cs + +../../System.Drawing/System.Drawing/Point.cs +../../System.Drawing/System.Drawing/PointF.cs +../../System.Drawing/System.Drawing/Rectangle.cs +../../System.Drawing/System.Drawing/RectangleF.cs +../../System.Drawing/System.Drawing/Size.cs +../../System.Drawing/System.Drawing/SizeF.cs diff --git a/mcs/class/Facades/System.Drawing.Primitives/mobile_static_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/mobile_static_System.Drawing.Primitives.dll.sources deleted file mode 100644 index 006657ab21b..00000000000 --- a/mcs/class/Facades/System.Drawing.Primitives/mobile_static_System.Drawing.Primitives.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include mobile_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/monotouch_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/monotouch_System.Drawing.Primitives.dll.sources deleted file mode 100644 index 006657ab21b..00000000000 --- a/mcs/class/Facades/System.Drawing.Primitives/monotouch_System.Drawing.Primitives.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include mobile_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/monotouch_tv_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/monotouch_tv_System.Drawing.Primitives.dll.sources deleted file mode 100644 index 006657ab21b..00000000000 --- a/mcs/class/Facades/System.Drawing.Primitives/monotouch_tv_System.Drawing.Primitives.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include mobile_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/monotouch_watch_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/monotouch_watch_System.Drawing.Primitives.dll.sources index 006657ab21b..49902e8e3a0 100644 --- a/mcs/class/Facades/System.Drawing.Primitives/monotouch_watch_System.Drawing.Primitives.dll.sources +++ b/mcs/class/Facades/System.Drawing.Primitives/monotouch_watch_System.Drawing.Primitives.dll.sources @@ -1 +1 @@ -#include mobile_System.Drawing.Primitives.dll.sources +#include embedded_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/xammac_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/xammac_System.Drawing.Primitives.dll.sources deleted file mode 100644 index 006657ab21b..00000000000 --- a/mcs/class/Facades/System.Drawing.Primitives/xammac_System.Drawing.Primitives.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include mobile_System.Drawing.Primitives.dll.sources diff --git a/mcs/class/Facades/System.Drawing.Primitives/xammac_net_4_5_System.Drawing.Primitives.dll.sources b/mcs/class/Facades/System.Drawing.Primitives/xammac_net_4_5_System.Drawing.Primitives.dll.sources index 006657ab21b..49902e8e3a0 100644 --- a/mcs/class/Facades/System.Drawing.Primitives/xammac_net_4_5_System.Drawing.Primitives.dll.sources +++ b/mcs/class/Facades/System.Drawing.Primitives/xammac_net_4_5_System.Drawing.Primitives.dll.sources @@ -1 +1 @@ -#include mobile_System.Drawing.Primitives.dll.sources +#include embedded_System.Drawing.Primitives.dll.sources -- 2.11.4.GIT