[bcl] Clean up FRAMEWORK_VERSION 4.0 and 2.0 checks (#5356)
authorAlexander Köplinger <alex.koeplinger@outlook.com>
Fri, 11 Aug 2017 14:22:02 +0000 (16:22 +0200)
committerGitHub <noreply@github.com>
Fri, 11 Aug 2017 14:22:02 +0000 (16:22 +0200)
We don't build those profiles anymore, we have a net_4_x configuration instead.

26 files changed:
mcs/build/profiles/basic.make
mcs/class/System.Core/Makefile
mcs/class/System.Data.Linq/src/DbLinq/System.Data.Linq/Makefile
mcs/class/System.Runtime.DurableInstancing/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_01/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_02/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_03/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_04/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_05/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_06/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_07/Makefile
mcs/class/System.Web/Test/standalone/ApplicationPreStartMethods/test_08/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_01/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_02/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_03/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_04/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_05/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_06/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_07/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_08/Makefile
mcs/class/System.Web/Test/standalone/EnableFormsAuthentication/Test_09/Makefile
mcs/class/System.Web/Test/standalone/PageParserDefaultTypeProperties/Makefile
mcs/class/System.Web/Test/standalone/RegisterBuildProvider/Makefile
mcs/class/WindowsBase/Makefile
mcs/tools/xbuild/Makefile
mcs/tools/xbuild/xbuild_test.make

index ef393d92d0309bb5ebd7b36944b07d07d804ab76..a76de22836f059a3a5a1d7b286f78571036a907e 100644 (file)
@@ -34,7 +34,7 @@ PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_B
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
-FRAMEWORK_VERSION = 4.0
+FRAMEWORK_VERSION = 4.5
 
 # Compiler all using same bootstrap compiler
 LIBRARY_COMPILE = $(BOOT_COMPILE)
index ac79cff1623b5bbdfb8b26248207ad598f7a864f..7ac0624eafbb769e621f89c5c99683a689c85782 100644 (file)
@@ -34,12 +34,10 @@ LIB_MCS_FLAGS += -d:FULL_AOT_RUNTIME
 endif
 
 ifneq (basic, $(PROFILE))
-CLR_PROFILE := $(filter 2.0 4.0 4.5, $(FRAMEWORK_VERSION))
-endif
-
-ifdef CLR_PROFILE
+ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_REFS += Mono.Posix
 endif
+endif
 
 CC_PROFILE := $(filter monotouch% xammac, $(PROFILE))
 ifdef CC_PROFILE
index 20cc4b10bcaaac3e71ec797506343db1540e87e1..13bea782425e2c83a3db6fda2de69dc449bdbb38 100644 (file)
@@ -9,9 +9,4 @@ LIB_MCS_FLAGS =
 
 NO_TEST = yes
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5
-endif
-
 include ../../build/library.make
index eb1233ff7c8bd6c06cf3b9feed0912ab410d1cb8..e3369f2d139995fac4a685c691ebfbbbe7a4221d 100644 (file)
@@ -16,8 +16,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 EXTRA_DISTFILES = $(RESOURCE_FILES)
 
-VALID_PROFILE := $(filter 2.0 4.0 4.5, $(FRAMEWORK_VERSION))
-ifndef VALID_PROFILE
+ifneq (4.5, $(FRAMEWORK_VERSION))
 LIBRARY_NAME = dummy-System.Runtime.DurableInstancing.dll
 NO_INSTALL = yes
 NO_SIGN_ASSEMBLY = yes
index 1c82c534157d9c9681ea8b2396e5b1394040f389..b40292afb4874465cd41951bb5eea7a4946629eb 100644 (file)
@@ -24,7 +24,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 3910e0042044541622d94681506107e649bfb186..7b4716e23dc96ab67fc7840d1a605d14b93279c5 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index cf8e0f5f7436315b6140b24a9fba1d0b393b288a..f83a2bae241c479f586fd62a9dae202eb9a66adf 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index ff0172cd7a46c627e942382ee89d8a9ab30f5bae..ec8ceca2bda88bb0525210a7933c5552fdadae04 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index f9c8780885edc85afc11794dd5d466e738a9626b..b805579fcb6267fe680ddefc11d1b64be9d0266f 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index a1b5012d9a22f717ae7adc175d3127c2b606f0e7..f87fe645151d89347baee268357d268edd24b551 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 610338580885f72906b064ad59eed6eb13b11bef..b23bc982b3d5cbd2911cc4a1aec6e652fb71c06b 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index ba345317aaf6982e755ddb27f9490819e9e3e931..a41268321363bc01c912becdc7743e31db1582f9 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 17464eb5c6a05e43297852574e80a9c9afd01908..f0d1399fa1ecff1a4bc1f3385f67e9993fc989eb 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 5ebdf8d62b2a68d8d255851648db96b495d7d398..267882d694a3ae5a12427106682c56420bd01ddc 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index a1c22ea4a648645d8f09bb994f025cf01b1ccbee..eed4f1273a38d58ad73342a720866c23ff079bd0 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index ed1c11f82a0ab3ffb956805dc2d5501d9194e4e4..8c721a8d73a1242f35047cfdd82cd7bb78c63521 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 1c62f879d545e64f8e16f09f85c5785e47f203ee..264c7feff452f6662f95b27e955b35493544cdb8 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 0b88be3c34d822e278c2d83f158cfa204141aa75..a9dc48eb787f7c6caa0c4723343274e8a775e19a 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index d912fce274e92fc63f91e6b431c8ca8f11b6188f..fb0fd1e3410a95e85c23588a6e934d5295084f9f 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 667e288b3e880196e95dd3623b29083a43940eff..71a45db3a6e9df484cb703b859abadbaedf73f7e 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 228532c1b45d9aa47aca7d4141523dbfe708c74b..8a259651aaf5080628b6a272b6b7cf093cc150fd 100644 (file)
@@ -12,7 +12,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 34938ef1d1734b9b9ee0b344ed7318f1cc969429..a75e30d792600f832a501d3187951ed609a2d71e 100644 (file)
@@ -13,7 +13,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index 0809ee737b6e3904f44c77aef225ee33a7148f44..f0452d73e63deba5ae70224b7760453227b54e23 100644 (file)
@@ -14,7 +14,7 @@ APPLICATION_ASSEMBLY_MCS_FLAGS = \
        -debug:full \
        -r:System.Web.dll
 
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4.5, $(FRAMEWORK_VERSION))
 
 ifndef VALID_PROFILE
 all:
