From d32424632ceeff6a6c3413d3cb9a4f3ac5b6b2cb Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Mon, 14 May 2018 15:01:29 -0400 Subject: [PATCH] [Mono.CSharp] Mimic the settings from System to track the feature flags, fixes GitHub #8698 (#8703) * [Mono.CSharp] Mimic the settings from System to track the feature flags, fixes GitHub #8698 * [csproj] Update project files --- mcs/class/Mono.CSharp/Makefile | 6 ++++++ mcs/class/Mono.CSharp/Mono.CSharp.csproj | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile index 3615532853d..a1c1e6314f9 100644 --- a/mcs/class/Mono.CSharp/Makefile +++ b/mcs/class/Mono.CSharp/Makefile @@ -19,6 +19,12 @@ endif TEST_MCS_FLAGS = TEST_LIB_REFS = System.Core +ifndef NO_PROCESS_START +REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START +TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START +endif + + LIB_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS) BUILT_SOURCES = $(PROFILE)-parser.cs diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj index b8d5c847f71..d6011d16d18 100644 --- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj +++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj @@ -28,22 +28,22 @@ ./../../class/lib/net_4_x-$(HostPlatform) ./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform) - NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_FEATURE_THREAD_ABORT + NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/monodroid ./../../class/obj/$(AssemblyName)-monodroid - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/monotouch ./../../class/obj/$(AssemblyName)-monotouch - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/monotouch_runtime ./../../class/obj/$(AssemblyName)-monotouch_runtime - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/monotouch_watch @@ -53,7 +53,7 @@ ./../../class/lib/monotouch_watch_runtime ./../../class/obj/$(AssemblyName)-monotouch_watch_runtime - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;IOS_REFLECTION + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH;IOS_REFLECTION;MONO_FEATURE_PROCESS_START ./../../class/lib/monotouch_tv @@ -63,42 +63,42 @@ ./../../class/lib/monotouch_tv_runtime ./../../class/obj/$(AssemblyName)-monotouch_tv_runtime - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;MONOTOUCH_TV;IOS_REFLECTION + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;MONOTOUCH_TV;IOS_REFLECTION;MONO_FEATURE_PROCESS_START ./../../class/lib/testing_aot_hybrid ./../../class/obj/$(AssemblyName)-testing_aot_hybrid - NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/testing_aot_full ./../../class/obj/$(AssemblyName)-testing_aot_full - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/winaot ./../../class/obj/$(AssemblyName)-winaot - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/xammac ./../../class/obj/$(AssemblyName)-xammac - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/xammac_net_4_5-$(HostPlatform) ./../../class/obj/$(AssemblyName)-xammac_net_4_5-$(HostPlatform) - NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT + NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/unreal ./../../class/obj/$(AssemblyName)-unreal - NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START ./../../class/lib/wasm ./../../class/obj/$(AssemblyName)-wasm - NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START -- 2.11.4.GIT