Install 4.0 profile as developers package and make 4.5 profile default gac target for 4.x

29 files changed, 40 insertions, 36 deletions

diff --git a/mcs/Makefile b/mcs/Makefile
index cbdd7671425..9d095b3aa00 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -12,8 +12,8 @@ monodroid_SUBDIRS := build class
 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
+net_4_0_SUBDIRS := build class
+net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 
 # List of test subdirs that should pass 100%
 centum_tests := \
diff --git a/mcs/build/profiles/net_4_0.make b/mcs/build/profiles/net_4_0.make
index 4cf51db14a4..0a26e1b9a02 100644
--- a/mcs/build/profiles/net_4_0.make
+++ b/mcs/build/profiles/net_4_0.make
@@ -14,3 +14,5 @@ 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 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
 
 FRAMEWORK_VERSION = 4.0
+
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
diff --git a/mcs/build/profiles/net_4_5.make b/mcs/build/profiles/net_4_5.make
index b869afb1ebc..ff3f106cbbc 100644
--- a/mcs/build/profiles/net_4_5.make
+++ b/mcs/build/profiles/net_4_5.make
@@ -13,4 +13,4 @@ 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
+FRAMEWORK_VERSION = 4.5
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 592ed3ead64..796111b8184 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -185,7 +185,9 @@ net_4_0_dirs := \
 	WebMatrix.Data \
 	System.Data.Services.Client	\
 	System.Data.Services	\
-	System.Json \
+	System.Json
+
+net_4_5_dirs := \
 	System.Threading.Tasks.Dataflow
 
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler
@@ -194,8 +196,8 @@ monodroid_SUBDIRS := $(mobile_dirs)
 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
+net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
+net_4_5_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) aot-compiler
 
 include ../build/rules.make
 
diff --git a/mcs/class/Microsoft.Build/Makefile b/mcs/class/Microsoft.Build/Makefile
index 0fde3045153..74e14491def 100644
--- a/mcs/class/Microsoft.Build/Makefile
+++ b/mcs/class/Microsoft.Build/Makefile
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = Microsoft.Build.dll
 
-ifneq (4.0, $(FRAMEWORK_VERSION))
+ifneq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIBRARY_NAME = dummy-Microsoft.Build.dll
 NO_INSTALL = yes
 NO_TEST = yes
diff --git a/mcs/class/Microsoft.Web.Infrastructure/Makefile b/mcs/class/Microsoft.Web.Infrastructure/Makefile
index 5fdef6326f2..74be7001329 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Makefile
+++ b/mcs/class/Microsoft.Web.Infrastructure/Makefile
@@ -9,7 +9,7 @@ LIB_MCS_FLAGS = -r:System.dll \
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-Microsoft.Web.Infrastructure.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.ComponentModel.Composition/Makefile b/mcs/class/System.ComponentModel.Composition/Makefile
index a1bf0daba60..a039de61fec 100644
--- a/mcs/class/System.ComponentModel.Composition/Makefile
+++ b/mcs/class/System.ComponentModel.Composition/Makefile
@@ -12,7 +12,7 @@ CLEAN_FILES += $(STRING_MESSAGES)
 EXTRA_DISTFILES = \
 	src/ComponentModel/Strings.resx
 	
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index ffc843a60ba..383201c4feb 100644
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -14,12 +14,12 @@ ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:CODEPLEX_40 -d:SILVERLIGHT
 endif
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_MCS_FLAGS += -d:CODEPLEX_40
 endif
 
 ifneq (basic, $(PROFILE))
-CLR_PROFILE := $(filter 2.0 4.0, $(FRAMEWORK_VERSION))
+CLR_PROFILE := $(filter 2.0 4.0 4.5, $(FRAMEWORK_VERSION))
 endif
 
 ifdef CLR_PROFILE