index a6b99082151893bb6cadf9fce5595d7f9aadc0af..05c2e6e20153622c0bbd36407db280a5556e87ae 100644 (file)
@@ -9,9 +9,6 @@ LIB_MCS_FLAGS = -unsafe -nowarn:67,618
 TEST_MCS_FLAGS = -unsafe
 TEST_LIB_REFS = WindowsBase System System.Xml System.Core System.IO.Compression
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -d:NET_3_0
-endif
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 LIB_REFS += System.Xaml
 TEST_LIB_REFS += System.Xaml
index 93d925ff273209a3a0b07647061c2ad33cf8ece2..406829f8021e462580eb1fbdd272df99a1602f0f 100644 (file)
@@ -14,11 +14,7 @@ include ../../build/executable.make
 XBUILD_DIR=.
 include $(XBUILD_DIR)/xbuild_test.make
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
-install-local: xbuild-net4-fail
-else
 install-local: install-extras
-endif
 
 PORTABLE_TARGETS_SRC:=data/Portable/Targets
 PCL5_FX_SRC:=data/Portable/Frameworks/v5.0
index 4c503c060ac3b432270f45b7367477750751875d..d7488d66411dac1f15bbd594867b2a8ab6e68363 100644 (file)
@@ -6,16 +6,8 @@ export TESTING_MONO=a
 export MSBuildExtensionsPath=$(XBUILD_DATA_DIR)
 export XBUILD_FRAMEWORK_FOLDERS_PATH= $(topdir)/class/Microsoft.Build/xbuild-testing
 
-ifeq (4.0, $(FRAMEWORK_VERSION))
-NO_TEST=true
-else
 test-local: copy-targets Test/test-config-file-$(PROFILE)
 clean-local: clean-targets clean-test-config
-endif
-
-xbuild-net4-fail:
-       @echo "The net_4_0 profile contains reference assemblies only and cannot be installed/tested as an xbuild toolset"
-       @exit 1
 
 Test/test-config-file-$(PROFILE): $(XBUILD_DATA_DIR)/xbuild.exe.config_test.in
        sed -e 's/@ASM_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' $(XBUILD_DATA_DIR)/xbuild.exe.config_test.in > Test/test-config-file-$(PROFILE)