diff options
39 files changed, 83 insertions, 275 deletions
diff --git a/configure.in b/configure.in index bd4fac85072..4f710e78bef 100644 --- a/configure.in +++ b/configure.in @@ -2724,7 +2724,7 @@ case "x$gc" in esac #AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0 FX (defaults to yes)], [], [with_profile2=yes]) -AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes]) +AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4=yes]) AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid 2.1 assemblies (defaults to no)], [], [with_monodroid=no]) AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no]) AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile 2.1 assemblies (defaults to no)], [], [with_mobile=no]) @@ -3125,6 +3125,10 @@ fi if test x$with_moonlight != xno; then echo "MOONLIGHT = 1" >> $srcdir/$mcsdir/build/config.make fi + + if test x$with_profile4 != xyes; then + echo "DEFAULT_PROFILE = net_2_0" >> $srcdir/$mcsdir/build/config.make + fi fi diff --git a/mcs/Makefile b/mcs/Makefile index 37576edc4fe..cbdd7671425 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -13,6 +13,7 @@ monotouch_SUBDIRS := build class mobile_SUBDIRS := build class net_3_5_SUBDIRS := build class tools/xbuild net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs +net_4_5_SUBDIRS := build class # List of test subdirs that should pass 100% centum_tests := \ @@ -84,7 +85,7 @@ dir-check: # fun specialty targets -PROFILES = net_2_0 net_3_5 net_4_0 +PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 .PHONY: all-profiles $(STD_TARGETS:=-profiles) all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--% @@ -103,6 +104,7 @@ profiles-do--run-test: # Orchestrate the bootstrap here. _boot_ = all clean install +$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--net_4_0--% $(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--% $(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--% $(_boot_:%=profile-do--moonlight--%): profile-do--moonlight--%: profile-do--moonlight_raw--% diff --git a/mcs/build/Makefile b/mcs/build/Makefile index b6d41e0c05f..14c2a5da6e4 100644 --- a/mcs/build/Makefile +++ b/mcs/build/Makefile @@ -21,7 +21,8 @@ PROFILES = \ net_2_0 \ moonlight_raw \ net_3_5 \ - net_4_0 + net_4_0 \ + net_4_5 COMMON_SRCS = \ Consts.cs.in \ diff --git a/mcs/build/common/Consts.cs.in b/mcs/build/common/Consts.cs.in index 5010a35a6f9..df8d30470da 100644 --- a/mcs/build/common/Consts.cs.in +++ b/mcs/build/common/Consts.cs.in @@ -39,7 +39,13 @@ static class Consts public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; -#if NET_4_0 +#if NET_4_5 + public const string FxVersion = "4.0.0.0"; + public const string FxFileVersion = "4.0.30319.17020"; + + public const string VsVersion = "0.0.0.0"; // Useless ? + public const string VsFileVersion = "11.0.0.0"; // TODO: +#elif NET_4_0 public const string FxVersion = "4.0.0.0"; public const string FxFileVersion = "4.0.30319.1"; diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make index a6969592c55..4a4794c685c 100644 --- a/mcs/build/config-default.make +++ b/mcs/build/config-default.make @@ -30,6 +30,7 @@ TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATO DEFAULT_MCS_FLAGS := $(MCS_FLAGS) DEFAULT_MBAS_FLAGS := $(MBAS_FLAGS) +DEFAULT_PROFILE := net_4_5 # You shouldn't need to set these but might on a # weird platform. diff --git a/mcs/build/profiles/net_4_0.make b/mcs/build/profiles/net_4_0.make index b869afb1ebc..4cf51db14a4 100644 --- a/mcs/build/profiles/net_4_0.make +++ b/mcs/build/profiles/net_4_0.make @@ -11,6 +11,6 @@ profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) +PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) FRAMEWORK_VERSION = 4.0 diff --git a/mcs/build/profiles/net_4_5.make b/mcs/build/profiles/net_4_5.make new file mode 100644 index 00000000000..b869afb1ebc --- /dev/null +++ b/mcs/build/profiles/net_4_5.make @@ -0,0 +1,16 @@ +# -*- 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) + +# nuttzing! + +profile-check: + @: + +DEFAULT_REFERENCES = -r:mscorlib.dll +PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) + +FRAMEWORK_VERSION = 4.0 diff --git a/mcs/build/rules.make b/mcs/build/rules.make index cd1dd5fd307..8b2e7308f52 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -103,7 +103,7 @@ endif # Rest of the configuration ifndef PROFILE -PROFILE = net_4_0 +PROFILE = $(DEFAULT_PROFILE) endif include $(topdir)/build/profiles/$(PROFILE).make diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 4996afa4ed1..592ed3ead64 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -113,6 +113,7 @@ net_2_0_dirs := \ Mono.Options \ Mono.Simd \ Mono.Tasklets \ + System.Dynamic \ Mono.CSharp \ Moonlight.Build.Tasks \ System.Net @@ -167,7 +168,6 @@ net_3_5_only_dirs := \ Microsoft.Build.Tasks net_4_0_dirs := \ - System.Dynamic \ System.Numerics \ Microsoft.CSharp \ Microsoft.Build \ @@ -195,6 +195,7 @@ monotouch_SUBDIRS := $(mobile_dirs) mobile_SUBDIRS := $(mobile_dirs) net_3_5_SUBDIRS := $(net_3_5_only_dirs) net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) aot-compiler +net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) aot-compiler include ../build/rules.make diff --git a/mcs/class/Mono.Simd/Makefile b/mcs/class/Mono.Simd/Makefile index 676ffc72e5d..3341fdabacd 100644 --- a/mcs/class/Mono.Simd/Makefile +++ b/mcs/class/Mono.Simd/Makefile @@ -10,7 +10,7 @@ NO_TEST = yes # This is a .NET 2.0+ only assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-Mono.Simd.dll NO_INSTALL = yes diff --git a/mcs/class/Mono.Web/Makefile b/mcs/class/Mono.Web/Makefile index d69422eeeb4..8fb69efd17a 100644 --- a/mcs/class/Mono.Web/Makefile +++ b/mcs/class/Mono.Web/Makefile @@ -7,7 +7,7 @@ LIBRARY = Mono.Web.dll NO_TEST = yes # This is a .NET 2.0+ only assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifdef VALID_PROFILE LIB_MCS_FLAGS = -r:$(corlib) \ diff --git a/mcs/class/RabbitMQ.Client/src/client/net_2_0_RabbitMQ.Client.dll.sources b/mcs/class/RabbitMQ.Client/src/client/net_2_0_RabbitMQ.Client.dll.sources index 3e6c4ebb966..863b84ef8bf 100644 --- a/mcs/class/RabbitMQ.Client/src/client/net_2_0_RabbitMQ.Client.dll.sources +++ b/mcs/class/RabbitMQ.Client/src/client/net_2_0_RabbitMQ.Client.dll.sources @@ -1,128 +1,4 @@ -./AssemblyInfo.cs -../../../../build/common/Consts.cs -./events/EventingBasicConsumer.cs -./events/BasicDeliverEventHandler.cs -./events/CallbackExceptionEventHandler.cs -./events/BasicReturnEventHandler.cs -./events/ModelShutdownEventHandler.cs -./events/ConsumerEventHandler.cs -./events/CallbackExceptionEventArgs.cs -./events/BasicReturnEventArgs.cs -./events/ConsumerEventArgs.cs -./events/BasicDeliverEventArgs.cs -./events/ConnectionShutdownEventHandler.cs -./events/ConsumerShutdownEventHandler.cs -./exceptions/ChannelAllocationException.cs -./exceptions/UnexpectedMethodException.cs -./exceptions/PacketNotRecognizedException.cs -./exceptions/PossibleAuthenticationFailureException.cs -./exceptions/WireFormattingException.cs -./exceptions/UnsupportedMethodFieldException.cs -./exceptions/ProtocolVersionMismatchException.cs -./exceptions/AlreadyClosedException.cs -./exceptions/BrokerUnreachableException.cs -./exceptions/UnsupportedMethodException.cs -./exceptions/OperationInterruptedException.cs -./messagepatterns/SimpleRpcServer.cs -./messagepatterns/Subscription.cs -./messagepatterns/SimpleRpcClient.cs -./impl/SessionBase.cs -./impl/UnexpectedFrameException.cs -./impl/ContentHeaderPropertyReader.cs -./impl/ConnectionStartDetails.cs -./impl/SessionManager.cs -./impl/AbstractProtocolBase.cs -./impl/MalformedFrameException.cs -./impl/ModelBase.cs -./impl/RpcContinuationQueue.cs -./impl/ConnectionBase.cs -./impl/Session.cs -./impl/ContentHeaderBase.cs -./impl/WireFormatting.cs -./impl/MethodArgumentReader.cs -./impl/SimpleBlockingRpcContinuation.cs -./impl/QuiescingSession.cs -./impl/ContentHeaderPropertyWriter.cs -./impl/ChannelErrorException.cs -./impl/SoftProtocolException.cs -./impl/v0_9/Connection.cs -./impl/v0_9/ProtocolBase.cs -./impl/MethodArgumentWriter.cs -./impl/ShutdownContinuation.cs -./impl/SyntaxError.cs -./impl/HardProtocolException.cs -./impl/v0_8/Connection.cs -./impl/v0_8/ProtocolBase.cs -./impl/UnknownClassOrMethodException.cs -./impl/MainSession.cs -./impl/FileProperties.cs -./impl/BasicProperties.cs -./impl/ISession.cs -./impl/Command.cs -./impl/v0_8qpid/Connection.cs -./impl/v0_8qpid/ProtocolBase.cs -./impl/IRpcContinuation.cs -./impl/RedirectException.cs -./impl/SocketFrameHandler_0_9.cs -./impl/ProtocolException.cs -./impl/Frame.cs -./impl/MethodBase.cs -./impl/IFrameHandler.cs -./impl/CommandAssembler.cs -./impl/StreamProperties.cs -./content/BasicMessageReader.cs -./content/BytesWireFormatting.cs -./content/IMessageBuilder.cs -./content/StreamMessageBuilder.cs -./content/IMessageReader.cs -./content/IMapMessageReader.cs -./content/IBytesMessageBuilder.cs -./content/BasicMessageBuilder.cs -./content/StreamMessageReader.cs -./content/MapMessageReader.cs -./content/StreamWireFormatting.cs -./content/IMapMessageBuilder.cs -./content/PrimitiveParser.cs -./content/MapMessageBuilder.cs -./content/MapWireFormatting.cs -./content/IBytesMessageReader.cs -./content/IStreamMessageReader.cs -./content/IStreamMessageBuilder.cs -./content/BytesMessageBuilder.cs -./content/BytesMessageReader.cs -./api/SslHelper.cs -./api/IConnection.cs -./api/IModel.cs -./api/AmqpTimestamp.cs -./api/IFileProperties.cs -./api/PublicationAddress.cs -./api/QueueingBasicConsumer.cs -./api/AmqpVersion.cs -./api/IProtocol.cs -./api/IBasicConsumer.cs -./api/ExchangeType.cs -./api/AmqpTcpEndpoint.cs -./api/IBasicProperties.cs -./api/IContentHeader.cs -./api/IMethod.cs -./api/ShutdownReportEntry.cs -./api/ShutdownEventArgs.cs -./api/IStreamProperties.cs -./api/Protocols.cs -./api/ShutdownInitiator.cs -./api/DefaultBasicConsumer.cs -./api/SslOption.cs -./api/BinaryTableValue.cs -./api/ConnectionFactory.cs -../util/DebugUtil.cs -../util/NetworkBinaryReader.cs -../util/NetworkBinaryWriter.cs -../util/BlockingCell.cs -../util/Semaphore.cs -../util/Either.cs -../util/SharedQueue.cs -../util/XmlUtil.cs -../util/IntAllocator.cs +#include dll.sources ../../docs/specs/net_2_0-api-0-9.cs ../../docs/specs/net_2_0-api-0-8.cs ../../docs/specs/net_2_0-api-qpid-0-8.cs diff --git a/mcs/class/RabbitMQ.Client/src/client/net_4_0_RabbitMQ.Client.dll.sources b/mcs/class/RabbitMQ.Client/src/client/net_4_0_RabbitMQ.Client.dll.sources index b1e9ca02a30..44dd9c0371a 100644 --- a/mcs/class/RabbitMQ.Client/src/client/net_4_0_RabbitMQ.Client.dll.sources +++ b/mcs/class/RabbitMQ.Client/src/client/net_4_0_RabbitMQ.Client.dll.sources @@ -1,128 +1,4 @@ -./AssemblyInfo.cs -../../../../build/common/Consts.cs -./events/EventingBasicConsumer.cs -./events/BasicDeliverEventHandler.cs -./events/CallbackExceptionEventHandler.cs -./events/BasicReturnEventHandler.cs -./events/ModelShutdownEventHandler.cs -./events/ConsumerEventHandler.cs -./events/CallbackExceptionEventArgs.cs -./events/BasicReturnEventArgs.cs -./events/ConsumerEventArgs.cs -./events/BasicDeliverEventArgs.cs -./events/ConnectionShutdownEventHandler.cs -./events/ConsumerShutdownEventHandler.cs -./exceptions/ChannelAllocationException.cs -./exceptions/UnexpectedMethodException.cs -./exceptions/PacketNotRecognizedException.cs -./exceptions/PossibleAuthenticationFailureException.cs -./exceptions/WireFormattingException.cs -./exceptions/UnsupportedMethodFieldException.cs -./exceptions/ProtocolVersionMismatchException.cs -./exceptions/AlreadyClosedException.cs -./exceptions/BrokerUnreachableException.cs -./exceptions/UnsupportedMethodException.cs -./exceptions/OperationInterruptedException.cs -./messagepatterns/SimpleRpcServer.cs -./messagepatterns/Subscription.cs -./messagepatterns/SimpleRpcClient.cs -./impl/SessionBase.cs -./impl/UnexpectedFrameException.cs -./impl/ContentHeaderPropertyReader.cs -./impl/ConnectionStartDetails.cs -./impl/SessionManager.cs -./impl/AbstractProtocolBase.cs -./impl/MalformedFrameException.cs -./impl/ModelBase.cs -./impl/RpcContinuationQueue.cs -./impl/ConnectionBase.cs -./impl/Session.cs -./impl/ContentHeaderBase.cs -./impl/WireFormatting.cs -./impl/MethodArgumentReader.cs -./impl/SimpleBlockingRpcContinuation.cs -./impl/QuiescingSession.cs -./impl/ContentHeaderPropertyWriter.cs -./impl/ChannelErrorException.cs -./impl/SoftProtocolException.cs -./impl/v0_9/Connection.cs -./impl/v0_9/ProtocolBase.cs -./impl/MethodArgumentWriter.cs -./impl/ShutdownContinuation.cs -./impl/SyntaxError.cs -./impl/HardProtocolException.cs -./impl/v0_8/Connection.cs -./impl/v0_8/ProtocolBase.cs -./impl/UnknownClassOrMethodException.cs -./impl/MainSession.cs -./impl/FileProperties.cs -./impl/BasicProperties.cs -./impl/ISession.cs -./impl/Command.cs -./impl/v0_8qpid/Connection.cs -./impl/v0_8qpid/ProtocolBase.cs -./impl/IRpcContinuation.cs -./impl/RedirectException.cs -./impl/SocketFrameHandler_0_9.cs -./impl/ProtocolException.cs -./impl/Frame.cs -./impl/MethodBase.cs -./impl/IFrameHandler.cs -./impl/CommandAssembler.cs -./impl/StreamProperties.cs -./content/BasicMessageReader.cs -./content/BytesWireFormatting.cs -./content/IMessageBuilder.cs -./content/StreamMessageBuilder.cs -./content/IMessageReader.cs -./content/IMapMessageReader.cs -./content/IBytesMessageBuilder.cs -./content/BasicMessageBuilder.cs -./content/StreamMessageReader.cs -./content/MapMessageReader.cs -./content/StreamWireFormatting.cs -./content/IMapMessageBuilder.cs -./content/PrimitiveParser.cs -./content/MapMessageBuilder.cs -./content/MapWireFormatting.cs -./content/IBytesMessageReader.cs -./content/IStreamMessageReader.cs -./content/IStreamMessageBuilder.cs -./content/BytesMessageBuilder.cs -./content/BytesMessageReader.cs -./api/SslHelper.cs -./api/IConnection.cs -./api/IModel.cs -./api/AmqpTimestamp.cs -./api/IFileProperties.cs -./api/PublicationAddress.cs -./api/QueueingBasicConsumer.cs -./api/AmqpVersion.cs -./api/IProtocol.cs -./api/IBasicConsumer.cs -./api/ExchangeType.cs -./api/AmqpTcpEndpoint.cs -./api/IBasicProperties.cs -./api/IContentHeader.cs -./api/IMethod.cs -./api/ShutdownReportEntry.cs -./api/ShutdownEventArgs.cs -./api/IStreamProperties.cs -./api/Protocols.cs -./api/ShutdownInitiator.cs -./api/DefaultBasicConsumer.cs -./api/SslOption.cs -./api/BinaryTableValue.cs -./api/ConnectionFactory.cs -../util/DebugUtil.cs -../util/NetworkBinaryReader.cs -../util/NetworkBinaryWriter.cs -../util/BlockingCell.cs -../util/Semaphore.cs -../util/Either.cs -../util/SharedQueue.cs -../util/XmlUtil.cs -../util/IntAllocator.cs +#include dll.sources ../../docs/specs/net_4_0-api-0-9.cs ../../docs/specs/net_4_0-api-0-8.cs ../../docs/specs/net_4_0-api-qpid-0-8.cs diff --git a/mcs/class/RabbitMQ.Client/src/client/net_4_5_RabbitMQ.Client.dll.sources b/mcs/class/RabbitMQ.Client/src/client/net_4_5_RabbitMQ.Client.dll.sources new file mode 100644 index 00000000000..09c33711cd3 --- /dev/null +++ b/mcs/class/RabbitMQ.Client/src/client/net_4_5_RabbitMQ.Client.dll.sources @@ -0,0 +1,4 @@ +#include dll.sources +../../docs/specs/net_4_5-api-0-9.cs +../../docs/specs/net_4_5-api-0-8.cs +../../docs/specs/net_4_5-api-qpid-0-8.cs diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile index 96b33a7397d..87bf95f690c 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile +++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile @@ -18,7 +18,7 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.ComponentModel.DataAnnotations.dll NO_INSTALL = yes diff --git a/mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources b/mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources new file mode 100644 index 00000000000..5bf540c53d3 --- /dev/null +++ b/mcs/class/System.ComponentModel.DataAnnotations/net_4_5_System.ComponentModel.DataAnnotations.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.ComponentModel.DataAnnotations.dll.sources diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile index a6a6439d88c..743008e82ba 100644 --- a/mcs/class/System.Configuration/Makefile +++ b/mcs/class/System.Configuration/Makefile @@ -9,7 +9,7 @@ LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security. TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) # This is a .NET 2.0+ only assembly -VALID_PROFILE := $(filter net_2_0 net_4_0_bootstrap net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0_bootstrap net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Configuration.dll NO_INSTALL = yes diff --git a/mcs/class/System.Core/net_4_5_System.Core.dll.sources b/mcs/class/System.Core/net_4_5_System.Core.dll.sources new file mode 100644 index 00000000000..7406bccf12b --- /dev/null +++ b/mcs/class/System.Core/net_4_5_System.Core.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Core.dll.sources diff --git a/mcs/class/System.Data.Linq/Makefile b/mcs/class/System.Data.Linq/Makefile index aeb7c345c43..ab32555196a 100755 --- a/mcs/class/System.Data.Linq/Makefile +++ b/mcs/class/System.Data.Linq/Makefile @@ -22,7 +22,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = src/DbLinq/Schema/Dbml/DbmlSchema.xsd # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Data.Linq.dll NO_INSTALL = yes diff --git a/mcs/class/System.Data.Services.Client/net_4_5_System.Data.Services.Client.dll.sources b/mcs/class/System.Data.Services.Client/net_4_5_System.Data.Services.Client.dll.sources new file mode 100644 index 00000000000..23c59ad14a2 --- /dev/null +++ b/mcs/class/System.Data.Services.Client/net_4_5_System.Data.Services.Client.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Data.Services.Client.dll.sources diff --git a/mcs/class/System.Data.Services/net_4_5_System.Data.Services.dll.sources b/mcs/class/System.Data.Services/net_4_5_System.Data.Services.dll.sources new file mode 100644 index 00000000000..c6388cc279f --- /dev/null +++ b/mcs/class/System.Data.Services/net_4_5_System.Data.Services.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Data.Services.dll.sources diff --git a/mcs/class/System.Dynamic/Makefile b/mcs/class/System.Dynamic/Makefile index 7327e2adccf..5e48b790702 100644 --- a/mcs/class/System.Dynamic/Makefile +++ b/mcs/class/System.Dynamic/Makefile @@ -6,5 +6,14 @@ LIBRARY = System.Dynamic.dll LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -r:System.Core.dll -r:System.dll -include ../../build/library.make +# This is a .NET 4.0+ only assembly +VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION)) +ifndef VALID_PROFILE +LIBRARY_NAME = dummy-System.Dynamic.dll +NO_INSTALL = yes +NO_SIGN_ASSEMBLY = yes +NO_TEST = yes +NO_BUILD = yes +endif +include ../../build/library.make diff --git a/mcs/class/System.IdentityModel.Selectors/Makefile b/mcs/class/System.IdentityModel.Selectors/Makefile index 310ca7768dd..d88fb810c4c 100755 --- a/mcs/class/System.IdentityModel.Selectors/Makefile +++ b/mcs/class/System.IdentityModel.Selectors/Makefile @@ -15,7 +15,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.IdentityModel.Selectors.dll NO_INSTALL = yes diff --git a/mcs/class/System.IdentityModel/Makefile b/mcs/class/System.IdentityModel/Makefile index 480e0ea0496..568dc7af52e 100644 --- a/mcs/class/System.IdentityModel/Makefile +++ b/mcs/class/System.IdentityModel/Makefile @@ -25,7 +25,7 @@ EXTRA_DISTFILES = \ Test/Resources/test.pfx \ Test/Resources/test2.pfx -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.IdentityModel.dll NO_INSTALL = yes diff --git a/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources new file mode 100644 index 00000000000..4560705d05c --- /dev/null +++ b/mcs/class/System.Runtime.Serialization/net_4_5_System.Runtime.Serialization.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Runtime.Serialization.dll.sources diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile index 42ae5a2683f..9580a20ac60 100644 --- a/mcs/class/System.Security/Makefile +++ b/mcs/class/System.Security/Makefile @@ -13,7 +13,7 @@ LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414 TEST_MCS_FLAGS += -nowarn:168,183,414 endif -VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE # @echo "** Warning: System.Security.dll built without parts that depend on: Mono.Security.dll " else diff --git a/mcs/class/System.ServiceModel.Web/net_4_5_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/net_4_5_System.ServiceModel.Web.dll.sources new file mode 100644 index 00000000000..f3aa56a14f8 --- /dev/null +++ b/mcs/class/System.ServiceModel.Web/net_4_5_System.ServiceModel.Web.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.ServiceModel.Web.dll.sources diff --git a/mcs/class/System.ServiceModel/net_4_5_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/net_4_5_System.ServiceModel.dll.sources new file mode 100644 index 00000000000..374ee6b4279 --- /dev/null +++ b/mcs/class/System.ServiceModel/net_4_5_System.ServiceModel.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.ServiceModel.dll.sources diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile index 0eb652f45a9..43ad21adeac 100644 --- a/mcs/class/System.Transactions/Makefile +++ b/mcs/class/System.Transactions/Makefile @@ -14,7 +14,7 @@ endif TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS) # This is a .NET 2.0+ only assembly -VALID_PROFILE := $(filter net_2_0 net_4_0 monotouch monodroid mobile, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid mobile, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Transactions.dll NO_INSTALL = yes diff --git a/mcs/class/System.Web.Abstractions/Makefile b/mcs/class/System.Web.Abstractions/Makefile index f305ced3049..10afc10c162 100644 --- a/mcs/class/System.Web.Abstractions/Makefile +++ b/mcs/class/System.Web.Abstractions/Makefile @@ -18,7 +18,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Web.Abstractions.dll NO_INSTALL = yes diff --git a/mcs/class/System.Web.Abstractions/net_4_5_System.Web.Abstractions.dll.sources b/mcs/class/System.Web.Abstractions/net_4_5_System.Web.Abstractions.dll.sources new file mode 100644 index 00000000000..32eb7efe09b --- /dev/null +++ b/mcs/class/System.Web.Abstractions/net_4_5_System.Web.Abstractions.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Web.Abstractions.dll.sources diff --git a/mcs/class/System.Web.ApplicationServices/net_4_5_System.Web.ApplicationServices.dll.sources b/mcs/class/System.Web.ApplicationServices/net_4_5_System.Web.ApplicationServices.dll.sources new file mode 100644 index 00000000000..dfacbe76b98 --- /dev/null +++ b/mcs/class/System.Web.ApplicationServices/net_4_5_System.Web.ApplicationServices.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Web.ApplicationServices.dll.sources diff --git a/mcs/class/System.Web.DynamicData/Makefile b/mcs/class/System.Web.DynamicData/Makefile index 83c6e04b77b..2f5843ab5a5 100644 --- a/mcs/class/System.Web.DynamicData/Makefile +++ b/mcs/class/System.Web.DynamicData/Makefile @@ -184,7 +184,7 @@ endif EXTRA_DISTFILES = $(foreach resource,$(TEST_RESOURCE_FILES), $(shell echo $(subst \`,\\\`,$(resource)) | cut -d ',' -f 1)) # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Web.DynamicData.dll NO_INSTALL = yes diff --git a/mcs/class/System.Web.Routing/Makefile b/mcs/class/System.Web.Routing/Makefile index 941668fbe87..01389b60424 100644 --- a/mcs/class/System.Web.Routing/Makefile +++ b/mcs/class/System.Web.Routing/Makefile @@ -23,7 +23,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) EXTRA_DISTFILES = # This is a .NET 3.5+ assembly -VALID_PROFILE := $(filter net_2_0 net_4_0, $(PROFILE)) +VALID_PROFILE := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) ifndef VALID_PROFILE LIBRARY_NAME = dummy-System.Web.Routing.dll NO_INSTALL = yes diff --git a/mcs/class/System.Web.Routing/net_4_5_System.Web.Routing.dll.sources b/mcs/class/System.Web.Routing/net_4_5_System.Web.Routing.dll.sources new file mode 100644 index 00000000000..7194672a8c4 --- /dev/null +++ b/mcs/class/System.Web.Routing/net_4_5_System.Web.Routing.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Web.Routing.dll.sources diff --git a/mcs/class/System.Web/net_4_5_System.Web.dll.sources b/mcs/class/System.Web/net_4_5_System.Web.dll.sources new file mode 100644 index 00000000000..40190ef13e3 --- /dev/null +++ b/mcs/class/System.Web/net_4_5_System.Web.dll.sources @@ -0,0 +1 @@ +#include net_4_0_System.Web.dll.sources diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 9ab57cd253b..c2ace9b4c13 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -26,8 +26,8 @@ TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -nowa ifneq (1, $(FRAMEWORK_VERSION_MAJOR)) LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%) TEST_MCS_FLAGS += -r:System.Configuration -PROFILE_2_OR_4 := $(filter net_2_0 net_4_0, $(PROFILE)) -NOT_SL := $(filter net_2_0 net_4_0 monotouch monodroid mobile, $(PROFILE)) +PROFILE_2_OR_4 := $(filter net_2_0 net_4_0 net_4_5, $(PROFILE)) +NOT_SL := $(filter net_2_0 net_4_0 net_4_5 monotouch monodroid mobile, $(PROFILE)) endif ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:INSIDE_SYSTEM diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile index 4d41657549b..d4cba321935 100644 --- a/mcs/class/aot-compiler/Makefile +++ b/mcs/class/aot-compiler/Makefile @@ -54,8 +54,9 @@ install-local: $(INSTALL_LIB) $(mcs_aot_image) $(DESTDIR)$(PROGRAM_INSTALL_DIR) endif -# No mcs in net 2.0 -ifeq ($(PROFILE),net_2_0) +# No mcs in net 2.0 or net 4.5 +MSCORLIB_PROFILE := $(filter net_2_0 net_4_5, $(PROFILE)) +ifdef MSCORLIB_PROFILE all-local: $(mscorlib_aot_image) install-local: $(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR) diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 8250332863b..59297ca6d7e 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -56,7 +56,7 @@ moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean endif if INSTALL_4_0 -build_profiles += net_4_0 +build_profiles += net_4_0 net_4_5 #test_profiles += net_4_0 endif |