@@ -29,7 +29,7 @@ endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2.0 2.1 4.0 4.5, $(FRAMEWORK_VERSION))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Core.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Json/Makefile b/mcs/class/System.Json/Makefile
index 92b672d587c..906b0bf48f1 100644
--- a/mcs/class/System.Json/Makefile
+++ b/mcs/class/System.Json/Makefile
@@ -13,7 +13,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Json.dll
diff --git a/mcs/class/System.Net/Makefile b/mcs/class/System.Net/Makefile
index 1267fe51925..9cd320df3be 100644
--- a/mcs/class/System.Net/Makefile
+++ b/mcs/class/System.Net/Makefile
@@ -13,7 +13,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Net.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile
index 2e6dea125d5..360fdf9faa7 100644
--- a/mcs/class/System.Numerics/Makefile
+++ b/mcs/class/System.Numerics/Makefile
@@ -8,7 +8,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Numerics.dll
diff --git a/mcs/class/System.Runtime.Caching/Makefile b/mcs/class/System.Runtime.Caching/Makefile
index e72dfce0e5f..4d2b3037d69 100644
--- a/mcs/class/System.Runtime.Caching/Makefile
+++ b/mcs/class/System.Runtime.Caching/Makefile
@@ -12,7 +12,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Runtime.Caching.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Runtime.DurableInstancing/Makefile b/mcs/class/System.Runtime.DurableInstancing/Makefile
index 4b7e9d16f9e..4a4934ccdd9 100644
--- a/mcs/class/System.Runtime.DurableInstancing/Makefile
+++ b/mcs/class/System.Runtime.DurableInstancing/Makefile
@@ -9,7 +9,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 2.0 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2.0 4.0 4.5, $(FRAMEWORK_VERSION))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Runtime.DurableInstancing.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Runtime.Serialization/Makefile b/mcs/class/System.Runtime.Serialization/Makefile
index cf574ae7292..1ddb2499905 100644
--- a/mcs/class/System.Runtime.Serialization/Makefile
+++ b/mcs/class/System.Runtime.Serialization/Makefile
@@ -24,7 +24,7 @@ EXTRA_DISTFILES = $(RESOURCE_FILES) \
 	Test/Resources/Schemas/*.xsd \
 	Test/System.Runtime.Serialization/one.xml
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Runtime.Serialization.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.ServiceModel.Discovery/Makefile b/mcs/class/System.ServiceModel.Discovery/Makefile
index de570d08739..8b6932e7084 100644
--- a/mcs/class/System.ServiceModel.Discovery/Makefile
+++ b/mcs/class/System.ServiceModel.Discovery/Makefile
@@ -14,7 +14,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.Discovery.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.ServiceModel.Routing/Makefile b/mcs/class/System.ServiceModel.Routing/Makefile
index a90da75f695..5e0856dc290 100644
--- a/mcs/class/System.ServiceModel.Routing/Makefile
+++ b/mcs/class/System.ServiceModel.Routing/Makefile
@@ -14,7 +14,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.Routing.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.ServiceModel.Web/Makefile b/mcs/class/System.ServiceModel.Web/Makefile
index 1dd0795f9e7..f58657f7769 100644
--- a/mcs/class/System.ServiceModel.Web/Makefile
+++ b/mcs/class/System.ServiceModel.Web/Makefile
@@ -17,7 +17,7 @@ EXTRA_DISTFILES = $(RESOURCE_FILES) \
 	Test/config/webHttpBinding \
 	Test/config/webHttpBinding.config
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.Web.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index 2e4a8481399..3b903127dc9 100755
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -53,7 +53,7 @@ EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_EXTRA_FILES)
 # Useful for debugging under Visual Studio 2005
 # NO_SIGN_ASSEMBLY = yes
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ServiceModel.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Web.ApplicationServices/Makefile b/mcs/class/System.Web.ApplicationServices/Makefile
index 57f271b8c9f..8601fc475e3 100644
--- a/mcs/class/System.Web.ApplicationServices/Makefile
+++ b/mcs/class/System.Web.ApplicationServices/Makefile
@@ -9,7 +9,7 @@ LIB_MCS_FLAGS = -r:System.dll \
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Web.ApplicationServices.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Windows.Forms.DataVisualization/Makefile b/mcs/class/System.Windows.Forms.DataVisualization/Makefile
index 538bdda6912..b076ebdfa1f 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/Makefile
+++ b/mcs/class/System.Windows.Forms.DataVisualization/Makefile
@@ -8,7 +8,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 

 EXTRA_DISTFILES =

 

-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))

+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))

 

 ifndef VALID_PROFILE

 LIBRARY_NAME = dummy-System.Windows.Forms.DataVisualization.dll

diff --git a/mcs/class/System.Xaml/Makefile b/mcs/class/System.Xaml/Makefile
index 8aa4c705eb0..04ad2dda799 100644
--- a/mcs/class/System.Xaml/Makefile
+++ b/mcs/class/System.Xaml/Makefile
@@ -18,7 +18,7 @@ TEST_EXTRA_DISTFILES = \
 	Test/XmlFiles/*.xml \
 	Test/XmlFiles/*.xaml
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xaml.dll
 NO_INSTALL = yes
diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile
index c6ae6d9ab2f..65bdd81ee2f 100644
--- a/mcs/class/System.Xml.Linq/Makefile
+++ b/mcs/class/System.Xml.Linq/Makefile
@@ -17,7 +17,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES =
 
-VALID_PROFILE := $(filter 2.0 2.1 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Xml.Linq.dll
 NO_INSTALL = yes
diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile
index 3c4aa8d6529..804fc21e31b 100644
--- a/mcs/class/WindowsBase/Makefile
+++ b/mcs/class/WindowsBase/Makefile
@@ -9,8 +9,8 @@ TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll
 ifeq (2.0, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_0
 endif
-ifeq (4.0, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:NET_4_0 -r:System.Xaml.dll
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS += -r:System.Xaml.dll
 TEST_MCS_FLAGS += -r:System.Xaml.dll
 endif
 
diff --git a/mcs/class/aot-compiler/Makefile b/mcs/class/aot-compiler/Makefile
index d4cba321935..7dc1276ec0e 100644
--- a/mcs/class/aot-compiler/Makefile
+++ b/mcs/class/aot-compiler/Makefile
@@ -46,7 +46,7 @@ all-local: $(mscorlib_aot_image) $(mcs_aot_image)
 install-local:
 endif
 
-ifeq ($(PROFILE),net_4_0)
+ifeq ($(PROFILE), $(DEFAULT_PROFILE))
 all-local: $(mscorlib_aot_image) $(mcs_aot_image)
 install-local:
 	$(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
@@ -54,8 +54,8 @@ install-local:
 	$(INSTALL_LIB) $(mcs_aot_image) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 endif
 
-# No mcs in net 2.0 or net 4.5
-MSCORLIB_PROFILE := $(filter net_2_0 net_4_5, $(PROFILE))
+# No mcs in net 2.0
+MSCORLIB_PROFILE := $(filter net_2_0, $(PROFILE))
 ifdef MSCORLIB_PROFILE
 all-local: $(mscorlib_aot_image)
 install-local:
diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 3524c5987d9..9ccd2a356b8 100644
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -22,7 +22,7 @@ endif
 
 LOCAL_MCS_FLAGS += -d:STATIC,NO_SYMBOL_WRITER
 
-PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.0
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/4.5
 
 PROGRAM_COMPILE = $(BOOT_COMPILE)
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f12dc4e1660..320acbe24da 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -190,7 +190,7 @@ REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g
 REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
 if INSTALL_4_0
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
+REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
 else
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 endif
diff --git a/scripts/dmcs.in b/scripts/dmcs.in
index c29558f4f31..716c1acad1c 100644
--- a/scripts/dmcs.in
+++ b/scripts/dmcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.0/mcs.exe -sdk:4 "$@"
+mcs -sdk:4 "$@"
diff --git a/scripts/gmcs.in b/scripts/gmcs.in
index 0afd30d5d30..df33e6cfec2 100644
--- a/scripts/gmcs.in
+++ b/scripts/gmcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.0/mcs.exe -sdk:2 "$@"
+mcs -sdk:2 "$@"
diff --git a/scripts/mcs.in b/scripts/mcs.in
index 4186c10c32c..d254e29c7b7 100644
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.0/mcs.exe "$@"
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/4.5/mcs.exe "$@"