diff --git a/external/corefx b/external/corefx index b79e6eab98c1..48ab4ab76868 160000 --- a/external/corefx +++ b/external/corefx @@ -1 +1 @@ -Subproject commit b79e6eab98c1baed478c738eaf95a1f6ee7f6d98 +Subproject commit 48ab4ab768681f69856a5106877f0b4e49644d95 diff --git a/mcs/class/Facades/System.Drawing.Common/Makefile b/mcs/class/Facades/System.Drawing.Common/Makefile index 71ad4c3ddb26..2c9b19c6979e 100644 --- a/mcs/class/Facades/System.Drawing.Common/Makefile +++ b/mcs/class/Facades/System.Drawing.Common/Makefile @@ -13,7 +13,7 @@ KEYFILE = ../../Open.snk LIBRARY_SNK = $(KEYFILE) SIGN_FLAGS = /delaysign /nowarn:1616,1699 LIB_REFS = System -LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) +LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS) -d:FEATURE_TYPECONVERTER ifneq (,$(filter build net_4_x, $(PROFILE))) $(error This profile shouldn't build System.Drawing.Common.dll, it already has System.Drawing.dll)