Add missing assembly references to test targets

mono · Apr 5, 2012 · 9a8e03a · 9a8e03a
1 parent 79959d9
commit 9a8e03a
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile
@@ -25,7 +25,8 @@ LIB_MCS_FLAGS = \
 
 TEST_MCS_FLAGS = \
 	/r:$(BUILD_FRAMEWORK)	\
-	/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
+	/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
+	/r:System.Xml.dll
 
 EXTRA_DISTFILES = \
 	Test/resources/TestTasks.cs		\

diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile
@@ -31,7 +31,8 @@ LIB_MCS_FLAGS = \
 TEST_MCS_FLAGS = \
 	/r:$(BUILD_ENGINE)	\
 	/r:$(BUILD_FRAMEWORK)	\
-	/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll
+	/r:Microsoft.Build.Utilities$(NAME_SUFFIX).dll \
+	/r:System.Core.dll
 
 EXTRA_DISTFILES = \
 	Test/resources/test.cs \

diff --git a/mcs/class/Mono.CSharp/Makefile b/mcs/class/Mono.CSharp/Makefile
@@ -4,7 +4,9 @@ include ../../build/rules.make
 
 LIBRARY = Mono.CSharp.dll
 
-LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml -r:System
+LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll
+
+TEST_MCS_FLAGS = -r:System.Core.dll
 
 include ../../build/library.make
 
diff --git a/mcs/class/Mono.CodeContracts/Makefile b/mcs/class/Mono.CodeContracts/Makefile
@@ -4,7 +4,9 @@ include ../../build/rules.make
 
 LIBRARY = Mono.CodeContracts.dll
 
-LIB_MCS_FLAGS = -r:System -r:System.Core -r:Mono.Cecil.dll -r:Mono.Cecil.Mdb.dll 
+LIB_MCS_FLAGS = -r:System.dll -r:System.Core.dll -r:Mono.Cecil.dll -r:Mono.Cecil.Mdb.dll 
 #-r:Mono.Cecil.Pdb.dll
 
+TEST_MCS_FLAGS = -r:System.Core.dll
+
 include ../../build/library.make
diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixGroupTest.cs
@@ -12,7 +12,6 @@
 using System;
 using System.Configuration;
 using System.Diagnostics;
-using System.Xml;
 
 using Mono.Unix;
 

diff --git a/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs b/mcs/class/Mono.Posix/Test/Mono.Unix/UnixUserTest.cs
@@ -12,7 +12,6 @@
 using System;
 using System.Configuration;
 using System.Diagnostics;
-using System.Xml;
 using System.Collections;
 
 using Mono.Unix;

diff --git a/mcs/class/System.Data.Services/Makefile b/mcs/class/System.Data.Services/Makefile
@@ -12,6 +12,6 @@ LIB_MCS_FLAGS = \
 	-r:System.ServiceModel.Web.dll \
 	-r:System.Data.Services.Client.dll
 
-TEST_MCS_FLAGS += -r:System.ServiceModel
+TEST_MCS_FLAGS = -r:System.ServiceModel.dll -r:System.Core.dll
 
 include ../../build/library.make
diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile
@@ -44,7 +44,7 @@ LIB_MCS_FLAGS += \
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.Core.dll -nowarn:618,169,612,219,168
 
 TEST_MONO_PATH = .
 

diff --git a/mcs/class/System.Design/Makefile b/mcs/class/System.Design/Makefile
@@ -4,25 +4,20 @@ include ../../build/rules.make
 
 LIBRARY = System.Design.dll
 
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
-
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-
 DRAWING_DESIGN_DEP := System.Drawing.Design.dll
 DRAWING_DESIGN_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(DRAWING_DESIGN_DEP))
 CYCLIC_DEPS := $(DRAWING_DESIGN_DEP)
 CYCLIC_DEP_FILES := $(DRAWING_DESIGN_DEP_FILE)
-endif
 
 
 LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Web.dll \
 	-r:System.Windows.Forms.dll -r:System.Drawing.dll \
-	-r:Accessibility.dll -r:System.Data.dll
-
-ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
-LIB_MCS_FLAGS += -r:System.Configuration.dll
-endif
+	-r:Accessibility.dll -r:System.Data.dll \
+	-r:System.Configuration.dll
+
+TEST_MCS_FLAGS = /r:System.dll
 
 ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
 NO_SIGN_ASSEMBLY = yes

diff --git a/mcs/class/System.Web.DynamicData/Makefile b/mcs/class/System.Web.DynamicData/Makefile
@@ -175,7 +175,8 @@ TEST_RESOURCE_FILES = \
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -r:System.ComponentModel.DataAnnotations.dll -r:System.Configuration.dll \
+	$(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll -r:System.Xml.dll
 
 ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 TEST_MCS_FLAGS += -r:System.Web.ApplicationServices.dll

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
@@ -26,7 +26,7 @@ endif
 ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK
 endif
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll
 
 ifeq (2.0, $(FRAMEWORK_VERSION))
 # Happens on net_2_0_bootstrap and net_2_0 profiles

diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile
@@ -3,8 +3,8 @@ include ../../build/rules.make
 
 LIBRARY = WindowsBase.dll
 
-LIB_MCS_FLAGS = -unsafe -r:System -r:System.Xml
-TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll
+LIB_MCS_FLAGS = -unsafe -r:System.dll -r:System.Xml.dll
+TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll -r:System.dll -r:System.Xml.dll -r:System.Core.dll
 
 ifeq (2.0, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:NET_3_0