Merge pull request #498 from Unroll-Me/master

[mono.git] / mcs / class / System.ServiceModel / Makefile

diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index 3e4763cf5805f8104984aad44574fb1d6a473f6a..1aaf90fae44cf7210f605f6816acee19aeaa6187 100755 (executable)
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -8,9 +8,9 @@ RESOURCE_FILES = \
 
 LIBRARY = System.ServiceModel.dll
 LIB_MCS_FLAGS = \
-               /d:USE_DATA_CONTRACT_IMPORTER \
                /nowarn:414,169,67,3005,436,219,618 \
                /unsafe \
+               /d:TRACE \
                /r:System.dll \
                /r:System.Xml.dll \
                /r:System.Core.dll \
@@ -45,14 +45,18 @@ TEST_EXTRA_FILES = \
        System.ServiceModel_test_net_3_0.dll.config \
        Test/config/* \
        Test/Resources/* \
-       Test/System.ServiceModel.Description/dump.xml
+       Test/XmlFiles/* \
+       Test/System.ServiceModel.Channels/soap-fault*.xml \
+       Test/System.ServiceModel.Channels/binary-message.raw \
+       Test/System.ServiceModel.Description/dump.xml \
+       Test/MetadataTests/Resources/*
 
 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