Rename the mobile_static profile to aot_only
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Thu, 24 Nov 2016 01:33:29 +0000 (02:33 +0100)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Thu, 24 Nov 2016 16:40:54 +0000 (17:40 +0100)
We decided it's a better name since we're using the profile to
test FullAOT scenarios on desktop (as opposed to the mobile profiles).

While doing the rename I saw that a lot of the #ifdefs were using
MOBILE_STATIC even though the code should actually be included/excluded
in all FullAOT scenarios, e.g. System.Reflection.Emit. I replaced those
cases with FULL_AOT_RUNTIME instead.

For cases where code is specific to this profile, I added a new
AOT_ONLY_DESKTOP define.

107 files changed:
configure.ac
mcs/Makefile
mcs/build/profiles/aot_only.make [new file with mode: 0644]
mcs/build/profiles/mobile_static.make [deleted file]
mcs/build/profiles/monotouch_runtime.make
mcs/build/rules.make
mcs/class/Facades/subdirs.make
mcs/class/Makefile
mcs/class/Mono.CSharp/Makefile
mcs/class/Mono.CSharp/aot_only_Mono.CSharp.dll.sources [new file with mode: 0644]
mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.sources [new file with mode: 0644]
mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources [deleted file]
mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.exclude.sources [deleted file]
mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.sources [deleted file]
mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources
mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources
mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources
mcs/class/Mono.Dynamic.Interpreter/Makefile
mcs/class/Mono.Security/aot_only_Mono.Security.dll.sources [new file with mode: 0644]
mcs/class/Mono.Security/mobile_static_Mono.Security.dll.sources [deleted file]
mcs/class/System.Core/Makefile
mcs/class/System.Core/aot_only_System.Core.dll.sources [new file with mode: 0644]
mcs/class/System.Core/aot_only_System.Core_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/System.Core/aot_only_System.Core_test.dll.sources [new file with mode: 0644]
mcs/class/System.Core/mobile_static_System.Core.dll.sources [deleted file]
mcs/class/System.Core/mobile_static_System.Core_test.dll.exclude.sources [deleted file]
mcs/class/System.Core/mobile_static_System.Core_test.dll.sources [deleted file]
mcs/class/System.Core/monodroid_System.Core_test.dll.exclude.sources
mcs/class/System.Data/Test/System.Data/DataTableTest.cs
mcs/class/System.Data/aot_only_System.Data.dll.sources [new file with mode: 0644]
mcs/class/System.Data/aot_only_System.Data_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/System.Data/aot_only_System.Data_test.dll.sources [new file with mode: 0644]
mcs/class/System.Data/mobile_static_System.Data.dll.sources [deleted file]
mcs/class/System.Data/mobile_static_System.Data_test.dll.exclude.sources [deleted file]
mcs/class/System.Data/mobile_static_System.Data_test.dll.sources [deleted file]
mcs/class/System.IdentityModel/aot_only_System.IdentityModel.dll.sources [new file with mode: 0644]
mcs/class/System.IdentityModel/mobile_static_System.IdentityModel.dll.sources [deleted file]
mcs/class/System.Runtime.Serialization/aot_only_System.Runtime.Serialization.dll.sources [new file with mode: 0644]
mcs/class/System.Runtime.Serialization/mobile_static_System.Runtime.Serialization.dll.sources [deleted file]
mcs/class/System.Security/aot_only_System.Security.dll.sources [new file with mode: 0644]
mcs/class/System.Security/mobile_static_System.Security.dll.sources [deleted file]
mcs/class/System.ServiceModel.Web/Test/System.ServiceModel.Web/WebOperationContextTest.cs
mcs/class/System.ServiceModel.Web/aot_only_System.ServiceModel.Web.dll.sources [new file with mode: 0644]
mcs/class/System.ServiceModel.Web/mobile_static_System.ServiceModel.Web.dll.sources [deleted file]
mcs/class/System.ServiceModel/aot_only_System.ServiceModel.dll.sources [new file with mode: 0644]
mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.sources [new file with mode: 0644]
mcs/class/System.ServiceModel/mobile_static_System.ServiceModel.dll.sources [deleted file]
mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.exclude.sources [deleted file]
mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.sources [deleted file]
mcs/class/System.Web.Services/aot_only_System.Web.Services.dll.sources [new file with mode: 0644]
mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.sources [new file with mode: 0644]
mcs/class/System.Web.Services/mobile_static_System.Web.Services.dll.sources [deleted file]
mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.exclude.sources [deleted file]
mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.sources [deleted file]
mcs/class/System.XML/aot_only_System.Xml.dll.sources [new file with mode: 0644]
mcs/class/System.XML/mobile_static_System.Xml.dll.sources [deleted file]
mcs/class/System/Mono.Util/MonoPInvokeCallbackAttribute.cs [new file with mode: 0644]
mcs/class/System/MonoTouch/MonoPInvokeCallbackAttribute.cs [deleted file]
mcs/class/System/System.IO.Compression/DeflateStream.cs
mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs
mcs/class/System/System.Net.Sockets/SafeSocketHandle.cs
mcs/class/System/Test/System.Diagnostics/FileVersionInfoTest.cs
mcs/class/System/aot_only_System.dll.sources [new file with mode: 0644]
mcs/class/System/aot_only_System_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/System/aot_only_System_test.dll.sources [new file with mode: 0644]
mcs/class/System/mobile_static_System.dll.sources [deleted file]
mcs/class/System/mobile_static_System_test.dll.exclude.sources [deleted file]
mcs/class/System/mobile_static_System_test.dll.sources [deleted file]
mcs/class/System/monodroid_System_test.dll.exclude.sources
mcs/class/System/monotouch_System.dll.sources
mcs/class/corlib/Makefile
mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs
mcs/class/corlib/System/TimeZoneInfo.cs
mcs/class/corlib/System/__ComObject.cs
mcs/class/corlib/Test/System.Reflection/AssemblyAlgorithmIdAttributeTest.cs
mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs
mcs/class/corlib/Test/System.Reflection/FieldInfoTest.cs
mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
mcs/class/corlib/Test/System.Reflection/ModuleTest.cs
mcs/class/corlib/Test/System.Reflection/MonoGenericClassTest.cs
mcs/class/corlib/Test/System.Reflection/PropertyInfoTest.cs
mcs/class/corlib/Test/System.Reflection/TypeDelegatorTest.cs
mcs/class/corlib/Test/System.Reflection/VisibilityTest.cs
mcs/class/corlib/Test/System.Runtime.CompilerServices/AsyncTaskMethodBuilderTest.cs
mcs/class/corlib/Test/System.Runtime.InteropServices/GCHandleTest.cs
mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
mcs/class/corlib/Test/System.Runtime.Serialization/SerializationTest.cs
mcs/class/corlib/Test/System.Security.Cryptography/AesCfbTest.cs
mcs/class/corlib/Test/System/ActivatorTest.cs
mcs/class/corlib/Test/System/AttributeTest.cs
mcs/class/corlib/Test/System/DelegateTest.cs
mcs/class/corlib/Test/System/TypeTest.cs
mcs/class/corlib/aot_only_corlib_test.dll.exclude.sources [new file with mode: 0644]
mcs/class/corlib/aot_only_corlib_test.dll.sources [new file with mode: 0644]
mcs/class/corlib/mobile_static_corlib_test.dll.exclude.sources [deleted file]
mcs/class/corlib/mobile_static_corlib_test.dll.sources [deleted file]
mono/mini/Makefile.am.in
mono/tests/Makefile.am
mono/tests/assemblyresolve/Makefile.am
mono/tests/test-runner.cs
runtime/Makefile.am
scripts/ci/run-jenkins.sh
scripts/ci/run-test-aot_only.sh [new file with mode: 0755]
scripts/ci/run-test-mobile_static.sh [deleted file]

index 9ab40fc8c180d3741a318f4d234e5db90c717b30..26c1e950d67e765ba6d3116c2d8adbf7899c6c3b 100644 (file)
@@ -771,9 +771,9 @@ AC_ARG_WITH(monotouch_tv,    [  --with-monotouch_tv=yes,no      If you want to b
 AC_ARG_WITH(bitcode,         [  --with-bitcode=yes,no           If bitcode is enabled (defaults to no)],                              [], [with_bitcode=default])
 AC_ARG_WITH(xammac,          [  --with-xammac=yes,no            If you want to build the Xamarin.Mac assemblies (defaults to no)],    [], [with_xammac=default])
 AC_ARG_WITH(aot_hybrid,      [  --with-aot_hybrid=yes,no        If you want to build the aot_hybrid assemblies (defaults to no)],     [], [with_aot_hybrid=default])
-AC_ARG_WITH(mobile_static,   [  --with-mobile_static=yes,no     If you want to build the mobile_static assemblies (defaults to no)],  [], [with_mobile_static=default])
+AC_ARG_WITH(aot_only,        [  --with-aot_only=yes,no          If you want to build the aot_only assemblies (defaults to no)],       [], [with_aot_only=default])
 
-AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot_hybrid,mobile_static,bitcode_mobile_static   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
+AC_ARG_WITH(runtime_preset, [  --with-runtime_preset=net_4_x,all,aot_hybrid,aot_only,bitcode_aot_only   Which default profile to build (defaults to net_4_x)],  [], [with_runtime_preset=net_4_x])
 
 dnl
 dnl Profile defaults
@@ -788,7 +788,7 @@ with_monotouch_watch_default=no
 with_monotouch_tv_default=no
 with_xammac_default=no
 with_aot_hybrid_default=no
-with_mobile_static_default=no
+with_aot_only_default=no
 
 with_bitcode_default=no
 with_cooperative_gc_default=no
@@ -806,10 +806,10 @@ elif test x$with_runtime_preset = xall; then
    with_monotouch_watch_default=yes
    with_monotouch_tv_default=yes
    with_xammac_default=yes
-elif test x$with_runtime_preset = xmobile_static; then
+elif test x$with_runtime_preset = xaot_only; then
    DISABLE_MCS_DOCS_default=yes
-   with_mobile_static_default=yes
-   TEST_PROFILE=mobile_static 
+   with_aot_only_default=yes
+   TEST_PROFILE=aot_only 
 
    mono_feature_disable_com='yes'
    mono_feature_disable_remoting='yes'
@@ -819,12 +819,12 @@ elif test x$with_runtime_preset = xmobile_static; then
 
    AOT_BUILD_FLAGS="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS"
    AOT_RUN_FLAGS="--full-aot"
-elif test x$with_runtime_preset = xbitcode_mobile_static; then
+elif test x$with_runtime_preset = xbitcode_aot_only; then
    DISABLE_MCS_DOCS_default=yes
-   with_mobile_static_default=yes
+   with_aot_only_default=yes
    with_bitcode_default=yes
    with_cooperative_gc_default=yes
-   TEST_PROFILE=mobile_static 
+   TEST_PROFILE=aot_only 
    enable_llvm_default=yes
 
    mono_feature_disable_com='yes'
@@ -884,8 +884,8 @@ fi
 if test "x$with_aot_hybrid" = "xdefault"; then
    with_aot_hybrid=$with_aot_hybrid_default
 fi
-if test "x$with_mobile_static" = "xdefault"; then
-   with_mobile_static=$with_mobile_static_default
+if test "x$with_aot_only" = "xdefault"; then
+   with_aot_only=$with_aot_only_default
 fi
 
 AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = "xyes"])
@@ -896,10 +896,10 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"])
 AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
 AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
 AM_CONDITIONAL(INSTALL_AOT_HYBRID, [test "x$with_aot_hybrid" != "xno"])
-AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
+AM_CONDITIONAL(INSTALL_AOT_ONLY, [test "x$with_aot_only" != "xno"])
 
 AC_SUBST(INSTALL_AOT_HYBRID)
-AC_SUBST(INSTALL_MOBILE_STATIC)
+AC_SUBST(INSTALL_AOT_ONLY)
 
 default_profile=net_4_x
 if test -z "$INSTALL_MONODROID_TRUE"; then :
@@ -914,8 +914,8 @@ fi
 if test -z "$INSTALL_AOT_HYBRID_TRUE"; then :
    default_profile=aot_hybrid
 fi
-if test -z "$INSTALL_MOBILE_STATIC_TRUE"; then :
-   default_profile=mobile_static
+if test -z "$INSTALL_AOT_ONLY_TRUE"; then :
+   default_profile=aot_only
 fi
 if test -z "$INSTALL_4_x_TRUE"; then :
    default_profile=net_4_x
@@ -4441,8 +4441,8 @@ echo "
        Xamarin.WatchOS: $with_monotouch_watch
        Xamarin.TVOS:    $with_monotouch_tv
        Xamarin.Mac:     $with_xammac
-       aot_hybrid:      $with_aot_hybrid
-       mobile_static:   $with_mobile_static
+       AOT preferred:   $with_aot_hybrid
+       AOT only:        $with_aot_only
        JNI support:     $jdk_headers_found
        libgdiplus:      $libgdiplus_msg
        zlib:            $zlib_msg
index 5f731fb15f3b46ef09f3e4301cda04d1d52ff333..6e02ba6c8e82a6606e4f5046176d4f7f4abceec5 100644 (file)
@@ -15,7 +15,7 @@ monotouch_watch_runtime_SUBDIRS := build class
 monotouch_tv_runtime_SUBDIRS := build class
 xammac_SUBDIRS := build class
 aot_hybrid_SUBDIRS := build class ilasm
-mobile_static_SUBDIRS := build class ilasm
+aot_only_SUBDIRS := build class ilasm
 binary_reference_assemblies_SUBDIRS := build class
 net_4_x_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 xammac_net_4_5_SUBDIRS := build class
@@ -71,8 +71,8 @@ $(_boot_:%=profile-do--monotouch_watch_runtime--%):  profile-do--monotouch_watch
 $(_boot_:%=profile-do--monotouch_tv_runtime--%):     profile-do--monotouch_tv_runtime--%:     profile-do--build--%
 $(_boot_:%=profile-do--xammac--%):            profile-do--xammac--%:            profile-do--build--%
 $(_boot_:%=profile-do--xammac_net_4_5--%):    profile-do--xammac_net_4_5--%:           profile-do--build--%
-$(_boot_:%=profile-do--aot_hybrid--%):            profile-do--aot_hybrid--%:         profile-do--build--%
-$(_boot_:%=profile-do--mobile_static--%):     profile-do--mobile_static--%:     profile-do--build--%
+$(_boot_:%=profile-do--aot_hybrid--%):        profile-do--aot_hybrid--%:        profile-do--build--%
+$(_boot_:%=profile-do--aot_only--%):          profile-do--aot_only--%:          profile-do--build--%
 $(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:
diff --git a/mcs/build/profiles/aot_only.make b/mcs/build/profiles/aot_only.make
new file mode 100644 (file)
index 0000000..324bdc2
--- /dev/null
@@ -0,0 +1,47 @@
+#! -*- makefile -*-
+
+BOOTSTRAP_PROFILE = build
+
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
+
+# Use system resgen as we don't want local System.Windows.Forms dependency
+RESGEN = resgen2
+
+profile-check:
+       @:
+
+DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
+
+PROFILE_MCS_FLAGS = \
+       -d:NET_1_1 \
+       -d:NET_2_0 \
+       -d:NET_2_1 \
+       -d:NET_3_5 \
+       -d:NET_4_0 \
+       -d:NET_4_5 \
+       -d:MONO \
+       -d:NETSTANDARD \
+       -d:MOBILE,MOBILE_LEGACY \
+       -d:AOT_ONLY_DESKTOP     \
+       -d:FULL_AOT_RUNTIME \
+       -d:DISABLE_REMOTING \
+       -d:DISABLE_COM \
+       -nowarn:1699 \
+       -nostdlib \
+       $(DEFAULT_REFERENCES) \
+       $(PLATFORM_DEBUG_FLAGS)
+
+FRAMEWORK_VERSION = 2.1
+
+# the tuner takes care of the install
+NO_INSTALL = yes
+AOT_FRIENDLY_PROFILE = yes
+MOBILE_PROFILE = yes
+NO_VTS_TEST = yes
+
+# Note need for trailing comma. If you add, keep it
+PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
+
+ALWAYS_AOT = yes
+
diff --git a/mcs/build/profiles/mobile_static.make b/mcs/build/profiles/mobile_static.make
deleted file mode 100644 (file)
index bf52c7e..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#! -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# Use system resgen as we don't want local System.Windows.Forms dependency
-RESGEN = resgen2
-
-profile-check:
-       @:
-
-DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
-
-PROFILE_MCS_FLAGS = \
-       -d:NET_1_1 \
-       -d:NET_2_0 \
-       -d:NET_2_1 \
-       -d:NET_3_5 \
-       -d:NET_4_0 \
-       -d:NET_4_5 \
-       -d:MONO \
-       -d:NETSTANDARD \
-       -d:MOBILE,MOBILE_STATIC,MOBILE_LEGACY \
-       -d:FULL_AOT_RUNTIME \
-       -d:DISABLE_REMOTING \
-       -d:DISABLE_COM \
-       -nowarn:1699 \
-       -nostdlib \
-       $(DEFAULT_REFERENCES) \
-       $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 2.1
-
-# the tuner takes care of the install
-NO_INSTALL = yes
-MOBILE_STATIC = yes
-MOBILE_PROFILE = yes
-NO_VTS_TEST = yes
-
-# Note need for trailing comma. If you add, keep it
-PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
-
-ALWAYS_AOT = yes
-
index ff9e0fd4536182d689f8530b5b40639e5983bfe3..9133dc24984f64533040416cf3c6e783aafc54ad 100644 (file)
@@ -38,7 +38,7 @@ FRAMEWORK_VERSION = 2.1
 
 # This is utility build only
 NO_INSTALL = yes
-MOBILE_STATIC = yes
+AOT_FRIENDLY_PROFILE = yes
 MOBILE_PROFILE = yes
 
 PROFILE_DISABLE_BTLS=1
index 18e2739bb8686c2a0825af71c4b00c80fac53a49..40b33a7aecc904e3502c3bbf25871c42b5f8fae1 100644 (file)
@@ -128,7 +128,7 @@ endif
 # For this to be done safely, we really need two passes. This
 # ensures that all of the .dlls are compiled before trying to
 # aot them. Because we want this to be the
-# default target for some profiles(mobile_static) we have a
+# default target for some profiles(aot_only) we have a
 # two-level build system. The do-all-aot target is what
 # gets invoked at the top-level when someone tries to build with aot.
 # It will invoke the do-all target, and will set TOP_LEVEL_DO for this
index 99e5ef51402044e78d1dc6c7032885e6e7edb1bf..9f06109a69e21907e73df0da49f80b8722eedf53 100644 (file)
@@ -37,8 +37,8 @@ drawing_DEPS_SUBDIRS = System.Drawing.Primitives
 monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
 monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
 
-mobile_static_SUBDIRS = $(monotouch_SUBDIRS)
-mobile_static_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
+aot_only_SUBDIRS = $(monotouch_SUBDIRS)
+aot_only_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
 
 net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(drawing_DEPS_SUBDIRS)
 net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS)
