[xbuild] Don't show the deprecation notice for minimal or quiet logging

[mono.git] / mcs / tools / xbuild / xbuild_test.make

diff --git a/mcs/tools/xbuild/xbuild_test.make b/mcs/tools/xbuild/xbuild_test.make
index 60ce6eb43d55aadc09f16ece69720a36e21d6d7d..4c503c060ac3b432270f45b7367477750751875d 100644 (file)
--- a/mcs/tools/xbuild/xbuild_test.make
+++ b/mcs/tools/xbuild/xbuild_test.make
@@ -9,7 +9,7 @@ export XBUILD_FRAMEWORK_FOLDERS_PATH= $(topdir)/class/Microsoft.Build/xbuild-tes
 ifeq (4.0, $(FRAMEWORK_VERSION))
 NO_TEST=true
 else
-test-local: copy-targets $(test_lib).config
+test-local: copy-targets Test/test-config-file-$(PROFILE)
 clean-local: clean-targets clean-test-config
 endif
 
@@ -17,17 +17,17 @@ 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_lib).config: $(XBUILD_DATA_DIR)/xbuild.exe.config.in
-       sed -e 's/@ASM_VERSION@/$(XBUILD_ASSEMBLY_VERSION)/g' $(XBUILD_DATA_DIR)/xbuild.exe.config.in > $(test_lib).config
+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)
 
 clean-test-config:
-       rm -f $(test_lib).config
+       rm -f Test/test-config-file-$(PROFILE)
 
 copy-targets: copy-targets-$(XBUILD_VERSION)
 
 clean-targets: clean-targets-$(XBUILD_VERSION)
 
-XBUILD_4_0_PROFILE_DIR=$(topdir)/class/lib/net_4_5
+XBUILD_4_0_PROFILE_DIR=$(topdir)/class/lib/net_4_x
 XBUILD_12_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_12
 XBUILD_14_0_PROFILE_DIR=$(topdir)/class/lib/xbuild_14
 
@@ -69,7 +69,7 @@ clean-targets-14.0:
 
 #allow tests to find older versions of libs and targets
 ifneq (4.0, $(XBUILD_VERSION))
-TEST_MONO_PATH := $(topdir)/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
+TEST_MONO_PATH := $(topdir)/class/lib/net_4_x$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)
 copy-targets: copy-targets-4.0
 clean-targets: clean-targets-4.0
 endif