From: Ludovic Henry Date: Fri, 18 Nov 2016 20:58:03 +0000 (-0500) Subject: [profiles] Fix MOBILE assemblies and tests compilation + Rename MOBILE to AOT_HYBRID X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=d8693e0c73388503c06ebc009b753ef1488924af;p=mono.git [profiles] Fix MOBILE assemblies and tests compilation + Rename MOBILE to AOT_HYBRID This only fixes the compilation of the assemblies and the tests. This doesn't fix the failing tests or the crashes. --- diff --git a/configure.ac b/configure.ac index 97b62853b8c..3e910f7ef73 100644 --- a/configure.ac +++ b/configure.ac @@ -770,9 +770,10 @@ AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to b AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default]) 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(runtime_preset, [ --with-runtime_preset=net_4_x,all,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,mobile_static,bitcode_mobile_static Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x]) dnl dnl Profile defaults @@ -786,6 +787,7 @@ with_monotouch_default=no 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_bitcode_default=no @@ -835,8 +837,8 @@ elif test x$with_runtime_preset = xbitcode_mobile_static; then AOT_RUN_FLAGS="--llvmonly" elif test x$with_runtime_preset = xhybrid; then DISABLE_MCS_DOCS_default=yes - with_mobile_default=yes - TEST_PROFILE=mobile + with_aot_hybrid_default=yes + TEST_PROFILE=aot_hybrid enable_llvm_default=yes mono_feature_disable_com='yes' @@ -879,6 +881,9 @@ fi if test "x$with_xammac" = "xdefault"; then with_xammac=$with_xammac_default 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 fi @@ -890,8 +895,10 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"] 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"]) +AC_SUBST(INSTALL_AOT_HYBRID) AC_SUBST(INSTALL_MOBILE_STATIC) default_profile=net_4_x @@ -904,6 +911,9 @@ fi if test -z "$INSTALL_XAMMAC_TRUE"; then : default_profile=xammac 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 fi @@ -4431,6 +4441,7 @@ 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 JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg diff --git a/mcs/Makefile b/mcs/Makefile index 6a7a58d7fc9..5f731fb15f3 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -14,7 +14,7 @@ monotouch_runtime_SUBDIRS := build class monotouch_watch_runtime_SUBDIRS := build class monotouch_tv_runtime_SUBDIRS := build class xammac_SUBDIRS := build class -mobile_SUBDIRS := build class +aot_hybrid_SUBDIRS := build class ilasm mobile_static_SUBDIRS := build class ilasm binary_reference_assemblies_SUBDIRS := build class net_4_x_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs @@ -71,7 +71,7 @@ $(_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--mobile--%): profile-do--mobile--%: 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--build--%): profile-do--build--%: profile-do--basic--% diff --git a/mcs/build/profiles/aot_hybrid.make b/mcs/build/profiles/aot_hybrid.make new file mode 100644 index 00000000000..e531f44a4b5 --- /dev/null +++ b/mcs/build/profiles/aot_hybrid.make @@ -0,0 +1,36 @@ +#! -*- 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:MOBILE,MOBILE_LEGACY \ + -d:MOBILE_DYNAMIC \ + -d:NET_3_5 \ + -d:NET_4_0 \ + -d:NET_4_5 \ + -d:MONO \ + -d:NETSTANDARD \ + -nowarn:1699 \ + -nostdlib \ + $(DEFAULT_REFERENCES) \ + $(PLATFORM_DEBUG_FLAGS) + +FRAMEWORK_VERSION = 2.1 + +NO_INSTALL = yes +MOBILE_DYNAMIC = yes +MOBILE_PROFILE = yes \ No newline at end of file diff --git a/mcs/build/profiles/mobile.make b/mcs/build/profiles/mobile.make deleted file mode 100644 index e531f44a4b5..00000000000 --- a/mcs/build/profiles/mobile.make +++ /dev/null @@ -1,36 +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:MOBILE,MOBILE_LEGACY \ - -d:MOBILE_DYNAMIC \ - -d:NET_3_5 \ - -d:NET_4_0 \ - -d:NET_4_5 \ - -d:MONO \ - -d:NETSTANDARD \ - -nowarn:1699 \ - -nostdlib \ - $(DEFAULT_REFERENCES) \ - $(PLATFORM_DEBUG_FLAGS) - -FRAMEWORK_VERSION = 2.1 - -NO_INSTALL = yes -MOBILE_DYNAMIC = yes -MOBILE_PROFILE = yes \ No newline at end of file diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 714033a4eb1..f22bc600ec3 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -69,17 +69,23 @@ mobile_static_dirs := \ Mono.Simd \ $(pcl_facade_dirs) -mobile_dynamic_dirs := \ +aot_hybrid_dirs := \ $(mobile_common_dirs) \ + PEAPI \ Mono.CompilerServices.SymbolWriter \ + Mono.Simd \ $(pcl_facade_dirs) xammac_dirs := \ - $(mobile_dynamic_dirs) + $(mobile_common_dirs) \ + Mono.CompilerServices.SymbolWriter \ + $(pcl_facade_dirs) monodroid_dirs := \ - $(mobile_dynamic_dirs) \ - Mono.Btls.Interface + $(mobile_common_dirs) \ + Mono.CompilerServices.SymbolWriter \ + Mono.Btls.Interface \ + $(pcl_facade_dirs) monotouch_dirs := \ $(mobile_static_dirs) @@ -308,7 +314,7 @@ 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) -mobile_SUBDIRS := $(mobile_dynamic_dirs) +aot_hybrid_SUBDIRS := $(aot_hybrid_dirs) xammac_SUBDIRS := $(xammac_dirs) xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs) binary_reference_assemblies_SUBDIRS := reference-assemblies @@ -319,7 +325,7 @@ xbuild_14_SUBDIRS := $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks include ../build/rules.make -SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_x_dirs) $(net_4_x_parallel_dirs) $(xammac_net_4_5_SUBDIRS) +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) DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs) Microsoft.NuGet.Build.Tasks diff --git a/mcs/class/Mono.Security/aot_hybrid_Mono.Security.dll.sources b/mcs/class/Mono.Security/aot_hybrid_Mono.Security.dll.sources new file mode 100644 index 00000000000..87eaa009cd8 --- /dev/null +++ b/mcs/class/Mono.Security/aot_hybrid_Mono.Security.dll.sources @@ -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/System.Core/aot_hybrid_System.Core.dll.sources b/mcs/class/System.Core/aot_hybrid_System.Core.dll.sources new file mode 100644 index 00000000000..11a92dbb1d2 --- /dev/null +++ b/mcs/class/System.Core/aot_hybrid_System.Core.dll.sources @@ -0,0 +1,17 @@ +#include common_System.Core.dll.sources +#include dynamic_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_System.Core.dll.sources b/mcs/class/System.Core/mobile_System.Core.dll.sources deleted file mode 100644 index 882476b4b5e..00000000000 --- a/mcs/class/System.Core/mobile_System.Core.dll.sources +++ /dev/null @@ -1,4 +0,0 @@ -#include common_System.Core.dll.sources - -#include dynamic_System.Core.dll.sources - diff --git a/mcs/class/System.Data/aot_hybrid_System.Data.dll.sources b/mcs/class/System.Data/aot_hybrid_System.Data.dll.sources new file mode 100644 index 00000000000..bbc860b8cd7 --- /dev/null +++ b/mcs/class/System.Data/aot_hybrid_System.Data.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Data.dll.sources diff --git a/mcs/class/System.Data/aot_hybrid_System.Data_test.dll.exclude.sources b/mcs/class/System.Data/aot_hybrid_System.Data_test.dll.exclude.sources new file mode 100644 index 00000000000..0022a9e9f1b --- /dev/null +++ b/mcs/class/System.Data/aot_hybrid_System.Data_test.dll.exclude.sources @@ -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/app_test_aot_hybrid.config b/mcs/class/System.Data/app_test_aot_hybrid.config new file mode 100644 index 00000000000..4f315973f1e --- /dev/null +++ b/mcs/class/System.Data/app_test_aot_hybrid.config @@ -0,0 +1,48 @@ + + + +
+
+ + + + + + + + + + + + + + + + + + + + diff --git a/mcs/class/System.IdentityModel/aot_hybrid_System.IdentityModel.dll.sources b/mcs/class/System.IdentityModel/aot_hybrid_System.IdentityModel.dll.sources new file mode 100644 index 00000000000..429636751c2 --- /dev/null +++ b/mcs/class/System.IdentityModel/aot_hybrid_System.IdentityModel.dll.sources @@ -0,0 +1 @@ +#include mobile_System.IdentityModel.dll.sources diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs index cb12bd8d9cf..8d35bd4c7a5 100644 --- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs +++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/DataContractResolverTest.cs @@ -33,7 +33,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; -#if !MOBILE_STATIC +#if !MOBILE using System.Data; #endif using System.IO; diff --git a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs index 944b7f2eea6..2cc1182b6c1 100755 --- a/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs +++ b/mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs @@ -37,7 +37,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; -#if !MOBILE_STATIC +#if !MOBILE using System.Data; #endif using System.IO; @@ -1477,7 +1477,7 @@ namespace MonoTests.System.Runtime.Serialization Assert.AreEqual (parent, parent.Child.Parent, "#2"); } -#if !MOBILE_STATIC +#if !MOBILE [Test] public void IXmlSerializableCallConstructor () { diff --git a/mcs/class/System.Runtime.Serialization/aot_hybrid_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/aot_hybrid_System.Runtime.Serialization.dll.sources new file mode 100644 index 00000000000..6caafd41198 --- /dev/null +++ b/mcs/class/System.Runtime.Serialization/aot_hybrid_System.Runtime.Serialization.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Runtime.Serialization.dll.sources diff --git a/mcs/class/System.ServiceModel.Internals/aot_hybrid_System.ServiceModel.Internals.dll.sources b/mcs/class/System.ServiceModel.Internals/aot_hybrid_System.ServiceModel.Internals.dll.sources new file mode 100644 index 00000000000..f51db672e59 --- /dev/null +++ b/mcs/class/System.ServiceModel.Internals/aot_hybrid_System.ServiceModel.Internals.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.Internals.dll.sources diff --git a/mcs/class/System.ServiceModel.Web/aot_hybrid_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/aot_hybrid_System.ServiceModel.Web.dll.sources new file mode 100644 index 00000000000..cbea0fae7b4 --- /dev/null +++ b/mcs/class/System.ServiceModel.Web/aot_hybrid_System.ServiceModel.Web.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.Web.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel.dll.sources new file mode 100644 index 00000000000..22ece5ce8ce --- /dev/null +++ b/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel.dll.sources @@ -0,0 +1 @@ +#include mobile_System.ServiceModel.dll.sources diff --git a/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel_test.dll.exclude.sources b/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel_test.dll.exclude.sources new file mode 100644 index 00000000000..350444a823a --- /dev/null +++ b/mcs/class/System.ServiceModel/aot_hybrid_System.ServiceModel_test.dll.exclude.sources @@ -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.Web.Services/aot_hybrid_System.Web.Services.dll.sources b/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services.dll.sources new file mode 100644 index 00000000000..9e39dcc73b1 --- /dev/null +++ b/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Web.Services.dll.sources diff --git a/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services_test.dll.exclude.sources b/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services_test.dll.exclude.sources new file mode 100644 index 00000000000..0dee611d624 --- /dev/null +++ b/mcs/class/System.Web.Services/aot_hybrid_System.Web.Services_test.dll.exclude.sources @@ -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.XML/aot_hybrid_System.Xml.dll.sources b/mcs/class/System.XML/aot_hybrid_System.Xml.dll.sources new file mode 100644 index 00000000000..b6630930f75 --- /dev/null +++ b/mcs/class/System.XML/aot_hybrid_System.Xml.dll.sources @@ -0,0 +1 @@ +#include mobile_System.Xml.dll.sources diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs index 071535a5c44..e52047d1b5b 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs +++ b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.cs @@ -167,7 +167,7 @@ namespace Mono.Net.Security } } -#if MOBILE_STATIC || !MOBILE +#if !MONODROID && !MONOTOUCH && !XAMMAC static MSI.MonoTlsProvider TryDynamicLoad () { var variable = Environment.GetEnvironmentVariable ("MONO_TLS_PROVIDER"); diff --git a/mcs/class/System/aot_hybrid_System.dll.sources b/mcs/class/System/aot_hybrid_System.dll.sources new file mode 100644 index 00000000000..70a77a6dbff --- /dev/null +++ b/mcs/class/System/aot_hybrid_System.dll.sources @@ -0,0 +1 @@ +#include mobile_System.dll.sources diff --git a/mcs/class/System/aot_hybrid_System_test.dll.exclude.sources b/mcs/class/System/aot_hybrid_System_test.dll.exclude.sources new file mode 100644 index 00000000000..9a453e68f8c --- /dev/null +++ b/mcs/class/System/aot_hybrid_System_test.dll.exclude.sources @@ -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/corlib/Makefile b/mcs/class/corlib/Makefile index c05eb889821..882a3cf0419 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -67,8 +67,10 @@ DEFAULT_REFERENCES = TEST_LIB_REFS = System.Core System ifndef MOBILE_STATIC +ifneq ($(PROFILE),aot_hybrid) TEST_LIB_REFS += Mono.Posix endif +endif # System.IO/DirectoryInfoTest.cs needs Mono.Posix TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe \ diff --git a/mcs/class/corlib/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs index f8e54b7fb85..b64e180f7e0 100644 --- a/mcs/class/corlib/System/TimeZoneInfo.cs +++ b/mcs/class/corlib/System/TimeZoneInfo.cs @@ -149,7 +149,7 @@ namespace System return true; } -#if !MOBILE || MOBILE_STATIC +#if !MONODROID && !MONOTOUCH && !XAMMAC static TimeZoneInfo CreateLocal () { #if !MOBILE_STATIC @@ -237,7 +237,7 @@ namespace System throw new NotImplementedException ("This method is not implemented for this platform"); #endif } -#endif +#endif // !MONODROID && !MONOTOUCH && !XAMMAC string standardDisplayName; public string StandardName { @@ -273,7 +273,7 @@ namespace System #endif private AdjustmentRule [] adjustmentRules; -#if !MOBILE || MOBILE_STATIC +#if !MOBILE || !MOBILE_STATIC /// /// Determine whether windows of not (taken Stephane Delcroix's code) /// @@ -330,7 +330,7 @@ namespace System } } #endif -#endif +#endif // !MOBILE || !MOBILE_STATIC private static bool TryAddTicks (DateTime date, long ticks, out DateTime result, DateTimeKind kind = DateTimeKind.Unspecified) { diff --git a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs index 8ef9dcf4680..0d3c88561b9 100644 --- a/mcs/class/corlib/Test/System.IO/DirectoryTest.cs +++ b/mcs/class/corlib/Test/System.IO/DirectoryTest.cs @@ -17,7 +17,7 @@ using System.IO; using System.Text; using System.Threading; -#if !MONOTOUCH && !MOBILE_STATIC +#if !MOBILE using Mono.Unix; #endif using NUnit.Framework; @@ -47,7 +47,7 @@ public class DirectoryTest if (Directory.Exists (TempFolder)) Directory.Delete (TempFolder, true); } -#if !MONOTOUCH && !MOBILE_STATIC +#if !MOBILE [Test] //BXC #12461 public void EnumerateFilesListSymlinks () { diff --git a/mcs/class/corlib/aot_hybrid_corlib_test.dll.exclude.sources b/mcs/class/corlib/aot_hybrid_corlib_test.dll.exclude.sources new file mode 100644 index 00000000000..9b651e6fc9e --- /dev/null +++ b/mcs/class/corlib/aot_hybrid_corlib_test.dll.exclude.sources @@ -0,0 +1,22 @@ +Microsoft.Win32/RegistryKeyTest.cs +System.Reflection/VisibilityTest.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 diff --git a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs index 5a67f249f90..b17e42b4654 100644 --- a/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs +++ b/mcs/class/referencesource/System/net/System/Net/NetworkInformation/IPGlobalProperties.cs @@ -16,7 +16,7 @@ namespace System.Net.NetworkInformation { #if MONODROID return new AndroidIPGlobalProperties (); -#elif MONOTOUCH || XAMMAC || MOBILE_STATIC +#elif MONOTOUCH || XAMMAC || MOBILE return new UnixIPGlobalProperties (); #elif MONO switch (Environment.OSVersion.Platform) { diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index a80cd07e119..c36e42ade95 100644 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -50,6 +50,10 @@ if INSTALL_MOBILE_STATIC PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_STATIC,MOBILE_LEGACY endif +if INSTALL_AOT_HYBRID +PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY +endif + MCS_NO_LIB = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -debug \ -noconfig -nologo \ -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 \ @@ -835,6 +839,12 @@ PROFILE_DISABLED_TESTS += \ bug-515884.exe endif +if INSTALL_AOT_HYBRID +PROFILE_DISABLED_TESTS += \ + bug-80307.exe \ + namedmutex-destroy-race.exe +endif + AOT_DISABLED_TESTS= \ constraints-load.exe @@ -906,8 +916,10 @@ EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \ $(ILASM) -out:$@ $< if !INSTALL_MOBILE_STATIC +if !INSTALL_AOT_HYBRID TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll endif +endif if INSTALL_MOBILE_STATIC TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX) diff --git a/mono/tests/cominterop.cs b/mono/tests/cominterop.cs index fbfdcbbb16b..cc86c7387d0 100644 --- a/mono/tests/cominterop.cs +++ b/mono/tests/cominterop.cs @@ -455,6 +455,8 @@ public class Tests #region Runtime Callable Wrapper Tests +#if !MOBILE + IntPtr pUnk; if (mono_test_marshal_com_object_create (out pUnk) != 0) return 145; @@ -541,6 +543,8 @@ public class Tests if (TestITest (itest) != 0) return 176; +#endif + #endregion // Runtime Callable Wrapper Tests #region COM Callable Wrapper Tests diff --git a/mono/tests/test-runner.cs b/mono/tests/test-runner.cs index 53b4e928357..24b8a82481f 100644 --- a/mono/tests/test-runner.cs +++ b/mono/tests/test-runner.cs @@ -18,7 +18,7 @@ using System.Xml; using System.Text; using System.Text.RegularExpressions; -#if !MOBILE_STATIC +#if !MOBILE_STATIC && !MOBILE using Mono.Unix.Native; #endif @@ -369,7 +369,7 @@ public class TestRunner timedout.Add (data); } -#if !MOBILE_STATIC +#if !MOBILE_STATIC && !MOBILE // Force the process to print a thread dump try { Syscall.kill (p.Id, Signum.SIGQUIT); diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 9ca31834655..3234eb2099a 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -48,6 +48,10 @@ if INSTALL_MONOTOUCH_TV build_profiles += monotouch_tv monotouch_tv_runtime endif +if INSTALL_AOT_HYBRID +build_profiles += aot_hybrid +endif + if INSTALL_MOBILE_STATIC build_profiles += mobile_static endif diff --git a/scripts/ci/run-test-aot_hybrid.sh b/scripts/ci/run-test-aot_hybrid.sh new file mode 100755 index 00000000000..00a7c9f1da1 --- /dev/null +++ b/scripts/ci/run-test-aot_hybrid.sh @@ -0,0 +1,30 @@ +#!/bin/bash -e + +TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh + +${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k aotcheck +${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.sh b/scripts/ci/run-test-mobile.sh deleted file mode 100755 index 00a7c9f1da1..00000000000 --- a/scripts/ci/run-test-mobile.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -e - -TESTCMD=`dirname "${BASH_SOURCE[0]}"`/run-step.sh - -${TESTCMD} --label=mini --timeout=25m make -j 4 -w -C mono/mini -k aotcheck -${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*