index f22bc600ec373cf056c9b3508a27cfce21af4938..6c883f8579685ab24608dcdf287482855722c50b 100644 (file)
@@ -61,7 +61,7 @@ mobile_common_dirs := \
        System.Reflection.Context       \
        System.Net.Http.WinHttpHandler
 
-mobile_static_dirs := \
+aot_only_dirs := \
        $(mobile_common_dirs)   \
        Mono.Dynamic.Interpreter        \
        PEAPI   \
@@ -88,7 +88,7 @@ monodroid_dirs := \
        $(pcl_facade_dirs)
 
 monotouch_dirs := \
-       $(mobile_static_dirs)
+       $(aot_only_dirs)
 
 monotouch_watch_dirs := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs))
 monotouch_tv_dirs   := $(monotouch_dirs)
@@ -313,7 +313,7 @@ monotouch_tv_SUBDIRS    := $(monotouch_tv_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 monotouch_watch_runtime_SUBDIRS := $(monotouch_watch_runtime_dirs)
 monotouch_tv_runtime_SUBDIRS := $(monotouch_tv_runtime_dirs)
-mobile_static_SUBDIRS := $(mobile_static_dirs)
+aot_only_SUBDIRS := $(aot_only_dirs)
 aot_hybrid_SUBDIRS := $(aot_hybrid_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
 xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs)
@@ -325,7 +325,7 @@ xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
 
 include ../build/rules.make
 
-SUBDIRS = $(mobile_static_dirs) $(aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
+SUBDIRS = $(aot_only_dirs) $(aot_hybrid_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks
 
index d2ed176601d823af3053fa2f8ff4e6b6df0bf2b6..6fab6abe3ae363eabf1d395eb5a507ae67c01218 100644 (file)
@@ -7,7 +7,7 @@ LIBRARY = Mono.CSharp.dll
 LIB_REFS = System.Core System.Xml System
 LIB_MCS_FLAGS =
 
-ifdef MOBILE_STATIC
+ifdef AOT_FRIENDLY_PROFILE
 LIB_MCS_FLAGS += -d:IOS_REFLECTION
 endif
 
diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/aot_only_Mono.CSharp.dll.sources
new file mode 100644 (file)
index 0000000..4c30fc6
--- /dev/null
@@ -0,0 +1,4 @@
+#include Mono.CSharp.dll.sources
+../corlib/System.Reflection.Emit/PEFileKinds.cs
+../corlib/System.Reflection.Emit/MethodToken.cs
+monotouch.cs
diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.exclude.sources b/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..c433add
--- /dev/null
@@ -0,0 +1,6 @@
+Evaluator/BuildinCommands.cs
+Evaluator/CompletionTest.cs
+Evaluator/EvaluatorFixture.cs
+Evaluator/EvaluatorTest.cs
+Evaluator/ExpressionsTest.cs
+Evaluator/TypesTest.cs
diff --git a/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.sources b/mcs/class/Mono.CSharp/aot_only_Mono.CSharp_test.dll.sources
new file mode 100644 (file)
index 0000000..64b774b
--- /dev/null
@@ -0,0 +1 @@
+#include Mono.CSharp_test.dll.sources
diff --git a/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp.dll.sources
deleted file mode 100644 (file)
index 4c30fc6..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs
diff --git a/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.exclude.sources b/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.exclude.sources
deleted file mode 100644 (file)
index c433add..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Evaluator/BuildinCommands.cs
-Evaluator/CompletionTest.cs
-Evaluator/EvaluatorFixture.cs
-Evaluator/EvaluatorTest.cs
-Evaluator/ExpressionsTest.cs
-Evaluator/TypesTest.cs
diff --git a/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.sources b/mcs/class/Mono.CSharp/mobile_static_Mono.CSharp_test.dll.sources
deleted file mode 100644 (file)
index 64b774b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include Mono.CSharp_test.dll.sources
index ec641ef2b6f617a373525b9489b8e1663cb47d89..d2f37605a4d8a0e354a4d87f6ea0562ca2a2bce8 100644 (file)
@@ -1 +1 @@
-#include mobile_static_Mono.CSharp.dll.sources
+#include aot_only_Mono.CSharp.dll.sources
index ec641ef2b6f617a373525b9489b8e1663cb47d89..d2f37605a4d8a0e354a4d87f6ea0562ca2a2bce8 100644 (file)
@@ -1 +1 @@
-#include mobile_static_Mono.CSharp.dll.sources
+#include aot_only_Mono.CSharp.dll.sources
index ec641ef2b6f617a373525b9489b8e1663cb47d89..d2f37605a4d8a0e354a4d87f6ea0562ca2a2bce8 100644 (file)
@@ -1 +1 @@
-#include mobile_static_Mono.CSharp.dll.sources
+#include aot_only_Mono.CSharp.dll.sources
index 6d9565ccbeec7bcc54cb52a404691fa3c3ee9a05..256eb7cd7e6da795d2997defb078d3f9b4c18b59 100644 (file)
@@ -10,7 +10,7 @@ LIB_MCS_FLAGS = \
        -d:MONO_INTERPRETER \
        -delaysign -keyfile:../mono.pub
 
-ifdef MOBILE_STATIC
+ifdef AOT_FRIENDLY_PROFILE
 mono_dynamic_interpreter_deps = $(the_libdir_base)plaincore/System.Core.dll
 LIB_REFS += plaincore/System.Core
 else
diff --git a/mcs/class/Mono.Security/aot_only_Mono.Security.dll.sources b/mcs/class/Mono.Security/aot_only_Mono.Security.dll.sources
new file mode 100644 (file)
index 0000000..87eaa00
--- /dev/null
@@ -0,0 +1,5 @@
+#include mobile_Mono.Security.dll.sources
+./Mono.Security.Cryptography/ARC4Managed.cs
+./Mono.Security.Cryptography/MD2Managed.cs
+./Mono.Security.Cryptography/MD4Managed.cs
+./Mono.Security.Cryptography/SHA224Managed.cs
diff --git a/mcs/class/Mono.Security/mobile_static_Mono.Security.dll.sources b/mcs/class/Mono.Security/mobile_static_Mono.Security.dll.sources
deleted file mode 100644 (file)
index 87eaa00..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#include mobile_Mono.Security.dll.sources
-./Mono.Security.Cryptography/ARC4Managed.cs
-./Mono.Security.Cryptography/MD2Managed.cs
-./Mono.Security.Cryptography/MD4Managed.cs
-./Mono.Security.Cryptography/SHA224Managed.cs
index 7ff3604e9a100d53b8c2215977b204a14b6f2bca..f5b1ea81600b14dcf0ec5f64f360fe2ae4c9c6d1 100644 (file)
@@ -19,7 +19,7 @@ endif
 
 system_core_plain_libdir = $(the_libdir_base)plaincore
 
-ifdef MOBILE_STATIC
+ifdef AOT_FRIENDLY_PROFILE
 extra_test_flags := -exclude:NotWorkingInterpreter
 system_core_library_deps = $(the_libdir_base)Mono.Dynamic.Interpreter.dll $(system_core_plain_libdir)/System.Core.dll
 LIB_MCS_FLAGS += -d:FEATURE_CORE_DLR
diff --git a/mcs/class/System.Core/aot_only_System.Core.dll.sources b/mcs/class/System.Core/aot_only_System.Core.dll.sources
new file mode 100644 (file)
index 0000000..8b8fef0
--- /dev/null
@@ -0,0 +1,17 @@
+#include common_System.Core.dll.sources
+#include interpreter_System.Core.dll.sources
+
+System.Security.Cryptography/AesCryptoServiceProvider.cs
+System.Security.Cryptography/AesTransform.cs
+System.Security.Cryptography/MD5Cng.cs
+System.Security.Cryptography/SHA1Cng.cs
+System.Security.Cryptography/SHA256Cng.cs
+System.Security.Cryptography/SHA256CryptoServiceProvider.cs
+System.Security.Cryptography/SHA384Cng.cs
+System.Security.Cryptography/SHA384CryptoServiceProvider.cs
+System.Security.Cryptography/SHA512Cng.cs
+System.Security.Cryptography/SHA512CryptoServiceProvider.cs
+
+../referencesource/System.Core/System/Security/Cryptography/AesManaged.cs
+../referencesource/System.Core/System/Security/Cryptography/ECDiffieHellman.cs
+../referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs
diff --git a/mcs/class/System.Core/aot_only_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/aot_only_System.Core_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..f98bf05
--- /dev/null
@@ -0,0 +1 @@
+System.IO.Pipes/PipeSecurityTest.cs
diff --git a/mcs/class/System.Core/aot_only_System.Core_test.dll.sources b/mcs/class/System.Core/aot_only_System.Core_test.dll.sources
new file mode 100644 (file)
index 0000000..33e2a10
--- /dev/null
@@ -0,0 +1 @@
+#include System.Core_test.dll.sources
diff --git a/mcs/class/System.Core/mobile_static_System.Core.dll.sources b/mcs/class/System.Core/mobile_static_System.Core.dll.sources
deleted file mode 100644 (file)
index 8b8fef0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#include common_System.Core.dll.sources
-#include interpreter_System.Core.dll.sources
-
-System.Security.Cryptography/AesCryptoServiceProvider.cs
-System.Security.Cryptography/AesTransform.cs
-System.Security.Cryptography/MD5Cng.cs
-System.Security.Cryptography/SHA1Cng.cs
-System.Security.Cryptography/SHA256Cng.cs
-System.Security.Cryptography/SHA256CryptoServiceProvider.cs
-System.Security.Cryptography/SHA384Cng.cs
-System.Security.Cryptography/SHA384CryptoServiceProvider.cs
-System.Security.Cryptography/SHA512Cng.cs
-System.Security.Cryptography/SHA512CryptoServiceProvider.cs
-
-../referencesource/System.Core/System/Security/Cryptography/AesManaged.cs
-../referencesource/System.Core/System/Security/Cryptography/ECDiffieHellman.cs
-../referencesource/System.Core/System/Security/Cryptography/ECKeyXmlFormat.cs
diff --git a/mcs/class/System.Core/mobile_static_System.Core_test.dll.exclude.sources b/mcs/class/System.Core/mobile_static_System.Core_test.dll.exclude.sources
deleted file mode 100644 (file)
index f98bf05..0000000
+++ /dev/null
@@ -1 +0,0 @@
-System.IO.Pipes/PipeSecurityTest.cs
diff --git a/mcs/class/System.Core/mobile_static_System.Core_test.dll.sources b/mcs/class/System.Core/mobile_static_System.Core_test.dll.sources
deleted file mode 100644 (file)
index 33e2a10..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include System.Core_test.dll.sources
index 40eb2dc413269dbec9925f77b759b5cc3ab6b8a4..65a50af72386adfc1da9ae1722691f868cf780bb 100644 (file)
@@ -1,2 +1,2 @@
-#include mobile_static_System.Core_test.dll.exclude.sources
+#include aot_only_System.Core_test.dll.exclude.sources
 #include monodroid_System.Core_test.dll.new-exclude.sources
index 9d54c82ff9b9742eb69d521bf83c6dd216479853..12aeaa4ad4d536103f019c69e9ab187d19cfd6fe 100755 (executable)
@@ -4196,7 +4196,7 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (5, n, "n");
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void NFIFromBug55978 ()
                {
diff --git a/mcs/class/System.Data/aot_only_System.Data.dll.sources b/mcs/class/System.Data/aot_only_System.Data.dll.sources
new file mode 100644 (file)
index 0000000..bbc860b
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.Data.dll.sources
diff --git a/mcs/class/System.Data/aot_only_System.Data_test.dll.exclude.sources b/mcs/class/System.Data/aot_only_System.Data_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..0022a9e
--- /dev/null
@@ -0,0 +1,18 @@
+System.Data.Odbc/OdbcCommandBuilderTest.cs
+System.Data.Odbc/OdbcCommandTest.cs
+System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
+System.Data.Odbc/OdbcConnectionTest.cs
+System.Data.Odbc/OdbcDataAdapterTest.cs
+System.Data.Odbc/OdbcDataReaderTest.cs
+System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
+System.Data.Odbc/OdbcParameterCollectionTest.cs
+System.Data.Odbc/OdbcParameterTest.cs
+System.Data.Odbc/OdbcPermissionAttributeTest.cs
+System.Data.Odbc/OdbcPermissionTest.cs
+System.Data.OleDb/OleDbCommandTest.cs
+System.Data.OleDb/OleDbConnectionTest.cs
+System.Data.OleDb/OleDbDataAdapterTest.cs
+System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs
+System.Data.OleDb/OleDbParameterCollectionTest.cs
+System.Data.OleDb/OleDbPermissionAttributeTest.cs
+System.Data.OleDb/OleDbPermissionTest.cs
diff --git a/mcs/class/System.Data/aot_only_System.Data_test.dll.sources b/mcs/class/System.Data/aot_only_System.Data_test.dll.sources
new file mode 100644 (file)
index 0000000..310b8c2
--- /dev/null
@@ -0,0 +1 @@
+#include System.Data_test.dll.sources
diff --git a/mcs/class/System.Data/mobile_static_System.Data.dll.sources b/mcs/class/System.Data/mobile_static_System.Data.dll.sources
deleted file mode 100644 (file)
index bbc860b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Data.dll.sources
diff --git a/mcs/class/System.Data/mobile_static_System.Data_test.dll.exclude.sources b/mcs/class/System.Data/mobile_static_System.Data_test.dll.exclude.sources
deleted file mode 100644 (file)
index 0022a9e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-System.Data.Odbc/OdbcCommandBuilderTest.cs
-System.Data.Odbc/OdbcCommandTest.cs
-System.Data.Odbc/OdbcConnectionStringBuilderTest.cs
-System.Data.Odbc/OdbcConnectionTest.cs
-System.Data.Odbc/OdbcDataAdapterTest.cs
-System.Data.Odbc/OdbcDataReaderTest.cs
-System.Data.Odbc/OdbcMetaDataCollectionNamesTest.cs
-System.Data.Odbc/OdbcParameterCollectionTest.cs
-System.Data.Odbc/OdbcParameterTest.cs
-System.Data.Odbc/OdbcPermissionAttributeTest.cs
-System.Data.Odbc/OdbcPermissionTest.cs
-System.Data.OleDb/OleDbCommandTest.cs
-System.Data.OleDb/OleDbConnectionTest.cs
-System.Data.OleDb/OleDbDataAdapterTest.cs
-System.Data.OleDb/OleDbMetaDataCollectionNamesTest.cs
-System.Data.OleDb/OleDbParameterCollectionTest.cs
-System.Data.OleDb/OleDbPermissionAttributeTest.cs
-System.Data.OleDb/OleDbPermissionTest.cs
diff --git a/mcs/class/System.Data/mobile_static_System.Data_test.dll.sources b/mcs/class/System.Data/mobile_static_System.Data_test.dll.sources
deleted file mode 100644 (file)
index 310b8c2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include System.Data_test.dll.sources
diff --git a/mcs/class/System.IdentityModel/aot_only_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/aot_only_System.IdentityModel.dll.sources
new file mode 100644 (file)
index 0000000..4296367
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.IdentityModel.dll.sources
diff --git a/mcs/class/System.IdentityModel/mobile_static_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/mobile_static_System.IdentityModel.dll.sources
deleted file mode 100644 (file)
index 4296367..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.IdentityModel.dll.sources
diff --git a/mcs/class/System.Runtime.Serialization/aot_only_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/aot_only_System.Runtime.Serialization.dll.sources
new file mode 100644 (file)
index 0000000..6caafd4
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.Runtime.Serialization.dll.sources
diff --git a/mcs/class/System.Runtime.Serialization/mobile_static_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/mobile_static_System.Runtime.Serialization.dll.sources
deleted file mode 100644 (file)
index 6caafd4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Runtime.Serialization.dll.sources
diff --git a/mcs/class/System.Security/aot_only_System.Security.dll.sources b/mcs/class/System.Security/aot_only_System.Security.dll.sources
new file mode 100644 (file)
index 0000000..599b7fa
--- /dev/null
@@ -0,0 +1 @@
+#include common_System.Security.dll.sources
diff --git a/mcs/class/System.Security/mobile_static_System.Security.dll.sources b/mcs/class/System.Security/mobile_static_System.Security.dll.sources
deleted file mode 100644 (file)
index 599b7fa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include common_System.Security.dll.sources
index 909ae4f9cf04cc9c2cd483dfbe4d5e906e94e0bc..a8fa07ec7b3c493c0f4f3bd4d1b2180cfe2c5531 100644 (file)
@@ -47,8 +47,8 @@ namespace MonoTests.System.ServiceModel.Web
        [TestFixture]
        public class WebOperationContextTest
        {
-// MonoTouch does not support dynamic proxy code generation.
-#if !MONOTOUCH && !MOBILE_STATIC
+// MonoTouch/FullAOT does not support dynamic proxy code generation.
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
 #endif
                public void Current ()
diff --git a/mcs/class/System.ServiceModel.Web/aot_only_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/aot_only_System.ServiceModel.Web.dll.sources
new file mode 100644 (file)
index 0000000..cbea0fa
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.ServiceModel.Web.dll.sources
diff --git a/mcs/class/System.ServiceModel.Web/mobile_static_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/mobile_static_System.ServiceModel.Web.dll.sources
deleted file mode 100644 (file)
index cbea0fa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.ServiceModel.Web.dll.sources
diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/aot_only_System.ServiceModel.dll.sources
new file mode 100644 (file)
index 0000000..22ece5c
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.ServiceModel.dll.sources
diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..350444a
--- /dev/null
@@ -0,0 +1,151 @@
+FeatureBased/Features.Contracts/AsyncCallTester.cs
+FeatureBased/Features.Contracts/FaultsTester.cs
+FeatureBased/Features.Serialization/AsyncCallTest.cs
+FeatureBased/Features.Serialization/AsyncPatternTester.cs
+FeatureBased/Features.Serialization/DataContractSerializerTest.cs
+FeatureBased/Features.Serialization/DualContractTester.cs
+FeatureBased/Features.Serialization/ExitProcessHelper.cs
+FeatureBased/Features.Serialization/FaultsTest.cs
+FeatureBased/Features.Serialization/KnownTypeTest.cs
+FeatureBased/Features.Serialization/MessageContractTest.cs
+FeatureBased/Features.Serialization/OperationContractTester.cs
+FeatureBased/Features.Serialization/PrimitiveTesterTest.cs
+FeatureBased/Features.Serialization/UntypedMessageTest.cs
+FeatureBased/TestFixtureBase.cs
+MetadataTests/BindingTestAssertions.cs
+MetadataTests/ExportTests.cs
+MetadataTests/ImportTests.cs
+MetadataTests/ImportTests_CreateMetadata.cs
+MetadataTests/ImportTests_LoadMetadata.cs
+MetadataTests/ImportTests_RoundTrip.cs
+MetadataTests/MetadataSamples.cs
+MetadataTests/MiscImportTests.cs
+MetadataTests/TestContext.cs
+System.ServiceModel.Channels/AsymmetricSecurityBindingElementTest.cs
+System.ServiceModel.Channels/BinaryMessageEncodingBindingElementTest.cs
+System.ServiceModel.Channels/BindingElementTest.cs
+System.ServiceModel.Channels/CalcSampleProxy.cs
+System.ServiceModel.Channels/CommunicationObjectTest.cs
+System.ServiceModel.Channels/ConnectionOrientedTransportBindingElementTest.cs
+System.ServiceModel.Channels/CustomBindingTest.cs
+System.ServiceModel.Channels/CustomPolicyConversionContext.cs
+System.ServiceModel.Channels/HandlerTransportBindingElement.cs
+System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
+System.ServiceModel.Channels/HttpsTransportBindingElementTest.cs
+System.ServiceModel.Channels/InterceptorBindingElement.cs
+System.ServiceModel.Channels/LocalClientSecuritySettingsTest.cs
+System.ServiceModel.Channels/MessageBufferTest.cs
+System.ServiceModel.Channels/MessageEncoderTest.cs
+System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs
+System.ServiceModel.Channels/MsmqTransportBindingElementTest.cs
+System.ServiceModel.Channels/NamedPipeTransportBindingElementTest.cs
+System.ServiceModel.Channels/OneWayBindingElementTest.cs
+System.ServiceModel.Channels/PeerTransportBindingElementTest.cs
+System.ServiceModel.Channels/ReplyChannelBase.cs
+System.ServiceModel.Channels/SecurityAssert.cs
+System.ServiceModel.Channels/SecurityBindingElementTest.cs
+System.ServiceModel.Channels/SslStreamSecurityBindingElementTest.cs
+System.ServiceModel.Channels/SymmetricSecurityBindingElementTest.cs
+System.ServiceModel.Channels/TcpTransportBindingElementTest.cs
+System.ServiceModel.Channels/TextMessageEncodingBindingElementTest.cs
+System.ServiceModel.Channels/TransactionFlowBindingElementTest.cs
+System.ServiceModel.Configuration/AddressHeaderCollectionElementTest.cs
+System.ServiceModel.Configuration/BasicHttpBindingElementTest.cs
+System.ServiceModel.Configuration/BehaviorsSectionTest.cs
+System.ServiceModel.Configuration/BindingsSectionTest.cs
+System.ServiceModel.Configuration/ChannelEndpointElementTest.cs
+System.ServiceModel.Configuration/CustomBindingElementTest.cs
+System.ServiceModel.Configuration/EndpointBehaviorElementTest.cs
+System.ServiceModel.Configuration/ExtensionsSectionTest.cs
+System.ServiceModel.Configuration/MetadataElementTest.cs
+System.ServiceModel.Configuration/MexBindingElementTest.cs
+System.ServiceModel.Configuration/NetNamedPipeBindingElementTest.cs
+System.ServiceModel.Configuration/NetPeerTcpBindingElementTest.cs
+System.ServiceModel.Configuration/NetTcpBindingElementTest.cs
+System.ServiceModel.Configuration/ServiceBehaviorElementTest.cs
+System.ServiceModel.Configuration/ServiceElementTest.cs
+System.ServiceModel.Configuration/ServiceModelConfigurationElementCollectionTest.cs
+System.ServiceModel.Configuration/ServiceModelSectionGroupTest.cs
+System.ServiceModel.Configuration/StandardBindingCollectionElementTest.cs
+System.ServiceModel.Configuration/StandardBindingElementCollectionTest.cs
+System.ServiceModel.Configuration/StandardBindingElementTest.cs
+System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs
+System.ServiceModel.Configuration/UserBinding.cs
+System.ServiceModel.Description/ClientCredentialsTest.cs
+System.ServiceModel.Description/ContractDescriptionTest.cs
+System.ServiceModel.Description/MetadataExchangeBindingsTest.cs
+System.ServiceModel.Description/MetadataResolverTest.cs
+System.ServiceModel.Description/MetadataSetTest.cs
+System.ServiceModel.Description/ServiceAuthorizationBehaviorTest.cs
+System.ServiceModel.Description/ServiceContractGeneratorTest.cs
+System.ServiceModel.Description/ServiceCredentialsTest.cs
+System.ServiceModel.Description/ServiceDebugBehaviorTest.cs
+System.ServiceModel.Description/ServiceMetadataBehaviorTest.cs
+System.ServiceModel.Description/ServiceMetadataEndpointTest.cs
+System.ServiceModel.Description/ServiceThrottlingBehaviorTest.cs
+System.ServiceModel.Description/TypedMessageConverterTest.cs
+System.ServiceModel.Description/WsdlExporterTest.cs
+System.ServiceModel.Description/WsdlImporterTest.cs
+System.ServiceModel.Dispatcher/ActionFilterTest.cs
+System.ServiceModel.Dispatcher/Bug32886Test.cs
+System.ServiceModel.Dispatcher/Bug652331Test.cs
+System.ServiceModel.Dispatcher/Bug652331_2Test.cs
+System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs
+System.ServiceModel.Dispatcher/DispatchOperationTest.cs
+System.ServiceModel.Dispatcher/DispatchRuntimeTest.cs
+System.ServiceModel.Dispatcher/EndpointAddressMessageFilterTest.cs
+System.ServiceModel.Dispatcher/EndpointDispatcherTest.cs
+System.ServiceModel.Dispatcher/ExceptionHandlerTest.cs
+System.ServiceModel.Dispatcher/FilterTableTest.cs
+System.ServiceModel.Dispatcher/InvalidBodyAccessExceptionTest.cs
+System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilterTest.cs
+System.ServiceModel.Dispatcher/XPathMessageContextTest.cs
+System.ServiceModel.PeerResolvers/CustomPeerResolverServiceTest.cs
+System.ServiceModel.PeerResolvers/PeerResolverSerializationTest.cs
+System.ServiceModel.Security.Tokens/IssuedSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/IssuedSecurityTokenProviderTest.cs
+System.ServiceModel.Security.Tokens/RsaSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/SecurityContextSecurityTokenTest.cs
+System.ServiceModel.Security.Tokens/SecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenTypesTest.cs
+System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/SspiSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/UserNameSecurityTokenParametersTest.cs
+System.ServiceModel.Security.Tokens/WrappedKeySecurityTokenTest.cs
+System.ServiceModel.Security.Tokens/X509ListedCertificateValidator.cs
+System.ServiceModel.Security.Tokens/X509SecurityTokenParametersTest.cs
+System.ServiceModel.Security/ChannelProtectionRequirementsTest.cs
+System.ServiceModel.Security/MessagePartSpecificationTest.cs
+System.ServiceModel.Security/ScopedMessagePartSpecificationTest.cs
+System.ServiceModel.Security/SecurityAlgorithmSuiteTest.cs
+System.ServiceModel.Security/SecurityMessagePropertyTest.cs
+System.ServiceModel.Security/SecurityTokenSpeficicationTest.cs
+System.ServiceModel.Security/ServiceCredentialsSecurityTokenManagerTest.cs
+System.ServiceModel.Security/ServiceSecurityContextTest.cs
+System.ServiceModel.Security/SupportingTokenParametersTest.cs
+System.ServiceModel.Security/TransportSecurityBindingElementTest.cs
+System.ServiceModel.Security/WSSecurityTokenSerializerTest.cs
+System.ServiceModel/BasicHttpBindingTest.cs
+System.ServiceModel/CallbackBehaviorAttributeTest.cs
+System.ServiceModel/ChannelFactoryTest.cs
+System.ServiceModel/ChannelFactory_1Test.cs
+System.ServiceModel/ClientBaseTest.cs
+System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
+System.ServiceModel/EndpointAddress10Test.cs
+System.ServiceModel/EndpointAddressBuilderTest.cs
+System.ServiceModel/EndpointAddressTest.cs
+System.ServiceModel/EndpointIdentityTest.cs
+System.ServiceModel/IntegratedConnectionTest.cs
+System.ServiceModel/MessageSecurityVersionTest.cs
+System.ServiceModel/MsmqTransportSecurityTest.cs
+System.ServiceModel/NetMsmqBindingTest.cs
+System.ServiceModel/NetPeerTcpBindingTest.cs
+System.ServiceModel/NetTcpBindingTest.cs
+System.ServiceModel/OperationContextTest.cs
+System.ServiceModel/PeerNodeAddressTest.cs
+System.ServiceModel/ServiceHostBaseTest.cs
+System.ServiceModel/ServiceHostTest.cs
+System.ServiceModel/TransactionProtocolTest.cs
+System.ServiceModel/WSFederationHttpBindingTest.cs
+System.ServiceModel/WSHttpBindingTest.cs
diff --git a/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.sources b/mcs/class/System.ServiceModel/aot_only_System.ServiceModel_test.dll.sources
new file mode 100644 (file)
index 0000000..275d9f3
--- /dev/null
@@ -0,0 +1 @@
+#include  System.ServiceModel_test.dll.sources
diff --git a/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel.dll.sources
deleted file mode 100644 (file)
index 22ece5c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.ServiceModel.dll.sources
diff --git a/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.exclude.sources
deleted file mode 100644 (file)
index 350444a..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-FeatureBased/Features.Contracts/AsyncCallTester.cs
-FeatureBased/Features.Contracts/FaultsTester.cs
-FeatureBased/Features.Serialization/AsyncCallTest.cs
-FeatureBased/Features.Serialization/AsyncPatternTester.cs
-FeatureBased/Features.Serialization/DataContractSerializerTest.cs
-FeatureBased/Features.Serialization/DualContractTester.cs
-FeatureBased/Features.Serialization/ExitProcessHelper.cs
-FeatureBased/Features.Serialization/FaultsTest.cs
-FeatureBased/Features.Serialization/KnownTypeTest.cs
-FeatureBased/Features.Serialization/MessageContractTest.cs
-FeatureBased/Features.Serialization/OperationContractTester.cs
-FeatureBased/Features.Serialization/PrimitiveTesterTest.cs
-FeatureBased/Features.Serialization/UntypedMessageTest.cs
-FeatureBased/TestFixtureBase.cs
-MetadataTests/BindingTestAssertions.cs
-MetadataTests/ExportTests.cs
-MetadataTests/ImportTests.cs
-MetadataTests/ImportTests_CreateMetadata.cs
-MetadataTests/ImportTests_LoadMetadata.cs
-MetadataTests/ImportTests_RoundTrip.cs
-MetadataTests/MetadataSamples.cs
-MetadataTests/MiscImportTests.cs
-MetadataTests/TestContext.cs
-System.ServiceModel.Channels/AsymmetricSecurityBindingElementTest.cs
-System.ServiceModel.Channels/BinaryMessageEncodingBindingElementTest.cs
-System.ServiceModel.Channels/BindingElementTest.cs
-System.ServiceModel.Channels/CalcSampleProxy.cs
-System.ServiceModel.Channels/CommunicationObjectTest.cs
-System.ServiceModel.Channels/ConnectionOrientedTransportBindingElementTest.cs
-System.ServiceModel.Channels/CustomBindingTest.cs
-System.ServiceModel.Channels/CustomPolicyConversionContext.cs
-System.ServiceModel.Channels/HandlerTransportBindingElement.cs
-System.ServiceModel.Channels/HttpTransportBindingElementTest.cs
-System.ServiceModel.Channels/HttpsTransportBindingElementTest.cs
-System.ServiceModel.Channels/InterceptorBindingElement.cs
-System.ServiceModel.Channels/LocalClientSecuritySettingsTest.cs
-System.ServiceModel.Channels/MessageBufferTest.cs
-System.ServiceModel.Channels/MessageEncoderTest.cs
-System.ServiceModel.Channels/MsmqBindingElementBaseTest.cs
-System.ServiceModel.Channels/MsmqTransportBindingElementTest.cs
-System.ServiceModel.Channels/NamedPipeTransportBindingElementTest.cs
-System.ServiceModel.Channels/OneWayBindingElementTest.cs
-System.ServiceModel.Channels/PeerTransportBindingElementTest.cs
-System.ServiceModel.Channels/ReplyChannelBase.cs
-System.ServiceModel.Channels/SecurityAssert.cs
-System.ServiceModel.Channels/SecurityBindingElementTest.cs
-System.ServiceModel.Channels/SslStreamSecurityBindingElementTest.cs
-System.ServiceModel.Channels/SymmetricSecurityBindingElementTest.cs
-System.ServiceModel.Channels/TcpTransportBindingElementTest.cs
-System.ServiceModel.Channels/TextMessageEncodingBindingElementTest.cs
-System.ServiceModel.Channels/TransactionFlowBindingElementTest.cs
-System.ServiceModel.Configuration/AddressHeaderCollectionElementTest.cs
-System.ServiceModel.Configuration/BasicHttpBindingElementTest.cs
-System.ServiceModel.Configuration/BehaviorsSectionTest.cs
-System.ServiceModel.Configuration/BindingsSectionTest.cs
-System.ServiceModel.Configuration/ChannelEndpointElementTest.cs
-System.ServiceModel.Configuration/CustomBindingElementTest.cs
-System.ServiceModel.Configuration/EndpointBehaviorElementTest.cs
-System.ServiceModel.Configuration/ExtensionsSectionTest.cs
-System.ServiceModel.Configuration/MetadataElementTest.cs
-System.ServiceModel.Configuration/MexBindingElementTest.cs
-System.ServiceModel.Configuration/NetNamedPipeBindingElementTest.cs
-System.ServiceModel.Configuration/NetPeerTcpBindingElementTest.cs
-System.ServiceModel.Configuration/NetTcpBindingElementTest.cs
-System.ServiceModel.Configuration/ServiceBehaviorElementTest.cs
-System.ServiceModel.Configuration/ServiceElementTest.cs
-System.ServiceModel.Configuration/ServiceModelConfigurationElementCollectionTest.cs
-System.ServiceModel.Configuration/ServiceModelSectionGroupTest.cs
-System.ServiceModel.Configuration/StandardBindingCollectionElementTest.cs
-System.ServiceModel.Configuration/StandardBindingElementCollectionTest.cs
-System.ServiceModel.Configuration/StandardBindingElementTest.cs
-System.ServiceModel.Configuration/StandardEndpointsSectionTest.cs
-System.ServiceModel.Configuration/UserBinding.cs
-System.ServiceModel.Description/ClientCredentialsTest.cs
-System.ServiceModel.Description/ContractDescriptionTest.cs
-System.ServiceModel.Description/MetadataExchangeBindingsTest.cs
-System.ServiceModel.Description/MetadataResolverTest.cs
-System.ServiceModel.Description/MetadataSetTest.cs
-System.ServiceModel.Description/ServiceAuthorizationBehaviorTest.cs
-System.ServiceModel.Description/ServiceContractGeneratorTest.cs
-System.ServiceModel.Description/ServiceCredentialsTest.cs
-System.ServiceModel.Description/ServiceDebugBehaviorTest.cs
-System.ServiceModel.Description/ServiceMetadataBehaviorTest.cs
-System.ServiceModel.Description/ServiceMetadataEndpointTest.cs
-System.ServiceModel.Description/ServiceThrottlingBehaviorTest.cs
-System.ServiceModel.Description/TypedMessageConverterTest.cs
-System.ServiceModel.Description/WsdlExporterTest.cs
-System.ServiceModel.Description/WsdlImporterTest.cs
-System.ServiceModel.Dispatcher/ActionFilterTest.cs
-System.ServiceModel.Dispatcher/Bug32886Test.cs
-System.ServiceModel.Dispatcher/Bug652331Test.cs
-System.ServiceModel.Dispatcher/Bug652331_2Test.cs
-System.ServiceModel.Dispatcher/ChannelDispatcherTest.cs
-System.ServiceModel.Dispatcher/DispatchOperationTest.cs
-System.ServiceModel.Dispatcher/DispatchRuntimeTest.cs
-System.ServiceModel.Dispatcher/EndpointAddressMessageFilterTest.cs
-System.ServiceModel.Dispatcher/EndpointDispatcherTest.cs
-System.ServiceModel.Dispatcher/ExceptionHandlerTest.cs
-System.ServiceModel.Dispatcher/FilterTableTest.cs
-System.ServiceModel.Dispatcher/InvalidBodyAccessExceptionTest.cs
-System.ServiceModel.Dispatcher/PrefixEndpointAddressMessageFilterTest.cs
-System.ServiceModel.Dispatcher/XPathMessageContextTest.cs
-System.ServiceModel.PeerResolvers/CustomPeerResolverServiceTest.cs
-System.ServiceModel.PeerResolvers/PeerResolverSerializationTest.cs
-System.ServiceModel.Security.Tokens/IssuedSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/IssuedSecurityTokenProviderTest.cs
-System.ServiceModel.Security.Tokens/RsaSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/SecurityContextSecurityTokenTest.cs
-System.ServiceModel.Security.Tokens/SecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/ServiceModelSecurityTokenTypesTest.cs
-System.ServiceModel.Security.Tokens/SslSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/SspiSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/UserNameSecurityTokenParametersTest.cs
-System.ServiceModel.Security.Tokens/WrappedKeySecurityTokenTest.cs
-System.ServiceModel.Security.Tokens/X509ListedCertificateValidator.cs
-System.ServiceModel.Security.Tokens/X509SecurityTokenParametersTest.cs
-System.ServiceModel.Security/ChannelProtectionRequirementsTest.cs
-System.ServiceModel.Security/MessagePartSpecificationTest.cs
-System.ServiceModel.Security/ScopedMessagePartSpecificationTest.cs
-System.ServiceModel.Security/SecurityAlgorithmSuiteTest.cs
-System.ServiceModel.Security/SecurityMessagePropertyTest.cs
-System.ServiceModel.Security/SecurityTokenSpeficicationTest.cs
-System.ServiceModel.Security/ServiceCredentialsSecurityTokenManagerTest.cs
-System.ServiceModel.Security/ServiceSecurityContextTest.cs
-System.ServiceModel.Security/SupportingTokenParametersTest.cs
-System.ServiceModel.Security/TransportSecurityBindingElementTest.cs
-System.ServiceModel.Security/WSSecurityTokenSerializerTest.cs
-System.ServiceModel/BasicHttpBindingTest.cs
-System.ServiceModel/CallbackBehaviorAttributeTest.cs
-System.ServiceModel/ChannelFactoryTest.cs
-System.ServiceModel/ChannelFactory_1Test.cs
-System.ServiceModel/ClientBaseTest.cs
-System.ServiceModel/ClientCredentialsSecurityTokenManagerTest.cs
-System.ServiceModel/EndpointAddress10Test.cs
-System.ServiceModel/EndpointAddressBuilderTest.cs
-System.ServiceModel/EndpointAddressTest.cs
-System.ServiceModel/EndpointIdentityTest.cs
-System.ServiceModel/IntegratedConnectionTest.cs
-System.ServiceModel/MessageSecurityVersionTest.cs
-System.ServiceModel/MsmqTransportSecurityTest.cs
-System.ServiceModel/NetMsmqBindingTest.cs
-System.ServiceModel/NetPeerTcpBindingTest.cs
-System.ServiceModel/NetTcpBindingTest.cs
-System.ServiceModel/OperationContextTest.cs
-System.ServiceModel/PeerNodeAddressTest.cs
-System.ServiceModel/ServiceHostBaseTest.cs
-System.ServiceModel/ServiceHostTest.cs
-System.ServiceModel/TransactionProtocolTest.cs
-System.ServiceModel/WSFederationHttpBindingTest.cs
-System.ServiceModel/WSHttpBindingTest.cs
diff --git a/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.sources b/mcs/class/System.ServiceModel/mobile_static_System.ServiceModel_test.dll.sources
deleted file mode 100644 (file)
index 275d9f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include  System.ServiceModel_test.dll.sources
diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/aot_only_System.Web.Services.dll.sources
new file mode 100644 (file)
index 0000000..9e39dcc
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.Web.Services.dll.sources
diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..0dee611
--- /dev/null
@@ -0,0 +1,8 @@
+System.Web.Services.Configuration/DiagnosticsElementTest.cs
+System.Web.Services.Configuration/ProtocolElementTest.cs
+System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
+System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
+System.Web.Services.Configuration/TypeElementTest.cs
+System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
+System.Web.Services.Configuration/WsiProfilesElementTest.cs
+System.Web.Services.Configuration/XmlFormatExtensionAttributeTest.cs
diff --git a/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.sources b/mcs/class/System.Web.Services/aot_only_System.Web.Services_test.dll.sources
new file mode 100644 (file)
index 0000000..915ba6c
--- /dev/null
@@ -0,0 +1 @@
+#include System.Web.Services_test.dll.sources
diff --git a/mcs/class/System.Web.Services/mobile_static_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/mobile_static_System.Web.Services.dll.sources
deleted file mode 100644 (file)
index 9e39dcc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Web.Services.dll.sources
diff --git a/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.exclude.sources
deleted file mode 100644 (file)
index 0dee611..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-System.Web.Services.Configuration/DiagnosticsElementTest.cs
-System.Web.Services.Configuration/ProtocolElementTest.cs
-System.Web.Services.Configuration/SoapEnvelopeProcessingElementTest.cs
-System.Web.Services.Configuration/SoapExtensionTypeElementTest.cs
-System.Web.Services.Configuration/TypeElementTest.cs
-System.Web.Services.Configuration/WsdlHelpGeneratorElementTest.cs
-System.Web.Services.Configuration/WsiProfilesElementTest.cs
-System.Web.Services.Configuration/XmlFormatExtensionAttributeTest.cs
diff --git a/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.sources b/mcs/class/System.Web.Services/mobile_static_System.Web.Services_test.dll.sources
deleted file mode 100644 (file)
index 915ba6c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include System.Web.Services_test.dll.sources
diff --git a/mcs/class/System.XML/aot_only_System.Xml.dll.sources b/mcs/class/System.XML/aot_only_System.Xml.dll.sources
new file mode 100644 (file)
index 0000000..b663093
--- /dev/null
@@ -0,0 +1 @@
+#include mobile_System.Xml.dll.sources
diff --git a/mcs/class/System.XML/mobile_static_System.Xml.dll.sources b/mcs/class/System.XML/mobile_static_System.Xml.dll.sources
deleted file mode 100644 (file)
index b663093..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Xml.dll.sources
diff --git a/mcs/class/System/Mono.Util/MonoPInvokeCallbackAttribute.cs b/mcs/class/System/Mono.Util/MonoPInvokeCallbackAttribute.cs
new file mode 100644 (file)
index 0000000..bc81433
--- /dev/null
@@ -0,0 +1,8 @@
+using System;
+
+namespace Mono.Util {
+       class MonoPInvokeCallbackAttribute : Attribute {
+                       public MonoPInvokeCallbackAttribute (Type t) {}
+       }
+}
+
diff --git a/mcs/class/System/MonoTouch/MonoPInvokeCallbackAttribute.cs b/mcs/class/System/MonoTouch/MonoPInvokeCallbackAttribute.cs
deleted file mode 100644 (file)
index c17c5e4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace MonoTouch {
-       class MonoPInvokeCallbackAttribute : Attribute {
-                       public MonoPInvokeCallbackAttribute (Type t) {}
-       }
-}
-
index 705cd5d0206658a1bb3b900c3e98e4951560ecd5..a79f8826a9b324e615078aa3d10958c16d3ec965 100644 (file)
@@ -35,10 +35,6 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Remoting.Messaging;
 
-#if MONOTOUCH || MOBILE_STATIC
-using MonoTouch;
-#endif
-
 namespace System.IO.Compression
 {
        public class DeflateStream : Stream
@@ -383,8 +379,8 @@ namespace System.IO.Compression
                        CheckResult (res, "WriteInternal");
                }
 
-#if MONOTOUCH || MOBILE_STATIC
-               [MonoPInvokeCallback (typeof (UnmanagedReadOrWrite))]
+#if MONOTOUCH || FULL_AOT_RUNTIME
+               [Mono.Util.MonoPInvokeCallback (typeof (UnmanagedReadOrWrite))]
 #endif
                static int UnmanagedRead (IntPtr buffer, int length, IntPtr data)
                {
@@ -408,8 +404,8 @@ namespace System.IO.Compression
                        return n;
                }
 
-#if MONOTOUCH || MOBILE_STATIC
-               [MonoPInvokeCallback (typeof (UnmanagedReadOrWrite))]
+#if MONOTOUCH || FULL_AOT_RUNTIME
+               [Mono.Util.MonoPInvokeCallback (typeof (UnmanagedReadOrWrite))]
 #endif
                static int UnmanagedWrite (IntPtr buffer, int length, IntPtr data)
                {
index 861d710f77cfd80fa9b535d272fa9e838f3f43b6..8ce3daf9436e910aac171f815d1107e73733f627 100644 (file)
@@ -299,8 +299,8 @@ namespace System.Net.NetworkInformation {
                        }
                }
 
-#if MONOTOUCH || MOBILE_STATIC
-               [MonoTouch.MonoPInvokeCallback (typeof (SCNetworkReachabilityCallback))]
+#if MONOTOUCH || FULL_AOT_RUNTIME
+               [Mono.Util.MonoPInvokeCallback (typeof (SCNetworkReachabilityCallback))]
 #endif
                static void HandleCallback (IntPtr reachability, NetworkReachabilityFlags flags, IntPtr info)
                {
index 968038e5c3657b7995306ffa4a6750391770cf0e..9cdee64a0ccc8a2abcd6b22dab0b3b1dae68c5eb 100644 (file)
@@ -45,7 +45,7 @@ namespace System.Net.Sockets {
                        int error = 0;
 
                        Socket.Blocking_internal (handle, false, out error);
-#if MOBILE_STATIC
+#if AOT_ONLY_DESKTOP
                        /* It's only for platforms that do not have working syscall abort mechanism, like WatchOS and TvOS */
                        Socket.Shutdown_internal (handle, SocketShutdown.Both, out error);
 #endif
index b747e0dd0164e0fc6e98da731bc02b49911c94ef..815bbb85c45d0c4fe36d4a49819a0384e4816a60 100644 (file)
@@ -108,7 +108,7 @@ namespace MonoTests.System.Diagnostics
                        Assert.IsNull (fvi.SpecialBuild, "#27");
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void GetVersionInfo_NoNativeResources ()
                {
diff --git a/mcs/class/System/aot_only_System.dll.sources b/mcs/class/System/aot_only_System.dll.sources
new file mode 100644 (file)
index 0000000..e9469d0
--- /dev/null
@@ -0,0 +1,2 @@
+#include mobile_System.dll.sources
+Mono.Util/MonoPInvokeCallbackAttribute.cs
diff --git a/mcs/class/System/aot_only_System_test.dll.exclude.sources b/mcs/class/System/aot_only_System_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..9a453e6
--- /dev/null
@@ -0,0 +1,210 @@
+
+Microsoft.CSharp/CSharpCodeProviderCas.cs
+Microsoft.CSharp/CSharpCodeProviderTest.cs
+Microsoft.CSharp/CodeGeneratorFromCompileUnitTest.cs
+Microsoft.CSharp/CodeGeneratorFromExpressionTest.cs
+Microsoft.CSharp/CodeGeneratorFromNamespaceTest.cs
+Microsoft.CSharp/CodeGeneratorFromStatementTest.cs
+Microsoft.CSharp/CodeGeneratorFromTypeTest.cs
+Microsoft.CSharp/CodeGeneratorIdentifierTest.cs
+Microsoft.CSharp/CodeGeneratorTestBase.cs
+Microsoft.CSharp/CodeGeneratorTypeOutputTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromBinaryOperatorTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromExpressionTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromNamespaceTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromStatementTest.cs
+Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs
+Microsoft.VisualBasic/CodeGeneratorTestBase.cs
+Microsoft.VisualBasic/VBCodeProviderCas.cs
+Microsoft.VisualBasic/VBCodeProviderTest.cs
+Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs
+Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs
+Microsoft.Win32/PowerModeChangedEventArgsCas.cs
+Microsoft.Win32/SessionEndedEventArgsCas.cs
+Microsoft.Win32/SessionEndingEventArgsCas.cs
+Microsoft.Win32/SessionSwitchEventArgsCas.cs
+Microsoft.Win32/SessionSwitchEventArgsTest.cs
+Microsoft.Win32/SystemEventsCas.cs
+Microsoft.Win32/TimerElapsedEventArgsCas.cs
+Microsoft.Win32/UserPreferenceChangedEventArgsCas.cs
+Microsoft.Win32/UserPreferenceChangingEventArgsCas.cs
+System.CodeDom.Compiler/CodeCompilerCas.cs
+System.CodeDom.Compiler/CodeDomProviderCas.cs
+System.CodeDom.Compiler/CodeGeneratorCas.cs
+System.CodeDom.Compiler/CodeGeneratorFromTypeTestBase.cs
+System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
+System.CodeDom.Compiler/CodeGeneratorOptionsCas.cs
+System.CodeDom.Compiler/CodeGeneratorOptionsTest.cs
+System.CodeDom.Compiler/CodeGeneratorTest.cs
+System.CodeDom.Compiler/CodeGeneratorTestBase.cs
+System.CodeDom.Compiler/CodeParserCas.cs
+System.CodeDom.Compiler/CompilerErrorCas.cs
+System.CodeDom.Compiler/CompilerErrorCollectionCas.cs
+System.CodeDom.Compiler/CompilerInfoCas.cs
+System.CodeDom.Compiler/CompilerParametersCas.cs
+System.CodeDom.Compiler/CompilerResultsCas.cs
+System.CodeDom.Compiler/ExecutorCas.cs
+System.CodeDom.Compiler/ExecutorTest.cs
+System.CodeDom.Compiler/GeneratedCodeAttributeCas.cs
+System.CodeDom.Compiler/GeneratedCodeAttributeTest.cs
+System.CodeDom.Compiler/IndentedTextWriterCas.cs
+System.CodeDom.Compiler/IndentedTextWriterTest.cs
+System.CodeDom.Compiler/TempFileCollectionCas.cs
+System.CodeDom.Compiler/TempFileCollectionTest.cs
+System.CodeDom/CodeArgumentReferenceExpressionCas.cs
+System.CodeDom/CodeArgumentReferenceExpressionTest.cs
+System.CodeDom/CodeArrayCreateExpressionCas.cs
+System.CodeDom/CodeArrayCreateExpressionTest.cs
+System.CodeDom/CodeArrayIndexerExpressionCas.cs
+System.CodeDom/CodeAssignStatementCas.cs
+System.CodeDom/CodeAttachEventStatementCas.cs
+System.CodeDom/CodeAttachEventStatementTest.cs
+System.CodeDom/CodeAttributeArgumentCas.cs
+System.CodeDom/CodeAttributeArgumentCollectionCas.cs
+System.CodeDom/CodeAttributeArgumentCollectionTest.cs
+System.CodeDom/CodeAttributeArgumentTest.cs
+System.CodeDom/CodeAttributeDeclarationCas.cs
+System.CodeDom/CodeAttributeDeclarationCollectionCas.cs
+System.CodeDom/CodeAttributeDeclarationCollectionTest.cs
+System.CodeDom/CodeAttributeDeclarationTest.cs
+System.CodeDom/CodeBaseReferenceExpressionCas.cs
+System.CodeDom/CodeBinaryOperatorExpressionCas.cs
+System.CodeDom/CodeCastExpressionCas.cs
+System.CodeDom/CodeCastExpressionTest.cs
+System.CodeDom/CodeCatchClauseCas.cs
+System.CodeDom/CodeCatchClauseCollectionCas.cs
+System.CodeDom/CodeCatchClauseCollectionTest.cs
+System.CodeDom/CodeCatchClauseTest.cs
+System.CodeDom/CodeChecksumPragmaCas.cs
+System.CodeDom/CodeChecksumPragmaTest.cs
+System.CodeDom/CodeCommentStatementCas.cs
+System.CodeDom/CodeCommentStatementCollectionCas.cs
+System.CodeDom/CodeCommentStatementCollectionTest.cs
+System.CodeDom/CodeCompileUnitCas.cs
+System.CodeDom/CodeConditionStatementCas.cs
+System.CodeDom/CodeConstructorCas.cs
+System.CodeDom/CodeConstructorTest.cs
+System.CodeDom/CodeDefaultValueExpressionCas.cs
+System.CodeDom/CodeDefaultValueExpressionTest.cs
+System.CodeDom/CodeDelegateCreateExpressionCas.cs
+System.CodeDom/CodeDelegateCreateExpressionTest.cs
+System.CodeDom/CodeDelegateInvokeExpressionCas.cs
+System.CodeDom/CodeDirectionExpressionCas.cs
+System.CodeDom/CodeDirectiveCas.cs
+System.CodeDom/CodeDirectiveCollectionCas.cs
+System.CodeDom/CodeDirectiveCollectionTest.cs
+System.CodeDom/CodeEntryPointMethodCas.cs
+System.CodeDom/CodeEventReferenceExpressionCas.cs
+System.CodeDom/CodeEventReferenceExpressionTest.cs
+System.CodeDom/CodeExpressionCas.cs
+System.CodeDom/CodeExpressionCollectionCas.cs
+System.CodeDom/CodeExpressionCollectionTest.cs
+System.CodeDom/CodeExpressionStatementCas.cs
+System.CodeDom/CodeFieldReferenceExpressionCas.cs
+System.CodeDom/CodeGotoStatementCas.cs
+System.CodeDom/CodeGotoStatementTest.cs
+System.CodeDom/CodeIndexerExpressionCas.cs
+System.CodeDom/CodeIterationStatementCas.cs
+System.CodeDom/CodeLabeledStatementTest.cs
+System.CodeDom/CodeLinePragmaCas.cs
+System.CodeDom/CodeLinePragmaTest.cs
+System.CodeDom/CodeMemberEventCas.cs
+System.CodeDom/CodeMemberFieldCas.cs
+System.CodeDom/CodeMemberFieldTest.cs
+System.CodeDom/CodeMemberMethodCas.cs
+System.CodeDom/CodeMemberMethodTest.cs
+System.CodeDom/CodeMemberPropertyCas.cs
+System.CodeDom/CodeMemberPropertyTest.cs
+System.CodeDom/CodeMethodInvokeExpressionCas.cs
+System.CodeDom/CodeMethodInvokeExpressionTest.cs
+System.CodeDom/CodeMethodReferenceExpressionCas.cs
+System.CodeDom/CodeMethodReferenceExpressionTest.cs
+System.CodeDom/CodeMethodReturnStatementCas.cs
+System.CodeDom/CodeNamespaceCas.cs
+System.CodeDom/CodeNamespaceCollectionCas.cs
+System.CodeDom/CodeNamespaceCollectionTest.cs
+System.CodeDom/CodeNamespaceImportCas.cs
+System.CodeDom/CodeNamespaceImportCollectionCas.cs
+System.CodeDom/CodeNamespaceImportCollectionTest.cs
+System.CodeDom/CodeNamespaceImportTest.cs
+System.CodeDom/CodeNamespaceTest.cs
+System.CodeDom/CodeObjectCas.cs
+System.CodeDom/CodeObjectCreateExpressionCas.cs
+System.CodeDom/CodeObjectCreateExpressionTest.cs
+System.CodeDom/CodeParameterDeclarationExpressionCas.cs
+System.CodeDom/CodeParameterDeclarationExpressionCollectionCas.cs
+System.CodeDom/CodeParameterDeclarationExpressionCollectionTest.cs
+System.CodeDom/CodeParameterDeclarationExpressionTest.cs
+System.CodeDom/CodePrimitiveExpressionCas.cs
+System.CodeDom/CodePropertyReferenceExpressionCas.cs
+System.CodeDom/CodePropertyReferenceExpressionTest.cs
+System.CodeDom/CodePropertySetValueReferenceExpressionCas.cs
+System.CodeDom/CodeRegionDirectiveCas.cs
+System.CodeDom/CodeRegionDirectiveTest.cs
+System.CodeDom/CodeRemoveEventStatementCas.cs
+System.CodeDom/CodeRemoveEventStatementTest.cs
+System.CodeDom/CodeSnippetCompileUnitCas.cs
+System.CodeDom/CodeSnippetCompileUnitTest.cs
+System.CodeDom/CodeSnippetExpressionCas.cs
+System.CodeDom/CodeSnippetExpressionTest.cs
+System.CodeDom/CodeSnippetStatementCas.cs
+System.CodeDom/CodeSnippetStatementTest.cs
+System.CodeDom/CodeSnippetTypeMemberCas.cs
+System.CodeDom/CodeSnippetTypeMemberTest.cs
+System.CodeDom/CodeStatementCas.cs
+System.CodeDom/CodeStatementCollectionCas.cs
+System.CodeDom/CodeStatementCollectionTest.cs
+System.CodeDom/CodeThisReferenceExpressionCas.cs
+System.CodeDom/CodeThrowExceptionStatementCas.cs
+System.CodeDom/CodeTryCatchFinallyStatementCas.cs
+System.CodeDom/CodeTypeConstructorCas.cs
+System.CodeDom/CodeTypeConstructorTest.cs
+System.CodeDom/CodeTypeDeclarationCas.cs
+System.CodeDom/CodeTypeDeclarationCollectionCas.cs
+System.CodeDom/CodeTypeDeclarationCollectionTest.cs
+System.CodeDom/CodeTypeDelegateCas.cs
+System.CodeDom/CodeTypeDelegateTest.cs
+System.CodeDom/CodeTypeMemberCas.cs
+System.CodeDom/CodeTypeMemberCollectionCas.cs
+System.CodeDom/CodeTypeMemberCollectionTest.cs
+System.CodeDom/CodeTypeOfExpressionCas.cs
+System.CodeDom/CodeTypeOfExpressionTest.cs
+System.CodeDom/CodeTypeParameterCas.cs
+System.CodeDom/CodeTypeParameterCollectionTest.cs
+System.CodeDom/CodeTypeParameterTest.cs
+System.CodeDom/CodeTypeReferenceCas.cs
+System.CodeDom/CodeTypeReferenceCollectionCas.cs
+System.CodeDom/CodeTypeReferenceCollectionTest.cs
+System.CodeDom/CodeTypeReferenceExpressionCas.cs
+System.CodeDom/CodeTypeReferenceExpressionTest.cs
+System.CodeDom/CodeTypeReferenceTest.cs
+System.CodeDom/CodeVariableDeclarationStatementCas.cs
+System.CodeDom/CodeVariableDeclarationStatementTest.cs
+System.CodeDom/CodeVariableReferenceExpressionCas.cs
+System.CodeDom/CodeVariableReferenceExpressionTest.cs
+System.Configuration.Provider
+System.Configuration.Provider/ProviderBaseTest.cs
+System.Configuration/ApplicationSettingsBaseTest.cs
+System.Configuration/ConfigXmlDocumentTest.cs
+System.Configuration/ConfigurationExceptionTest.cs
+System.Configuration/LocalFileSettingsProviderTest.cs
+System.Configuration/SettingElementTest.cs
+System.Configuration/SettingsBaseTest.cs
+System.Configuration/SettingsPropertyCollectionTest.cs
+System.Configuration/SettingsPropertyTest.cs
+System.Configuration/SettingsPropertyValueCollectionTest.cs
+System.Configuration/SettingsPropertyValueTest.cs
+System.IO.Ports/SerialPortTest.cs
+System.Security.Permissions/ResourcePermissionBaseCas.cs
+System.Security.Permissions/ResourcePermissionBaseEntryCas.cs
+System.Security.Permissions/ResourcePermissionBaseEntryTest.cs
+System.Security.Permissions/ResourcePermissionBaseTest.cs
+System.Security.Permissions/StorePermissionAttributeCas.cs
+System.Security.Permissions/StorePermissionAttributeTest.cs
+System.Security.Permissions/StorePermissionCas.cs
+System.Security.Permissions/StorePermissionTest.cs
+System.Web/AspNetHostingPermissionAttributeCas.cs
+System.Web/AspNetHostingPermissionAttributeTest.cs
+System.Web/AspNetHostingPermissionCas.cs
+System.Web/AspNetHostingPermissionTest.cs
diff --git a/mcs/class/System/aot_only_System_test.dll.sources b/mcs/class/System/aot_only_System_test.dll.sources
new file mode 100644 (file)
index 0000000..3944a95
--- /dev/null
@@ -0,0 +1 @@
+#include System_test.dll.sources
diff --git a/mcs/class/System/mobile_static_System.dll.sources b/mcs/class/System/mobile_static_System.dll.sources
deleted file mode 100644 (file)
index 8dce31d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include mobile_System.dll.sources
-MonoTouch/MonoPInvokeCallbackAttribute.cs
diff --git a/mcs/class/System/mobile_static_System_test.dll.exclude.sources b/mcs/class/System/mobile_static_System_test.dll.exclude.sources
deleted file mode 100644 (file)
index 9a453e6..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-
-Microsoft.CSharp/CSharpCodeProviderCas.cs
-Microsoft.CSharp/CSharpCodeProviderTest.cs
-Microsoft.CSharp/CodeGeneratorFromCompileUnitTest.cs
-Microsoft.CSharp/CodeGeneratorFromExpressionTest.cs
-Microsoft.CSharp/CodeGeneratorFromNamespaceTest.cs
-Microsoft.CSharp/CodeGeneratorFromStatementTest.cs
-Microsoft.CSharp/CodeGeneratorFromTypeTest.cs
-Microsoft.CSharp/CodeGeneratorIdentifierTest.cs
-Microsoft.CSharp/CodeGeneratorTestBase.cs
-Microsoft.CSharp/CodeGeneratorTypeOutputTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromBinaryOperatorTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromExpressionTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromNamespaceTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromStatementTest.cs
-Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs
-Microsoft.VisualBasic/CodeGeneratorTestBase.cs
-Microsoft.VisualBasic/VBCodeProviderCas.cs
-Microsoft.VisualBasic/VBCodeProviderTest.cs
-Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs
-Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs
-Microsoft.Win32/PowerModeChangedEventArgsCas.cs
-Microsoft.Win32/SessionEndedEventArgsCas.cs
-Microsoft.Win32/SessionEndingEventArgsCas.cs
-Microsoft.Win32/SessionSwitchEventArgsCas.cs
-Microsoft.Win32/SessionSwitchEventArgsTest.cs
-Microsoft.Win32/SystemEventsCas.cs
-Microsoft.Win32/TimerElapsedEventArgsCas.cs
-Microsoft.Win32/UserPreferenceChangedEventArgsCas.cs
-Microsoft.Win32/UserPreferenceChangingEventArgsCas.cs
-System.CodeDom.Compiler/CodeCompilerCas.cs
-System.CodeDom.Compiler/CodeDomProviderCas.cs
-System.CodeDom.Compiler/CodeGeneratorCas.cs
-System.CodeDom.Compiler/CodeGeneratorFromTypeTestBase.cs
-System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs
-System.CodeDom.Compiler/CodeGeneratorOptionsCas.cs
-System.CodeDom.Compiler/CodeGeneratorOptionsTest.cs
-System.CodeDom.Compiler/CodeGeneratorTest.cs
-System.CodeDom.Compiler/CodeGeneratorTestBase.cs
-System.CodeDom.Compiler/CodeParserCas.cs
-System.CodeDom.Compiler/CompilerErrorCas.cs
-System.CodeDom.Compiler/CompilerErrorCollectionCas.cs
-System.CodeDom.Compiler/CompilerInfoCas.cs
-System.CodeDom.Compiler/CompilerParametersCas.cs
-System.CodeDom.Compiler/CompilerResultsCas.cs
-System.CodeDom.Compiler/ExecutorCas.cs
-System.CodeDom.Compiler/ExecutorTest.cs
-System.CodeDom.Compiler/GeneratedCodeAttributeCas.cs
-System.CodeDom.Compiler/GeneratedCodeAttributeTest.cs
-System.CodeDom.Compiler/IndentedTextWriterCas.cs
-System.CodeDom.Compiler/IndentedTextWriterTest.cs
-System.CodeDom.Compiler/TempFileCollectionCas.cs
-System.CodeDom.Compiler/TempFileCollectionTest.cs
-System.CodeDom/CodeArgumentReferenceExpressionCas.cs
-System.CodeDom/CodeArgumentReferenceExpressionTest.cs
-System.CodeDom/CodeArrayCreateExpressionCas.cs
-System.CodeDom/CodeArrayCreateExpressionTest.cs
-System.CodeDom/CodeArrayIndexerExpressionCas.cs
-System.CodeDom/CodeAssignStatementCas.cs
-System.CodeDom/CodeAttachEventStatementCas.cs
-System.CodeDom/CodeAttachEventStatementTest.cs
-System.CodeDom/CodeAttributeArgumentCas.cs
-System.CodeDom/CodeAttributeArgumentCollectionCas.cs
-System.CodeDom/CodeAttributeArgumentCollectionTest.cs
-System.CodeDom/CodeAttributeArgumentTest.cs
-System.CodeDom/CodeAttributeDeclarationCas.cs
-System.CodeDom/CodeAttributeDeclarationCollectionCas.cs
-System.CodeDom/CodeAttributeDeclarationCollectionTest.cs
-System.CodeDom/CodeAttributeDeclarationTest.cs
-System.CodeDom/CodeBaseReferenceExpressionCas.cs
-System.CodeDom/CodeBinaryOperatorExpressionCas.cs
-System.CodeDom/CodeCastExpressionCas.cs
-System.CodeDom/CodeCastExpressionTest.cs
-System.CodeDom/CodeCatchClauseCas.cs
-System.CodeDom/CodeCatchClauseCollectionCas.cs
-System.CodeDom/CodeCatchClauseCollectionTest.cs
-System.CodeDom/CodeCatchClauseTest.cs
-System.CodeDom/CodeChecksumPragmaCas.cs
-System.CodeDom/CodeChecksumPragmaTest.cs
-System.CodeDom/CodeCommentStatementCas.cs
-System.CodeDom/CodeCommentStatementCollectionCas.cs
-System.CodeDom/CodeCommentStatementCollectionTest.cs
-System.CodeDom/CodeCompileUnitCas.cs
-System.CodeDom/CodeConditionStatementCas.cs
-System.CodeDom/CodeConstructorCas.cs
-System.CodeDom/CodeConstructorTest.cs
-System.CodeDom/CodeDefaultValueExpressionCas.cs
-System.CodeDom/CodeDefaultValueExpressionTest.cs
-System.CodeDom/CodeDelegateCreateExpressionCas.cs
-System.CodeDom/CodeDelegateCreateExpressionTest.cs
-System.CodeDom/CodeDelegateInvokeExpressionCas.cs
-System.CodeDom/CodeDirectionExpressionCas.cs
-System.CodeDom/CodeDirectiveCas.cs
-System.CodeDom/CodeDirectiveCollectionCas.cs
-System.CodeDom/CodeDirectiveCollectionTest.cs
-System.CodeDom/CodeEntryPointMethodCas.cs
-System.CodeDom/CodeEventReferenceExpressionCas.cs
-System.CodeDom/CodeEventReferenceExpressionTest.cs
-System.CodeDom/CodeExpressionCas.cs
-System.CodeDom/CodeExpressionCollectionCas.cs
-System.CodeDom/CodeExpressionCollectionTest.cs
-System.CodeDom/CodeExpressionStatementCas.cs
-System.CodeDom/CodeFieldReferenceExpressionCas.cs
-System.CodeDom/CodeGotoStatementCas.cs
-System.CodeDom/CodeGotoStatementTest.cs
-System.CodeDom/CodeIndexerExpressionCas.cs
-System.CodeDom/CodeIterationStatementCas.cs
-System.CodeDom/CodeLabeledStatementTest.cs
-System.CodeDom/CodeLinePragmaCas.cs
-System.CodeDom/CodeLinePragmaTest.cs
-System.CodeDom/CodeMemberEventCas.cs
-System.CodeDom/CodeMemberFieldCas.cs
-System.CodeDom/CodeMemberFieldTest.cs
-System.CodeDom/CodeMemberMethodCas.cs
-System.CodeDom/CodeMemberMethodTest.cs
-System.CodeDom/CodeMemberPropertyCas.cs
-System.CodeDom/CodeMemberPropertyTest.cs
-System.CodeDom/CodeMethodInvokeExpressionCas.cs
-System.CodeDom/CodeMethodInvokeExpressionTest.cs
-System.CodeDom/CodeMethodReferenceExpressionCas.cs
-System.CodeDom/CodeMethodReferenceExpressionTest.cs
-System.CodeDom/CodeMethodReturnStatementCas.cs
-System.CodeDom/CodeNamespaceCas.cs
-System.CodeDom/CodeNamespaceCollectionCas.cs
-System.CodeDom/CodeNamespaceCollectionTest.cs
-System.CodeDom/CodeNamespaceImportCas.cs
-System.CodeDom/CodeNamespaceImportCollectionCas.cs
-System.CodeDom/CodeNamespaceImportCollectionTest.cs
-System.CodeDom/CodeNamespaceImportTest.cs
-System.CodeDom/CodeNamespaceTest.cs
-System.CodeDom/CodeObjectCas.cs
-System.CodeDom/CodeObjectCreateExpressionCas.cs
-System.CodeDom/CodeObjectCreateExpressionTest.cs
-System.CodeDom/CodeParameterDeclarationExpressionCas.cs
-System.CodeDom/CodeParameterDeclarationExpressionCollectionCas.cs
-System.CodeDom/CodeParameterDeclarationExpressionCollectionTest.cs
-System.CodeDom/CodeParameterDeclarationExpressionTest.cs
-System.CodeDom/CodePrimitiveExpressionCas.cs
-System.CodeDom/CodePropertyReferenceExpressionCas.cs
-System.CodeDom/CodePropertyReferenceExpressionTest.cs
-System.CodeDom/CodePropertySetValueReferenceExpressionCas.cs
-System.CodeDom/CodeRegionDirectiveCas.cs
-System.CodeDom/CodeRegionDirectiveTest.cs
-System.CodeDom/CodeRemoveEventStatementCas.cs
-System.CodeDom/CodeRemoveEventStatementTest.cs
-System.CodeDom/CodeSnippetCompileUnitCas.cs
-System.CodeDom/CodeSnippetCompileUnitTest.cs
-System.CodeDom/CodeSnippetExpressionCas.cs
-System.CodeDom/CodeSnippetExpressionTest.cs
-System.CodeDom/CodeSnippetStatementCas.cs
-System.CodeDom/CodeSnippetStatementTest.cs
-System.CodeDom/CodeSnippetTypeMemberCas.cs
-System.CodeDom/CodeSnippetTypeMemberTest.cs
-System.CodeDom/CodeStatementCas.cs
-System.CodeDom/CodeStatementCollectionCas.cs
-System.CodeDom/CodeStatementCollectionTest.cs
-System.CodeDom/CodeThisReferenceExpressionCas.cs
-System.CodeDom/CodeThrowExceptionStatementCas.cs
-System.CodeDom/CodeTryCatchFinallyStatementCas.cs
-System.CodeDom/CodeTypeConstructorCas.cs
-System.CodeDom/CodeTypeConstructorTest.cs
-System.CodeDom/CodeTypeDeclarationCas.cs
-System.CodeDom/CodeTypeDeclarationCollectionCas.cs
-System.CodeDom/CodeTypeDeclarationCollectionTest.cs
-System.CodeDom/CodeTypeDelegateCas.cs
-System.CodeDom/CodeTypeDelegateTest.cs
-System.CodeDom/CodeTypeMemberCas.cs
-System.CodeDom/CodeTypeMemberCollectionCas.cs
-System.CodeDom/CodeTypeMemberCollectionTest.cs
-System.CodeDom/CodeTypeOfExpressionCas.cs
-System.CodeDom/CodeTypeOfExpressionTest.cs
-System.CodeDom/CodeTypeParameterCas.cs
-System.CodeDom/CodeTypeParameterCollectionTest.cs
-System.CodeDom/CodeTypeParameterTest.cs
-System.CodeDom/CodeTypeReferenceCas.cs
-System.CodeDom/CodeTypeReferenceCollectionCas.cs
-System.CodeDom/CodeTypeReferenceCollectionTest.cs
-System.CodeDom/CodeTypeReferenceExpressionCas.cs
-System.CodeDom/CodeTypeReferenceExpressionTest.cs
-System.CodeDom/CodeTypeReferenceTest.cs
-System.CodeDom/CodeVariableDeclarationStatementCas.cs
-System.CodeDom/CodeVariableDeclarationStatementTest.cs
-System.CodeDom/CodeVariableReferenceExpressionCas.cs
-System.CodeDom/CodeVariableReferenceExpressionTest.cs
-System.Configuration.Provider
-System.Configuration.Provider/ProviderBaseTest.cs
-System.Configuration/ApplicationSettingsBaseTest.cs
-System.Configuration/ConfigXmlDocumentTest.cs
-System.Configuration/ConfigurationExceptionTest.cs
-System.Configuration/LocalFileSettingsProviderTest.cs
-System.Configuration/SettingElementTest.cs
-System.Configuration/SettingsBaseTest.cs
-System.Configuration/SettingsPropertyCollectionTest.cs
-System.Configuration/SettingsPropertyTest.cs
-System.Configuration/SettingsPropertyValueCollectionTest.cs
-System.Configuration/SettingsPropertyValueTest.cs
-System.IO.Ports/SerialPortTest.cs
-System.Security.Permissions/ResourcePermissionBaseCas.cs
-System.Security.Permissions/ResourcePermissionBaseEntryCas.cs
-System.Security.Permissions/ResourcePermissionBaseEntryTest.cs
-System.Security.Permissions/ResourcePermissionBaseTest.cs
-System.Security.Permissions/StorePermissionAttributeCas.cs
-System.Security.Permissions/StorePermissionAttributeTest.cs
-System.Security.Permissions/StorePermissionCas.cs
-System.Security.Permissions/StorePermissionTest.cs
-System.Web/AspNetHostingPermissionAttributeCas.cs
-System.Web/AspNetHostingPermissionAttributeTest.cs
-System.Web/AspNetHostingPermissionCas.cs
-System.Web/AspNetHostingPermissionTest.cs
diff --git a/mcs/class/System/mobile_static_System_test.dll.sources b/mcs/class/System/mobile_static_System_test.dll.sources
deleted file mode 100644 (file)
index 3944a95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include System_test.dll.sources
index 1aea9da1bae9b52a8514c1dc3898cce4ac1c6362..799115c396c4896a3c985f41a1b19cd1b25d69ea 100644 (file)
@@ -1,4 +1,4 @@
-#include mobile_static_System_test.dll.exclude.sources
+#include aot_only_System_test.dll.exclude.sources
 #include monodroid_System_test.dll.new-exclude.sources
 Microsoft.Win32/IntranetZoneCredentialPolicyCas.cs
 Microsoft.Win32/IntranetZoneCredentialPolicyTest.cs
index a9108dde96aa1e3d5d224acc2a4d2e0c306b79aa..5068573588bf37fbae47f404c76a329d2ecdbf72 100644 (file)
@@ -1,5 +1,5 @@
 #include mobile_System.dll.sources
-MonoTouch/MonoPInvokeCallbackAttribute.cs
+Mono.Util/MonoPInvokeCallbackAttribute.cs
 Assembly/AssemblyInfoEx.cs
 Mono.Net.Security/MonoTlsProviderFactory.Apple.cs
 ../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.Apple.cs
index 882a3cf0419bbb6d8ac57d67550e4e3a1b7e40a0..8f7127307dc96489b5ddb879240c3aec7f7258b6 100644 (file)
@@ -41,7 +41,7 @@ ifndef MOBILE_PROFILE
 REFERENCE_SOURCES_FLAGS += -d:FEATURE_MACL
 endif
 
-ifndef MOBILE_STATIC
+ifndef AOT_FRIENDLY_PROFILE
 REFERENCE_SOURCES_FLAGS += -d:FEATURE_REMOTING,MONO_COM,FEATURE_COMINTEROP,FEATURE_ROLE_BASED_SECURITY
 endif
 
@@ -66,7 +66,7 @@ DEFAULT_REFERENCES =
 
 TEST_LIB_REFS = System.Core System
 
-ifndef MOBILE_STATIC
+ifndef AOT_FRIENDLY_PROFILE
 ifneq ($(PROFILE),aot_hybrid)
 TEST_LIB_REFS += Mono.Posix
 endif
index 9ae2a61b75ad539b714e6c40a1042d8c1f02c56b..a54c6b97d9c2841965c8d3385b293724b1585213 100755 (executable)
@@ -196,7 +196,7 @@ namespace System.Security.Cryptography {
                                name = "System.Security.Cryptography.X509Certificates.X509Chain, System";
                                break;
                        case "aes":
-#if MOBILE_STATIC
+#if AOT_ONLY_DESKTOP
                                name = "System.Security.Cryptography.AesCryptoServiceProvider, System.Core";
 #else
                                name = "System.Security.Cryptography.AesManaged, System.Core";
index b64e180f7e06aec98191dc6729acd83db8a48dae..89de2ee74622a44231d1367c0d945215bb234044 100644 (file)
@@ -152,7 +152,7 @@ namespace System
 #if !MONODROID && !MONOTOUCH && !XAMMAC
                static TimeZoneInfo CreateLocal ()
                {
-#if !MOBILE_STATIC
+#if !AOT_ONLY_DESKTOP
                        if (IsWindows && LocalZoneKey != null) {
                                string name = (string)LocalZoneKey.GetValue ("TimeZoneKeyName");
                                if (name == null)
@@ -204,7 +204,7 @@ namespace System
 
                static void GetSystemTimeZonesCore (List<TimeZoneInfo> systemTimeZones)
                {
-#if !MOBILE_STATIC
+#if !AOT_ONLY_DESKTOP
                        if (TimeZoneKey != null) {
                                foreach (string id in TimeZoneKey.GetSubKeyNames ()) {
                                        try {
@@ -273,7 +273,7 @@ namespace System
 #endif
                private AdjustmentRule [] adjustmentRules;
 
-#if !MOBILE || !MOBILE_STATIC
+#if !MOBILE || !AOT_ONLY_DESKTOP
                /// <summary>
                /// Determine whether windows of not (taken Stephane Delcroix's code)
                /// </summary>
@@ -301,7 +301,7 @@ namespace System
                        return str.Substring (Istart, Iend-Istart+1);
                }
                
-#if !MOBILE_STATIC
+#if !AOT_ONLY_DESKTOP
                static RegistryKey timeZoneKey;
                static RegistryKey TimeZoneKey {
                        get {
@@ -330,7 +330,7 @@ namespace System
                        }
                }
 #endif
-#endif // !MOBILE || !MOBILE_STATIC
+#endif // !MOBILE || !AOT_ONLY_DESKTOP
 
                private static bool TryAddTicks (DateTime date, long ticks, out DateTime result, DateTimeKind kind = DateTimeKind.Unspecified)
                {
index 2e7e6066af533f349baeb1462d36c468c53ac937..af6c4d8cae77842423ed80dabcb76edd36bb2c5a 100644 (file)
@@ -255,7 +255,7 @@ namespace System
 #else
 namespace System
 {
-       // this is a shim class so we can AOT during mobile_static build without --enable-minimal=com
+       // this is a shim class so we can AOT during aot_only build without --enable-minimal=com
        internal class __ComObject
        {
                __ComObject ()
index 77e8e6df1af0781585f61c68d749dd7af3f99990..2c3ca308fa82691c8191a9ffdbddbab14f695bfa 100644 (file)
@@ -5,7 +5,7 @@
 // (C) 2004 Ximian, Inc. http://www.ximian.com
 //
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 
 using System;
 using System.Threading;
index e82d81fba6185798f6112b86a0afa64a57a67b96..be26d45553bdfab830513671791cda189ca5f16f 100644 (file)
@@ -37,7 +37,7 @@ using System.Configuration.Assemblies;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Threading;
@@ -213,7 +213,7 @@ namespace MonoTests.System.Reflection
 #endif
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC // Reflection.Emit is not supported.
+#if !MONOTOUCH && !FULL_AOT_RUNTIME // Reflection.Emit is not supported.
                [Test]
                [Category("AndroidNotWorking")] // Missing Mono.CompilerServices.SymbolWriter
                public void GetModules_MissingFile ()
@@ -265,7 +265,7 @@ namespace MonoTests.System.Reflection
                public void Corlib_test ()
                {
                        Assembly corlib_test = Assembly.GetExecutingAssembly ();
-#if MONODROID || MOBILE_STATIC || __WATCHOS__
+#if MONODROID || AOT_ONLY_DESKTOP || __WATCHOS__
                        Assert.IsNull (corlib_test.EntryPoint, "EntryPoint");
                        Assert.IsNull (corlib_test.Evidence, "Evidence");
 #elif MOBILE
@@ -474,8 +474,8 @@ namespace MonoTests.System.Reflection
 // with the semantics of aot'ed assembly loading, as
 // aot may assert when loading. This assumes that it's
 // safe to greedly load everything.
-#if MOBILE_STATIC
-                       string [] names = { "mobile_static_corlib_test" };
+#if AOT_ONLY_DESKTOP
+                       string [] names = { "aot_only_corlib_test" };
 #else
                        string [] names = { "corlib_test_net_1_1", "corlib_test_net_2_0", "corlib_test_net_4_0", "corlib_test_net_4_5", "net_4_x_corlib_test", "corlib_plattest", "mscorlibtests", "BclTests" };
 #endif
@@ -523,7 +523,7 @@ namespace MonoTests.System.Reflection
                        }
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC // Reflection.Emit is not supported.
+#if !MONOTOUCH && !FULL_AOT_RUNTIME // Reflection.Emit is not supported.
                [Test]
                public void Location_Empty() {
                        string assemblyFileName = Path.Combine (
@@ -1146,7 +1146,7 @@ namespace MonoTests.System.Reflection
 
                        Assert.AreEqual ("MonoModule", module.GetType ().Name, "#2");
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                        Assert.AreEqual ("mscorlib.dll", module.Name, "#3");
 #endif
                        Assert.IsFalse (module.IsResource (), "#4");
index f06debd8ebb10f7b402d89f6358e4b87db4b2948..e3ed4958882e4e5fe3754a5e6b4ffbc20917f4cf 100644 (file)
@@ -31,7 +31,7 @@
 using System;
 using System.Threading;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
index 53617c4e70fc84763fcc222de7462284393334b4..0fbc27d11b449808c84742888593ae4ec371f774 100644 (file)
@@ -33,7 +33,7 @@ using NUnit.Framework;
 using System;
 using System.Threading;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
@@ -54,7 +54,7 @@ namespace MonoTests.System.Reflection
        [TestFixture]
        public class MethodInfoTest
        {
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                // use an existing symbol - so we can build without dlsym. It does not matter that the signature does not match for the test
                [DllImport ("libc", EntryPoint="readlink", CharSet=CharSet.Unicode, ExactSpelling=false, PreserveSig=true, SetLastError=true, BestFitMapping=true, ThrowOnUnmappableChar=true)]
 #else
@@ -115,7 +115,7 @@ namespace MonoTests.System.Reflection
                        DllImportAttribute attr = (DllImportAttribute)((t.GetMethod ("dllImportMethod").GetCustomAttributes (typeof (DllImportAttribute), true)) [0]);
 
                        Assert.AreEqual (CallingConvention.Winapi, attr.CallingConvention, "#1");
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                        Assert.AreEqual ("readlink", attr.EntryPoint, "#2");
                        Assert.AreEqual ("libc", attr.Value, "#3");
 #else
@@ -397,7 +397,7 @@ namespace MonoTests.System.Reflection
                [Test]
                public void GetMethodBody ()
                {
-#if (MONOTOUCH || MOBILE_STATIC) && !DEBUG
+#if (MONOTOUCH || FULL_AOT_RUNTIME) && !DEBUG
                        Assert.Ignore ("Release app (on devices) are stripped of (managed) IL so this test would fail");
 #endif
                        MethodBody mb = typeof (MethodInfoTest).GetMethod ("locals_method").GetMethodBody ();
@@ -600,7 +600,7 @@ namespace MonoTests.System.Reflection
                        } catch (InvalidOperationException ex) {
                        }
                }
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                public TFoo SimpleGenericMethod2<TFoo, TBar> () { return default (TFoo); }
                /*Test for the uggly broken behavior of SRE.*/
                [Test]
@@ -854,7 +854,7 @@ namespace MonoTests.System.Reflection
 
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                class GenericClass<T>
                {
                        public void Method ()
index d40ff368bc2c5faf56451a4e83e2f434a8ea49fd..dd4e8f1bc16035790c258abf95bf9c205549d77f 100644 (file)
@@ -10,7 +10,7 @@
 using System;
 using System.Threading;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.Serialization;
@@ -106,7 +106,7 @@ public class ModuleTest
        }
 
        // Some of these tests overlap with the tests for ModuleBuilder
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
        [Test]
        [Category("NotDotNet")] // path length can cause suprious failures
        public void TestGlobalData () {
@@ -341,7 +341,7 @@ public class ModuleTest
                Module m = typeof (ModuleTest).Module;
                m.GetObjectData (null, new StreamingContext (StreamingContextStates.All));
        }
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
        [Test]
        [Category ("AndroidNotWorking")] // Mono.CompilerServices.SymbolWriter not available for Xamarin.Android
        public void GetTypes ()
index c6451207442ccb028504d0bdd2655942b5f15b61..7d26e3fd1f834494b01758397c03229fd738a40a 100644 (file)
@@ -7,7 +7,7 @@
 // Copyright 2011 Xamarin Inc (http://www.xamarin.com).
 //
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 
 using System;
 using System.Collections;
index 4c4388ec8b3e17bb2eef08f784b9d42e2f934610..5163fef438bcabd1642a5d4329139f5516a76602 100644 (file)
@@ -31,7 +31,7 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.IO;
@@ -355,7 +355,7 @@ namespace MonoTests.System.Reflection
                                get { return 99; }
                        }
                }
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void ConstantValue () {
                        /*This test looks scary because we can't generate a default value with C# */
index 6c6cb45a406ad8c3fe19201dcbff9d5a0b7993b9..41e86cb4f7eb60eed8c3bb5c234be1d274810982 100644 (file)
@@ -28,7 +28,7 @@
 using System;
 using System.Threading;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 
index fcf64a19300be7cf053bc14326e92f5a649c3d06..0a869918be80bb8d5d72e00012a94762d817e861 100644 (file)
@@ -24,7 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 
 using System;
 using System.Linq;
index 42abe682ac8f368cad3cc1accbd8fbbbe457e978..93187d1fd6eeb70cba245d17de215f18039fa95f 100644 (file)
@@ -38,7 +38,7 @@ namespace MonoTests.System.Runtime.CompilerServices
        [TestFixture]
        public class AsyncTaskMethodBuilderTest
        {
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                // For some reason MT excludes CallContext handling
 
                [Test]
index 1c7cb95ad325bdb1751c71ac40687a0ccc856533..8e12e81fd2b471803e4756ddbeeab44aa80628b0 100644 (file)
@@ -128,7 +128,7 @@ namespace MonoTests.System.Runtime.InteropServices
                                gch.Free ();
                        }
                }
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                [Category("MobileNotWorking")] // SIGSEGV, probably on AppDomain.Unload
                public void WeakHandleWorksOnNonRootDomain ()
index 51f1797a2b814a7dc77ce0fbb4574cdc0ddf91c8..706b8f1a5262ce278e4a738cd0d54d4cf7bc8011 100644 (file)
@@ -869,7 +869,7 @@ namespace MonoTests.System.Runtime.InteropServices
                );
 #endif
 
-#if !MOBILE_STATIC
+#if !FULL_AOT_RUNTIME
                [StructLayout( LayoutKind.Sequential, Pack = 1 )]
                public class FourByteStruct
                {
index 55e95b91231dc764e57ab493e1979a6b04ba5cb8..189b8ab0fc2fca13641dd108ae079b7d9fc92120 100644 (file)
@@ -43,7 +43,7 @@ namespace MonoTests.System.Runtime.Serialization
                }
 #endif
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void DelegateSerializationTest ()
                {
index e93744c0fd8f7044cb32b6e3b8deb537bd44b4db..148cad2367a1a82293abc73394e898a03424c7d2 100644 (file)
@@ -44,7 +44,7 @@ namespace MonoTests.System.Security.Cryptography {
 
                [Test]
                [Category ("AndroidNotWorking")] // Exception is thrown: CryptographicException : Bad PKCS7 padding. Invalid length 236.
-               [Category ("MobileNotWorking")] // On mobile_static, above exception is thrown as well
+               [Category ("MobileNotWorking")] // On aot_only, above exception is thrown as well
                public void Roundtrip ()
                {
                        // that will return a AesCryptoServiceProvider
index 74661fd6f7e17468e569737fd45c54cf0417281a..a7959bc6efcd223aeaa8bfadecd18438143b3560 100644 (file)
@@ -13,7 +13,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
@@ -311,7 +311,7 @@ namespace MonoTests.System {
                        Assert.AreEqual (7, objCOMTest.Id, "#A05");
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                [ExpectedException (typeof (MissingMethodException))]
                public void CreateInstance_TypeBuilder ()
@@ -513,7 +513,7 @@ namespace MonoTests.System {
                                                  null, null);
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void CreateInstanceCustomDomain ()
                {
index dd66b8c7a2c2868e3b8b9441626c7e7c397f0f85..11b32e6c7b2c90dc95ed36459b840f7e9f59e0f1 100644 (file)
@@ -12,7 +12,7 @@
 
 using System;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
@@ -846,7 +846,7 @@ namespace MonoTests.System
                        Assert.IsTrue (custom [2].GetType () == typeof (SerializableAttribute));
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void GetCustomAttributeOnNewSreTypes ()
                {
index ba664353ab9e0056492a1ae525057969609af25e..d6960de0590ba24c73b4b2e93817fb685d715bc0 100644 (file)
@@ -5,7 +5,7 @@
 
 using System;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Threading;
@@ -26,7 +26,7 @@ namespace MonoTests.System
 
 
                [Test] //See bug #372406
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #10539
 #endif
                public void CreateDelegate1_Method_Private_Instance ()
@@ -64,7 +64,7 @@ namespace MonoTests.System
                }
 
                [Test] // CreateDelegate (Type, MethodInfo)
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #14163
 #endif
                public void CreateDelegate1_Method_Instance ()
@@ -925,7 +925,7 @@ namespace MonoTests.System
                }
 
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #10539
 #endif
                public void Virtual ()
@@ -956,7 +956,7 @@ namespace MonoTests.System
                }
 
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #14163
 #endif
                public void NullTarget_Instance ()
@@ -1021,7 +1021,7 @@ namespace MonoTests.System
                }
 
                [Test] // #617161
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #10539
 #endif
                public void ClosedOverNullReferenceStaticMethod ()
@@ -1045,7 +1045,7 @@ namespace MonoTests.System
                }
 
                [Test] // #475962
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")] // #10539
 #endif
                public void ClosedOverNullReferenceInstanceMethod ()
@@ -1079,7 +1079,7 @@ namespace MonoTests.System
 
                delegate int ByRefDelegate (ref FooStruct s, int a, int b, int c, int d);
 
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [Category ("NotWorking")]
 #endif
                [Test]
@@ -1279,7 +1279,7 @@ namespace MonoTests.System
                {
                        string retarg (string s);
                }
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void CreateDelegateWithLdFtnAndAbstractMethod ()
                {
@@ -1388,7 +1388,7 @@ namespace MonoTests.System
                        Assert.IsTrue (d (0, 0));
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                public static void DynInvokeWithClosedFirstArg (object a, object b)
                {
                }
index 4ea4f283bce97cc8e8add2ab8e81dd1891542daf..4676c8551e8f574d360c72f125a7dee0aa0b122b 100644 (file)
@@ -16,7 +16,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
 using System.Reflection.Emit;
 #endif
 using System.Runtime.InteropServices;
@@ -261,7 +261,7 @@ namespace MonoTests.System
        [TestFixture]
        public class TypeTest
        {
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                private ModuleBuilder module;
 #endif
                const string ASSEMBLY_NAME = "MonoTests.System.TypeTest";
@@ -273,7 +273,7 @@ namespace MonoTests.System
                {
                        AssemblyName assemblyName = new AssemblyName ();
                        assemblyName.Name = ASSEMBLY_NAME;
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                        var assembly = AppDomain.CurrentDomain.DefineDynamicAssembly (
                                        assemblyName, AssemblyBuilderAccess.RunAndSave, Path.GetTempPath ());
                        module = assembly.DefineDynamicModule ("module1");
@@ -3157,7 +3157,7 @@ namespace MonoTests.System
                }
 
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [ExpectedException (typeof (NotSupportedException))]
 #endif
                public void MakeGenericType_UserDefinedType ()
@@ -3174,7 +3174,7 @@ namespace MonoTests.System
                }
 
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [ExpectedException (typeof (NotSupportedException))]
 #endif
                public void MakeGenericType_NestedUserDefinedType ()
@@ -3191,7 +3191,7 @@ namespace MonoTests.System
                }
                
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [ExpectedException (typeof (NotSupportedException))]
 #endif
                public void TestMakeGenericType_UserDefinedType_DotNet20SP1 () 
@@ -3204,7 +3204,7 @@ namespace MonoTests.System
                }
                
                [Test]
-#if MONOTOUCH || MOBILE_STATIC
+#if MONOTOUCH || FULL_AOT_RUNTIME
                [ExpectedException (typeof (NotSupportedException))]
 #endif
                public void MakeGenericType_BadUserType ()
@@ -3340,7 +3340,7 @@ namespace MonoTests.System
                        Assert.AreEqual (t1, t2);
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void SpaceAfterComma () {
                        string strType = "System.Collections.Generic.Dictionary`2[[System.Int32,mscorlib], [System.String,mscorlib]],mscorlib";
@@ -3348,7 +3348,7 @@ namespace MonoTests.System
                }
 #endif
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                public void Bug506757 ()
                {
@@ -4289,7 +4289,7 @@ namespace MonoTests.System
 
                }
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MONOTOUCH && !FULL_AOT_RUNTIME
                [Test]
                [Category ("AndroidNotWorking")] // requires symbol writer
                public void FullNameGetTypeParseEscapeRoundtrip () // bug #26384
diff --git a/mcs/class/corlib/aot_only_corlib_test.dll.exclude.sources b/mcs/class/corlib/aot_only_corlib_test.dll.exclude.sources
new file mode 100644 (file)
index 0000000..eb17a10
--- /dev/null
@@ -0,0 +1,131 @@
+Microsoft.Win32/RegistryKeyTest.cs
+System.Diagnostics.Contracts/ContractAssertTest.cs
+System.Diagnostics.Contracts/ContractAssumeTest.cs
+System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
+System.Diagnostics.Contracts/ContractHelperTest.cs
+System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs
+System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
+System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs
+System.Diagnostics.Contracts/Helpers/TestContractBase.cs
+System.Reflection.Emit/AssemblyBuilderAccessTest.cs
+System.Reflection.Emit/AssemblyBuilderTest.cs
+System.Reflection.Emit/ConstructorBuilderTest.cs
+System.Reflection.Emit/ConstructorOnTypeBuilderInstTest.cs
+System.Reflection.Emit/CustomAttributeBuilderTest.cs
+System.Reflection.Emit/DerivedTypesTest.cs
+System.Reflection.Emit/DynamicILInfoTest.cs
+System.Reflection.Emit/DynamicMethodTest.cs
+System.Reflection.Emit/EnumBuilderTest.cs
+System.Reflection.Emit/EventBuilderTest.cs
+System.Reflection.Emit/FieldBuilderTest.cs
+System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
+System.Reflection.Emit/ILGeneratorTest.cs
+System.Reflection.Emit/MethodBuilderTest.cs
+System.Reflection.Emit/MethodBuilderTestIL.cs
+System.Reflection.Emit/MethodOnTypeBuilderInstTest.cs
+System.Reflection.Emit/MethodRentalCas.cs
+System.Reflection.Emit/MethodRentalTest.cs
+System.Reflection.Emit/ModuleBuilderTest.cs
+System.Reflection.Emit/ParameterBuilderTest.cs
+System.Reflection.Emit/PropertyBuilderTest.cs
+System.Reflection.Emit/SignatureHelperTest.cs
+System.Reflection.Emit/TypeBuilderTest.cs
+System.Runtime.Remoting/ContextTest.cs
+System.Runtime.Remoting/RemotingConfigurationTest.cs
+System.Runtime.Remoting/RemotingServicesTest.cs
+System.Runtime.Remoting/SoapServicesTest.cs
+System.Runtime.Remoting/SynchronizationAttributeTest.cs
+System.Runtime.Remoting.Channels/ChannelServicesTest.cs
+System.Runtime.Remoting.Contexts/SynchronizationAttributeTest.cs
+System.Runtime.Remoting.Messaging/CallContextTest.cs
+System.Runtime.Remoting.Metadata.W3cXsd2001/SoapHexBinaryTest.cs
+System.Security.AccessControl/AuthorizationRuleTest.cs
+System.Security.AccessControl/CommonAceTest.cs
+System.Security.AccessControl/CommonAclTest.cs
+System.Security.AccessControl/CommonObjectSecurityTest.cs
+System.Security.AccessControl/CommonSecurityDescriptorTest.cs
+System.Security.AccessControl/CryptoKeyAccessRuleTest.cs
+System.Security.AccessControl/DirectoryObjectSecurityTest.cs
+System.Security.AccessControl/DirectorySecurityTest.cs
+System.Security.AccessControl/DiscretionaryAclTest.cs
+System.Security.AccessControl/EventWaitHandleSecurityTest.cs
+System.Security.AccessControl/FileSecurityTest.cs
+System.Security.AccessControl/MutexAccessRuleTest.cs
+System.Security.AccessControl/MutexSecurityTest.cs
+System.Security.AccessControl/ObjectAceTest.cs
+System.Security.AccessControl/ObjectSecurity_TTest.cs
+System.Security.AccessControl/ObjectSecurityTest.cs
+System.Security.AccessControl/RawAclTest.cs
+System.Security.AccessControl/RawSecurityDescriptorTest.cs
+System.Security.AccessControl/RegistrySecurityTest.cs
+System.Security.AccessControl/SystemAclTest.cs
+System.Security.Permissions/CodeAccessSecurityAttributeTest.cs
+System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
+System.Security.Permissions/EnvironmentPermissionTest.cs
+System.Security.Permissions/FileDialogPermissionAttributeTest.cs
+System.Security.Permissions/FileDialogPermissionTest.cs
+System.Security.Permissions/FileIOPermissionAttributeTest.cs
+System.Security.Permissions/FileIOPermissionTest.cs
+System.Security.Permissions/GacIdentityPermissionAttributeTest.cs
+System.Security.Permissions/GacIdentityPermissionTest.cs
+System.Security.Permissions/HostProtectionAttributeTest.cs
+System.Security.Permissions/IBuiltInPermissionTest.cs
+System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs
+System.Security.Permissions/IsolatedStorageFilePermissionTest.cs
+System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs
+System.Security.Permissions/KeyContainerPermissionAttributeTest.cs
+System.Security.Permissions/PermissionSetAttributeTest.cs
+System.Security.Permissions/PrincipalPermissionAttributeTest.cs
+System.Security.Permissions/PrincipalPermissionTest.cs
+System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs
+System.Security.Permissions/PublisherIdentityPermissionTest.cs
+System.Security.Permissions/ReflectionPermissionAttributeTest.cs
+System.Security.Permissions/ReflectionPermissionTest.cs
+System.Security.Permissions/RegistryPermissionAttributeTest.cs
+System.Security.Permissions/RegistryPermissionTest.cs
+System.Security.Permissions/SecurityAttributeTest.cs
+System.Security.Permissions/SecurityPermissionAttributeTest.cs
+System.Security.Permissions/SecurityPermissionTest.cs
+System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs
+System.Security.Permissions/SiteIdentityPermissionTest.cs
+System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs
+System.Security.Permissions/StrongNameIdentityPermissionTest.cs
+System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
+System.Security.Permissions/UIPermissionAttributeTest.cs
+System.Security.Permissions/UIPermissionTest.cs
+System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs
+System.Security.Permissions/UrlIdentityPermissionTest.cs
+System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs
+System.Security.Permissions/ZoneIdentityPermissionTest.cs
+System.Security.Policy/AllMembershipConditionTest.cs
+System.Security.Policy/ApplicationDirectoryMembershipConditionTest.cs
+System.Security.Policy/ApplicationDirectoryTest.cs
+System.Security.Policy/ApplicationMembershipConditionTest.cs
+System.Security.Policy/ApplicationSecurityManagerCas.cs
+System.Security.Policy/ApplicationSecurityManagerTest.cs
+System.Security.Policy/ApplicationTrustTest.cs
+System.Security.Policy/CodeGroupTest.cs
+System.Security.Policy/DomainApplicationMembershipConditionTest.cs
+System.Security.Policy/EvidenceTest.cs
+System.Security.Policy/FileCodeGroupTest.cs
+System.Security.Policy/FirstMatchCodeGroupTest.cs
+System.Security.Policy/GacMembershipConditionTest.cs
+System.Security.Policy/GacTest.cs
+System.Security.Policy/HashMembershipConditionTest.cs
+System.Security.Policy/HashTest.cs
+System.Security.Policy/IBuiltInEvidenceTest.cs
+System.Security.Policy/NetCodeGroupTest.cs
+System.Security.Policy/PermissionRequestEvidenceTest.cs
+System.Security.Policy/PolicyLevelTest.cs
+System.Security.Policy/PolicyStatementTest.cs
+System.Security.Policy/PublisherMembershipConditionTest.cs
+System.Security.Policy/PublisherTest.cs
+System.Security.Policy/SiteMembershipConditionTest.cs
+System.Security.Policy/SiteTest.cs
+System.Security.Policy/StrongNameMembershipConditionTest.cs
+System.Security.Policy/StrongNameTest.cs
+System.Security.Policy/UnionCodeGroupTest.cs
+System.Security.Policy/UrlMembershipConditionTest.cs
+System.Security.Policy/UrlTest.cs
+System.Security.Policy/ZoneMembershipConditionTest.cs
+System.Security.Policy/ZoneTest.cs
diff --git a/mcs/class/corlib/aot_only_corlib_test.dll.sources b/mcs/class/corlib/aot_only_corlib_test.dll.sources
new file mode 100644 (file)
index 0000000..011effe
--- /dev/null
@@ -0,0 +1 @@
+#include corlib_test.dll.sources
diff --git a/mcs/class/corlib/mobile_static_corlib_test.dll.exclude.sources b/mcs/class/corlib/mobile_static_corlib_test.dll.exclude.sources
deleted file mode 100644 (file)
index eb17a10..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-Microsoft.Win32/RegistryKeyTest.cs
-System.Diagnostics.Contracts/ContractAssertTest.cs
-System.Diagnostics.Contracts/ContractAssumeTest.cs
-System.Diagnostics.Contracts/ContractCollectionMethodsTest.cs
-System.Diagnostics.Contracts/ContractHelperTest.cs
-System.Diagnostics.Contracts/ContractMarkerMethodsTest.cs
-System.Diagnostics.Contracts/ContractMustUseRewriterTest.cs
-System.Diagnostics.Contracts/Helpers/RunAgainstReferenceAttribute.cs
-System.Diagnostics.Contracts/Helpers/TestContractBase.cs
-System.Reflection.Emit/AssemblyBuilderAccessTest.cs
-System.Reflection.Emit/AssemblyBuilderTest.cs
-System.Reflection.Emit/ConstructorBuilderTest.cs
-System.Reflection.Emit/ConstructorOnTypeBuilderInstTest.cs
-System.Reflection.Emit/CustomAttributeBuilderTest.cs
-System.Reflection.Emit/DerivedTypesTest.cs
-System.Reflection.Emit/DynamicILInfoTest.cs
-System.Reflection.Emit/DynamicMethodTest.cs
-System.Reflection.Emit/EnumBuilderTest.cs
-System.Reflection.Emit/EventBuilderTest.cs
-System.Reflection.Emit/FieldBuilderTest.cs
-System.Reflection.Emit/GenericTypeParameterBuilderTest.cs
-System.Reflection.Emit/ILGeneratorTest.cs
-System.Reflection.Emit/MethodBuilderTest.cs
-System.Reflection.Emit/MethodBuilderTestIL.cs
-System.Reflection.Emit/MethodOnTypeBuilderInstTest.cs
-System.Reflection.Emit/MethodRentalCas.cs
-System.Reflection.Emit/MethodRentalTest.cs
-System.Reflection.Emit/ModuleBuilderTest.cs
-System.Reflection.Emit/ParameterBuilderTest.cs
-System.Reflection.Emit/PropertyBuilderTest.cs
-System.Reflection.Emit/SignatureHelperTest.cs
-System.Reflection.Emit/TypeBuilderTest.cs
-System.Runtime.Remoting/ContextTest.cs
-System.Runtime.Remoting/RemotingConfigurationTest.cs
-System.Runtime.Remoting/RemotingServicesTest.cs
-System.Runtime.Remoting/SoapServicesTest.cs
-System.Runtime.Remoting/SynchronizationAttributeTest.cs
-System.Runtime.Remoting.Channels/ChannelServicesTest.cs
-System.Runtime.Remoting.Contexts/SynchronizationAttributeTest.cs
-System.Runtime.Remoting.Messaging/CallContextTest.cs
-System.Runtime.Remoting.Metadata.W3cXsd2001/SoapHexBinaryTest.cs
-System.Security.AccessControl/AuthorizationRuleTest.cs
-System.Security.AccessControl/CommonAceTest.cs
-System.Security.AccessControl/CommonAclTest.cs
-System.Security.AccessControl/CommonObjectSecurityTest.cs
-System.Security.AccessControl/CommonSecurityDescriptorTest.cs
-System.Security.AccessControl/CryptoKeyAccessRuleTest.cs
-System.Security.AccessControl/DirectoryObjectSecurityTest.cs
-System.Security.AccessControl/DirectorySecurityTest.cs
-System.Security.AccessControl/DiscretionaryAclTest.cs
-System.Security.AccessControl/EventWaitHandleSecurityTest.cs
-System.Security.AccessControl/FileSecurityTest.cs
-System.Security.AccessControl/MutexAccessRuleTest.cs
-System.Security.AccessControl/MutexSecurityTest.cs
-System.Security.AccessControl/ObjectAceTest.cs
-System.Security.AccessControl/ObjectSecurity_TTest.cs
-System.Security.AccessControl/ObjectSecurityTest.cs
-System.Security.AccessControl/RawAclTest.cs
-System.Security.AccessControl/RawSecurityDescriptorTest.cs
-System.Security.AccessControl/RegistrySecurityTest.cs
-System.Security.AccessControl/SystemAclTest.cs
-System.Security.Permissions/CodeAccessSecurityAttributeTest.cs
-System.Security.Permissions/EnvironmentPermissionAttributeTest.cs
-System.Security.Permissions/EnvironmentPermissionTest.cs
-System.Security.Permissions/FileDialogPermissionAttributeTest.cs
-System.Security.Permissions/FileDialogPermissionTest.cs
-System.Security.Permissions/FileIOPermissionAttributeTest.cs
-System.Security.Permissions/FileIOPermissionTest.cs
-System.Security.Permissions/GacIdentityPermissionAttributeTest.cs
-System.Security.Permissions/GacIdentityPermissionTest.cs
-System.Security.Permissions/HostProtectionAttributeTest.cs
-System.Security.Permissions/IBuiltInPermissionTest.cs
-System.Security.Permissions/IsolatedStorageFilePermissionAttributeTest.cs
-System.Security.Permissions/IsolatedStorageFilePermissionTest.cs
-System.Security.Permissions/IsolatedStoragePermissionAttributeTest.cs
-System.Security.Permissions/KeyContainerPermissionAttributeTest.cs
-System.Security.Permissions/PermissionSetAttributeTest.cs
-System.Security.Permissions/PrincipalPermissionAttributeTest.cs
-System.Security.Permissions/PrincipalPermissionTest.cs
-System.Security.Permissions/PublisherIdentityPermissionAttributeTest.cs
-System.Security.Permissions/PublisherIdentityPermissionTest.cs
-System.Security.Permissions/ReflectionPermissionAttributeTest.cs
-System.Security.Permissions/ReflectionPermissionTest.cs
-System.Security.Permissions/RegistryPermissionAttributeTest.cs
-System.Security.Permissions/RegistryPermissionTest.cs
-System.Security.Permissions/SecurityAttributeTest.cs
-System.Security.Permissions/SecurityPermissionAttributeTest.cs
-System.Security.Permissions/SecurityPermissionTest.cs
-System.Security.Permissions/SiteIdentityPermissionAttributeTest.cs
-System.Security.Permissions/SiteIdentityPermissionTest.cs
-System.Security.Permissions/StrongNameIdentityPermissionAttributeTest.cs
-System.Security.Permissions/StrongNameIdentityPermissionTest.cs
-System.Security.Permissions/StrongNamePublicKeyBlobTest.cs
-System.Security.Permissions/UIPermissionAttributeTest.cs
-System.Security.Permissions/UIPermissionTest.cs
-System.Security.Permissions/UrlIdentityPermissionAttributeTest.cs
-System.Security.Permissions/UrlIdentityPermissionTest.cs
-System.Security.Permissions/ZoneIdentityPermissionAttributeTest.cs
-System.Security.Permissions/ZoneIdentityPermissionTest.cs
-System.Security.Policy/AllMembershipConditionTest.cs
-System.Security.Policy/ApplicationDirectoryMembershipConditionTest.cs
-System.Security.Policy/ApplicationDirectoryTest.cs
-System.Security.Policy/ApplicationMembershipConditionTest.cs
-System.Security.Policy/ApplicationSecurityManagerCas.cs
-System.Security.Policy/ApplicationSecurityManagerTest.cs
-System.Security.Policy/ApplicationTrustTest.cs
-System.Security.Policy/CodeGroupTest.cs
-System.Security.Policy/DomainApplicationMembershipConditionTest.cs
-System.Security.Policy/EvidenceTest.cs
-System.Security.Policy/FileCodeGroupTest.cs
-System.Security.Policy/FirstMatchCodeGroupTest.cs
-System.Security.Policy/GacMembershipConditionTest.cs
-System.Security.Policy/GacTest.cs
-System.Security.Policy/HashMembershipConditionTest.cs
-System.Security.Policy/HashTest.cs
-System.Security.Policy/IBuiltInEvidenceTest.cs
-System.Security.Policy/NetCodeGroupTest.cs
-System.Security.Policy/PermissionRequestEvidenceTest.cs
-System.Security.Policy/PolicyLevelTest.cs
-System.Security.Policy/PolicyStatementTest.cs
-System.Security.Policy/PublisherMembershipConditionTest.cs
-System.Security.Policy/PublisherTest.cs
-System.Security.Policy/SiteMembershipConditionTest.cs
-System.Security.Policy/SiteTest.cs
-System.Security.Policy/StrongNameMembershipConditionTest.cs
-System.Security.Policy/StrongNameTest.cs
-System.Security.Policy/UnionCodeGroupTest.cs
-System.Security.Policy/UrlMembershipConditionTest.cs
-System.Security.Policy/UrlTest.cs
-System.Security.Policy/ZoneMembershipConditionTest.cs
-System.Security.Policy/ZoneTest.cs
diff --git a/mcs/class/corlib/mobile_static_corlib_test.dll.sources b/mcs/class/corlib/mobile_static_corlib_test.dll.sources
deleted file mode 100644 (file)
index 011effe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include corlib_test.dll.sources
index bba551cc940b77fbfda4a2d822842b3630def3cd..8ca5c5c750ed640e8a3964c28a2889dc04a2e9a2 100755 (executable)
@@ -492,7 +492,7 @@ test_sources =                      \
 
 regtests_UNIVERSAL=basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe basic-vectors.exe
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 regtests= \
        $(regtests_UNIVERSAL)
 
@@ -504,7 +504,7 @@ endif
 else
 regtests= \
        $(regtests_UNIVERSAL) \
-       $(regtests_MOBILE_STATIC_BLACKLIST)
+       $(regtests_AOT_ONLY_BLACKLIST)
 endif
 
 if X86
@@ -747,9 +747,9 @@ gsharedvtcheck:
 fullaot_regtests = $(regtests) aot-tests.exe $(if $(GSHAREDVT),gshared.exe)
 
 # Skip aoting the tests that aren't compiled 
-# on the mobile_static profile because they're skipped
+# on the aot_only profile because they're skipped
 # on mobile profiles
-FULLAOT_LIBS_MOBILE_STATIC_BLACKLIST = \
+FULLAOT_LIBS_AOT_ONLY_BLACKLIST = \
        Mono.Posix.dll \
        System.Configuration.dll
 
@@ -762,14 +762,14 @@ FULLAOT_LIBS_UNIVERSAL = \
        Mono.Simd.dll \
        Mono.Security.dll
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 FULLAOT_LIBS= \
        Mono.Dynamic.Interpreter.dll \
        $(FULLAOT_LIBS_UNIVERSAL)
 else
 FULLAOT_LIBS= \
        $(FULLAOT_LIBS_UNIVERSAL) \
-       $(FULLAOT_LIBS_MOBILE_STATIC_BLACKLIST)
+       $(FULLAOT_LIBS_AOT_ONLY_BLACKLIST)
 endif
 
 FULLAOT_TMP_DIR=$(top_builddir)/mono/mini/fullaot-tmp
index abc0e2a96641096f960ea49d9b39520c5554e7a7..4c0ff0e63a5fbb3a5972487b584897699885ce2c 100644 (file)
@@ -1,6 +1,6 @@
 SUBDIRS = assemblyresolve gc-descriptors
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 FEATUREFUL_RUNTIME_TEST =  
 else
 FEATUREFUL_RUNTIME_TEST = test-appdomain-unload
@@ -46,8 +46,8 @@ MKBUNDLE = \
        PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
        $(RUNTIME) $(CLASS)/mkbundle.exe
 
-if INSTALL_MOBILE_STATIC
-PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_STATIC,MOBILE_LEGACY 
+if INSTALL_AOT_ONLY
+PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY,FULL_AOT_DESKTOP 
 endif
 
 if INSTALL_AOT_HYBRID
@@ -64,7 +64,7 @@ MCS = $(MCS_NO_LIB) -lib:$(CLASS)
 
 ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)" --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)"
 else
 TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)"
@@ -712,7 +712,7 @@ endif
 
 PROFILE_DISABLED_TESTS=
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 # Tests which rely on TypeLoadExceptions
 # In full-aot mode, these cause the relevant methods to be not AOTed.
 PROFILE_DISABLED_TESTS += \
@@ -751,7 +751,7 @@ PROFILE_DISABLED_TESTS += \
        thunks.exe
 
 # Tests which load assemblies which are not
-# in the mobile_static profile
+# in the aot_only profile
 PROFILE_DISABLED_TESTS += \
        assembly-load-remap.exe
 
@@ -922,13 +922,13 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \
 %.exe: %.il
        $(ILASM) -out:$@ $<
 
-if !INSTALL_MOBILE_STATIC
+if !INSTALL_AOT_ONLY
 if !INSTALL_AOT_HYBRID
 TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll
 endif
 endif
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX)
 else
 TEST_DRIVER_DEPEND=TestDriver.dll
@@ -981,7 +981,7 @@ bug-81466-lib.dll$(PLATFORM_AOT_SUFFIX)     \
 TestingReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX)     \
 TestingReferenceReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX)
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 prereqs: $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS)
 else
 prereqs: $(PREREQSI_IL) $(PREREQSI_CS)
@@ -1026,7 +1026,7 @@ test-sgen : sgen-tests
 # Precompile the test assemblies in parallel
 compile-tests:
        $(MAKE) -j4 $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(MAKE) $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS)
 endif
 
@@ -1235,7 +1235,7 @@ SGEN_REGULAR_TESTS_SRC =  \
 
 SGEN_REGULAR_DISABLED_TESTS=
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 SGEN_REGULAR_DISABLED_TESTS += \
        sgen-domain-unload.exe  \
        sgen-domain-unload-2.exe
@@ -1445,7 +1445,7 @@ imt_big_iface_test.exe: $(TEST_DRIVER_DEPEND) make-imt-test.exe
 EXTRA_DIST += test-inline-call-stack-library.cs test-inline-call-stack.cs
 test-inline-call-stack-library.dll: $(TEST_DRIVER_DEPEND) $(srcdir)/test-inline-call-stack-library.cs
        $(MCS) -t:library -out:test-inline-call-stack-library.dll $(srcdir)/test-inline-call-stack-library.cs
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
@@ -1492,7 +1492,7 @@ bug-81673.exe bug-81673-interface.dll: $(srcdir)/bug-81673.cs $(srcdir)/bug-8167
        $(MCS) -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
        $(MCS) -out:bug-81673.exe -r:bug-81673-interface.dll $(srcdir)/bug-81673.cs
        $(MCS) -define:WITH_STOP -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
@@ -1501,7 +1501,7 @@ bug-36848.exe bug-36848-a.dll: $(srcdir)/bug-36848.cs $(srcdir)/bug-36848-a.cs
        $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs
        $(MCS) -r:bug-36848-a.dll -out:bug-36848.exe $(srcdir)/bug-36848.cs
        $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs /define:WITH_STOP
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
@@ -1516,7 +1516,7 @@ bug-81691.exe: bug-81691-b.dll
 EXTRA_DIST += bug-81466-lib.il
 bug-81466-lib.dll: bug-81466-lib.il
        $(ILASM) /dll /output:bug-81466-lib.dll $(srcdir)/bug-81466-lib.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 bug-81466.exe: bug-81466.il bug-81466-lib.dll
@@ -1525,7 +1525,7 @@ bug-81466.exe: bug-81466.il bug-81466-lib.dll
 EXTRA_DIST += bug-324535-il.il
 bug-324535-il.dll : bug-324535-il.il
        $(ILASM) /dll /output:bug-324535-il.dll $(srcdir)/bug-324535-il.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 bug-324535.exe : bug-324535.cs bug-324535-il.dll
@@ -1534,7 +1534,7 @@ bug-324535.exe : bug-324535.cs bug-324535-il.dll
 EXTRA_DIST += custom-modifiers.2.cs custom-modifiers-lib.il
 custom-modifiers-lib.dll: custom-modifiers-lib.il
        $(ILASM) /dll /output:custom-modifiers-lib.dll $(srcdir)/custom-modifiers-lib.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll
@@ -1543,7 +1543,7 @@ custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll
 EXTRA_DIST += bug-382986-lib.cs
 bug-382986-lib.dll: bug-382986-lib.cs
        $(MCS) -target:library -out:$@ $(srcdir)/bug-382986-lib.cs
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
@@ -1570,14 +1570,14 @@ test-coreclr-security : coreclr-security.exe
 EXTRA_DIST += generic-unboxing.2.il
 generic-unboxing.2.dll : generic-unboxing.2.il
        $(ILASM) /dll /output:generic-unboxing.2.dll $(srcdir)/generic-unboxing.2.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
 EXTRA_DIST += generic-boxing.2.il
 generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll
        $(ILASM) /dll /output:generic-boxing.2.dll $(srcdir)/generic-boxing.2.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 
@@ -1592,7 +1592,7 @@ generic-box.2.exe : generic-box.2.cs generic-unboxing.2.dll generic-boxing.2.dll
 EXTRA_DIST += generic-delegate2.2.cs generic-delegate2-lib.2.il
 generic-delegate2-lib.2.dll : generic-delegate2-lib.2.il
        $(ILASM) /dll /output:$@ $(srcdir)/generic-delegate2-lib.2.il
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
 endif
 generic-delegate2.2.exe : generic-delegate2.2.cs generic-delegate2-lib.2.dll
@@ -1663,7 +1663,7 @@ GSHARED_TESTS_SRC = \
 
 GSHARED_DISABLED_TESTS=
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 GSHARED_DISABLED_TESTS += \
        generic-type-builder.2.exe
 endif
index b198b753750d45cbbae3d34791451642e171bc2d..b7c7f47295959395c277e4af4a97f3f7de191da7 100644 (file)
@@ -5,7 +5,7 @@ with_mono_path = MONO_PATH=$(CLASS)
 RUNTIME = $(top_builddir)/runtime/mono-wrapper --debug
 MCS = $(with_mono_path) $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -debug:full -target:library
 
-if INSTALL_MOBILE_STATIC
+if INSTALL_AOT_ONLY
 prereq: aot
 else
 prereq: test/asm.dll
index 24b8a82481f8c6208e045e5b3a43a66549d153c0..6195d5f4008d849a966952a81bd8984a0204f888 100644 (file)
@@ -18,7 +18,7 @@ using System.Xml;
 using System.Text;
 using System.Text.RegularExpressions;
 
-#if !MOBILE_STATIC && !MOBILE
+#if !FULL_AOT_DESKTOP && !MOBILE
 using Mono.Unix.Native;
 #endif
 
@@ -369,7 +369,7 @@ public class TestRunner
                                                        timedout.Add (data);
                                                }
 
-#if !MOBILE_STATIC && !MOBILE
+#if !FULL_AOT_DESKTOP && !MOBILE
                                                // Force the process to print a thread dump
                                                try {
                                                        Syscall.kill (p.Id, Signum.SIGQUIT);
index 3234eb2099a60e234edf87a5a60f556fecef8c48..1fe237bc3456544b87023c11ac9e85c99c5fef9e 100644 (file)
@@ -52,8 +52,8 @@ if INSTALL_AOT_HYBRID
 build_profiles += aot_hybrid
 endif
 
-if INSTALL_MOBILE_STATIC
-build_profiles += mobile_static
+if INSTALL_AOT_ONLY
+build_profiles += aot_only
 endif
 
 if INSTALL_XAMMAC
@@ -113,20 +113,20 @@ cur_dir_cmd = pwd
 PLATFORM_PATH_SEPARATOR = :
 endif
 
-if INSTALL_MOBILE_STATIC
-#  ILASM.exe has features which a mobile_static runtime will not support.
+if INSTALL_AOT_ONLY
+#  ILASM.exe has features which a aot_only runtime will not support.
 #  It is invoked with an external mono when used in the runtime.
 #  We skip it here because otherwise it will fail to verify.
-MOBILE_STATIC_FILTER=grep -v ilasm
+AOT_ONLY_FILTER=grep -v ilasm
 else
-MOBILE_STATIC_FILTER=echo
+AOT_ONLY_FILTER=echo
 endif
 
 # Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
 # TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
 # Skip binary_reference_assemblies because they contain metadata only
 mcs-compileall: mono-wrapper etc/mono/config
-       export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(MOBILE_STATIC_FILTER)` ; \
+       export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(AOT_ONLY_FILTER)` ; \
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
          if [ "binary_reference_assemblies" = "$$profile" ]; then \
index fab38f5bd4ecfc856a81fd88627fc08b8db552c9..cad6cecd676e4eedef9aefbf3617f12b2e803595 100755 (executable)
@@ -20,16 +20,16 @@ if [[ ${label} == 'osx-amd64' ]]; then EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --w
 if [[ ${label} == 'w32' ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\build\\\sgen\\\Win32\\\bin\\\Release\\\mono-sgen.exe`"; fi
 if [[ ${label} == 'w64' ]]; then PLATFORM=x64; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=x86_64-w64-mingw32 --disable-boehm"; export MONO_EXECUTABLE="`cygpath -u ${WORKSPACE}\\\msvc\\\build\\\sgen\\\x64\\\bin\\\Release\\\mono-sgen.exe`"; fi
 
-if [[ ${CI_TAGS} == *'mobile_static'* ]];
+if [[ ${CI_TAGS} == *'aot_only'* ]];
     then
-    EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=mobile_static";
+    EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=aot_only";
 elif [[ ${CI_TAGS} == *'acceptance-tests'* ]];
     then
     EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --prefix=${WORKSPACE}/tmp/mono-acceptance-tests --with-sgen-default-concurrent=yes";
 elif [[ ${label} != w* ]] && [[ ${label} != 'debian-8-ppc64el' ]] && [[ ${label} != 'centos-s390x' ]] && [[ ${CI_TAGS} != *'monolite'* ]];
     then
     # Override the defaults to skip profiles
-    # only enable the mobile profiles and mobile_static on the main architectures
+    # only enable the mobile profiles and aot_only on the main architectures
     # only enable the concurrent collector by default on main unix archs
     EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-runtime_preset=all --with-sgen-default-concurrent=yes"
 fi
diff --git a/scripts/ci/run-test-aot_only.sh b/scripts/ci/run-test-aot_only.sh
new file mode 100755 (executable)
index 0000000..bfb1610
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh
+
+if test -n "${MONO_LLVMONLY}";
+then
+${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k llvmonlycheck
+else
+${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k fullaotcheck
+fi
+
+${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1
+${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test
+${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall
+${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check
+${TESTCMD} --label=System --timeout=10m make -w -C mcs/class/System run-test
+${TESTCMD} --label=System.XML --timeout=5m make -w -C mcs/class/System.XML run-test
+${TESTCMD} --label=Mono.Security --timeout=5m make -w -C mcs/class/Mono.Security run-test
+${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test
+${TESTCMD} --label=System.Web.Services --timeout=5m make -w -C mcs/class/System.Web.Services run-test
+${TESTCMD} --label=I18N.CJK --timeout=5m make -w -C mcs/class/I18N/CJK run-test
+${TESTCMD} --label=I18N.West --timeout=5m make -w -C mcs/class/I18N/West run-test
+${TESTCMD} --label=I18N.MidEast --timeout=5m make -w -C mcs/class/I18N/MidEast run-test
+${TESTCMD} --label=System.Transactions --timeout=5m make -w -C mcs/class/System.Transactions run-test
+${TESTCMD} --label=System.Core --timeout=15m make -w -C mcs/class/System.Core run-test
+${TESTCMD} --label=System.Xml.Linq --timeout=5m make -w -C mcs/class/System.Xml.Linq run-test
+${TESTCMD} --label=System.Runtime.Serialization --timeout=5m make -w -C mcs/class/System.Runtime.Serialization run-test
+${TESTCMD} --label=System.ServiceModel --timeout=15m make -w -C mcs/class/System.ServiceModel run-test
+${TESTCMD} --label=System.ServiceModel.Web --timeout=5m make -w -C mcs/class/System.ServiceModel.Web run-test
+${TESTCMD} --label=System.ComponentModel.DataAnnotations --timeout=5m make -w -C mcs/class/System.ComponentModel.DataAnnotations run-test
+${TESTCMD} --label=Mono.CSharp --timeout=5m make -w -C mcs/class/Mono.CSharp run-test
+${TESTCMD} --label=System.Numerics --timeout=5m make -w -C mcs/class/System.Numerics run-test
+${TESTCMD} --label=System.Net.Http --timeout=5m make -w -C mcs/class/System.Net.Http run-test
+${TESTCMD} --label=System.Json --timeout=5m make -w -C mcs/class/System.Json run-test
+
+rm -fr /tmp/jenkins-temp-aspnet*
diff --git a/scripts/ci/run-test-mobile_static.sh b/scripts/ci/run-test-mobile_static.sh
deleted file mode 100755 (executable)
index bfb1610..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash -e
-
-TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh
-
-if test -n "${MONO_LLVMONLY}";
-then
-${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k llvmonlycheck
-else
-${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k fullaotcheck
-fi
-
-${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1
-${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test
-${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall
-${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check
-${TESTCMD} --label=System --timeout=10m make -w -C mcs/class/System run-test
-${TESTCMD} --label=System.XML --timeout=5m make -w -C mcs/class/System.XML run-test
-${TESTCMD} --label=Mono.Security --timeout=5m make -w -C mcs/class/Mono.Security run-test
-${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test
-${TESTCMD} --label=System.Web.Services --timeout=5m make -w -C mcs/class/System.Web.Services run-test
-${TESTCMD} --label=I18N.CJK --timeout=5m make -w -C mcs/class/I18N/CJK run-test
-${TESTCMD} --label=I18N.West --timeout=5m make -w -C mcs/class/I18N/West run-test
-${TESTCMD} --label=I18N.MidEast --timeout=5m make -w -C mcs/class/I18N/MidEast run-test
-${TESTCMD} --label=System.Transactions --timeout=5m make -w -C mcs/class/System.Transactions run-test
-${TESTCMD} --label=System.Core --timeout=15m make -w -C mcs/class/System.Core run-test
-${TESTCMD} --label=System.Xml.Linq --timeout=5m make -w -C mcs/class/System.Xml.Linq run-test
-${TESTCMD} --label=System.Runtime.Serialization --timeout=5m make -w -C mcs/class/System.Runtime.Serialization run-test
-${TESTCMD} --label=System.ServiceModel --timeout=15m make -w -C mcs/class/System.ServiceModel run-test
-${TESTCMD} --label=System.ServiceModel.Web --timeout=5m make -w -C mcs/class/System.ServiceModel.Web run-test
-${TESTCMD} --label=System.ComponentModel.DataAnnotations --timeout=5m make -w -C mcs/class/System.ComponentModel.DataAnnotations run-test
-${TESTCMD} --label=Mono.CSharp --timeout=5m make -w -C mcs/class/Mono.CSharp run-test
-${TESTCMD} --label=System.Numerics --timeout=5m make -w -C mcs/class/System.Numerics run-test
-${TESTCMD} --label=System.Net.Http --timeout=5m make -w -C mcs/class/System.Net.Http run-test
-${TESTCMD} --label=System.Json --timeout=5m make -w -C mcs/class/System.Json run-test
-
-rm -fr /tmp/jenkins-temp-aspnet*