diff options
39 files changed, 97 insertions, 102 deletions
diff --git a/docs/docs.make b/docs/docs.make index f0b97990356..aaef10a8cea 100644 --- a/docs/docs.make +++ b/docs/docs.make @@ -13,10 +13,10 @@ ASSEMBLED_DOCS = \ monoapi.tree monoapi.zip convert.exe: $(srcdir)/convert.cs AgilityPack.dll - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll AgilityPack.dll: - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs monoapi.zip: monoapi.tree @test -f $@ || { rm -f $< && $(MAKE) $<; } diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 7ac941ca839..5a39dd9501a 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -42,15 +42,17 @@ executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_ makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag +LIB_REFS_ALL = $(DEFAULT_REFERENCES) $(LIB_REFS) + ifdef TARGET_NET_REFERENCE -# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir -LIB_REFS_MONO = $(call _FILTER_OUT,System,$(LIB_REFS)) -LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS)) +# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir +LIB_REFS_MONO = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_ALL))) +LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS_ALL)) MCS_REFERENCES = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM)) MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO)) else -MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS)) +MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_ALL)) endif ifdef KEYFILE diff --git a/mcs/build/library.make b/mcs/build/library.make index e7e1a556ccc..5accc87be0a 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -18,19 +18,19 @@ # Have to rename to handle differences between assembly/directory names DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS)) -LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS)) +LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS)) $(DEFAULT_REFERENCES) LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS)) ifdef TARGET_NET_REFERENCE -# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir -LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(LIB_REFS_FULL)) +# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir +LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_FULL))) LIB_REFS_MONO_ALIAS = $(call _FILTER_OUT,System,$(LIB_REFS_ALIAS)) -LIB_REFS_SYSTEM_FULL = $(filter-out $(LIB_REFS_MONO_FULL),$(LIB_REFS_FULL)) -LIB_REFS_SYSTEM_ALIAS = $(filter-out $(LIB_REFS_MONO_ALIAS),$(LIB_REFS_ALIAS)) +LIB_REFS_NET_FULL = $(filter-out $(LIB_REFS_MONO_FULL),$(LIB_REFS_FULL)) +LIB_REFS_NET_ALIAS = $(filter-out $(LIB_REFS_MONO_ALIAS),$(LIB_REFS_ALIAS)) -LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM_FULL)) -LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/,$(LIB_REFS_SYSTEM_ALIAS))) +LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_NET_FULL)) +LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/,$(LIB_REFS_NET_ALIAS))) LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO_FULL)) LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_MONO_ALIAS))) diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make index 347b313308c..ce0c87729bc 100644 --- a/mcs/build/profiles/basic.make +++ b/mcs/build/profiles/basic.make @@ -28,9 +28,9 @@ endif MCS = $(BOOTSTRAP_MCS) -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib API_BIN_PROFILE = v4.7.1 NO_SIGN_ASSEMBLY = yes diff --git a/mcs/build/profiles/build.make b/mcs/build/profiles/build.make index d757d10b1c8..3c4339b8248 100644 --- a/mcs/build/profiles/build.make +++ b/mcs/build/profiles/build.make @@ -13,8 +13,8 @@ PLATFORMS = darwin linux win32 profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) +DEFAULT_REFERENCES = mscorlib +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib API_BIN_PROFILE = v4.7.1 NO_SIGN_ASSEMBLY = yes diff --git a/mcs/build/profiles/monodroid.make b/mcs/build/profiles/monodroid.make index 572bf609c1f..32ee046e70d 100644 --- a/mcs/build/profiles/monodroid.make +++ b/mcs/build/profiles/monodroid.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -24,7 +24,6 @@ PROFILE_MCS_FLAGS = \ -d:ANDROID \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monodroid diff --git a/mcs/build/profiles/monodroid_tools.make b/mcs/build/profiles/monodroid_tools.make index 27cb67b9ffa..721d7023a64 100644 --- a/mcs/build/profiles/monodroid_tools.make +++ b/mcs/build/profiles/monodroid_tools.make @@ -9,9 +9,9 @@ profile-check: @: TARGET_NET_REFERENCE = v4.6 -DEFAULT_REFERENCES = -r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib -PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) +PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) FRAMEWORK_VERSION = 4.5 diff --git a/mcs/build/profiles/monotouch_runtime.make b/mcs/build/profiles/monotouch_runtime.make index 1c29216802d..72855de893e 100644 --- a/mcs/build/profiles/monotouch_runtime.make +++ b/mcs/build/profiles/monotouch_runtime.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ -d:NET_2_0 \ @@ -24,7 +24,6 @@ PROFILE_MCS_FLAGS = \ -d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) \ $(MONOTOUCH_MCS_FLAGS) diff --git a/mcs/build/profiles/net_4_x.make b/mcs/build/profiles/net_4_x.make index 5463812acc6..c9f491ed1d1 100644 --- a/mcs/build/profiles/net_4_x.make +++ b/mcs/build/profiles/net_4_x.make @@ -12,8 +12,8 @@ PLATFORMS = darwin linux win32 profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) +DEFAULT_REFERENCES = mscorlib +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = v4.7.1 FRAMEWORK_VERSION = 4.5 diff --git a/mcs/build/profiles/orbis.make b/mcs/build/profiles/orbis.make index 20493d50374..9c77cc23bf0 100644 --- a/mcs/build/profiles/orbis.make +++ b/mcs/build/profiles/orbis.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -26,7 +26,6 @@ PROFILE_MCS_FLAGS = \ -d:DISABLE_COM \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/testing_aot_full.make b/mcs/build/profiles/testing_aot_full.make index 17974225781..5647e89af2c 100644 --- a/mcs/build/profiles/testing_aot_full.make +++ b/mcs/build/profiles/testing_aot_full.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -25,7 +25,6 @@ PROFILE_MCS_FLAGS = \ -d:DISABLE_COM \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/testing_aot_hybrid.make b/mcs/build/profiles/testing_aot_hybrid.make index 6b7dff61245..b1c1e9675b2 100644 --- a/mcs/build/profiles/testing_aot_hybrid.make +++ b/mcs/build/profiles/testing_aot_hybrid.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -22,7 +22,6 @@ PROFILE_MCS_FLAGS = \ -d:MONO \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/unreal.make b/mcs/build/profiles/unreal.make index 18a77474bdf..9eeb3ebadd1 100644 --- a/mcs/build/profiles/unreal.make +++ b/mcs/build/profiles/unreal.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -22,7 +22,6 @@ PROFILE_MCS_FLAGS = \ -d:MONO \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/wasm.make b/mcs/build/profiles/wasm.make index 3c7089cb4b2..a01d3a8c6ed 100644 --- a/mcs/build/profiles/wasm.make +++ b/mcs/build/profiles/wasm.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -27,7 +27,6 @@ PROFILE_MCS_FLAGS = \ -d:FEATURE_NO_BSD_SOCKETS \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/winaot.make b/mcs/build/profiles/winaot.make index 30cf6733156..e480bff1e19 100644 --- a/mcs/build/profiles/winaot.make +++ b/mcs/build/profiles/winaot.make @@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -26,7 +26,6 @@ PROFILE_MCS_FLAGS = \ -d:WIN_PLATFORM \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) API_BIN_PROFILE = build/monotouch diff --git a/mcs/build/profiles/xammac.make b/mcs/build/profiles/xammac.make index e3d007ecb33..ee0b9fd9e31 100644 --- a/mcs/build/profiles/xammac.make +++ b/mcs/build/profiles/xammac.make @@ -6,7 +6,7 @@ MCS = $(BOOTSTRAP_MCS) profile-check: @: -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll +DEFAULT_REFERENCES = mscorlib PROFILE_MCS_FLAGS = \ -d:NET_1_1 \ @@ -23,7 +23,6 @@ PROFILE_MCS_FLAGS = \ -d:XAMARIN_MODERN \ -nowarn:1699 \ -nostdlib \ - $(DEFAULT_REFERENCES) \ $(PLATFORM_DEBUG_FLAGS) \ $(XAMMAC_MCS_FLAGS) diff --git a/mcs/build/profiles/xammac_net_4_5.make b/mcs/build/profiles/xammac_net_4_5.make index fbc8d3592f3..0bc73ed9208 100644 --- a/mcs/build/profiles/xammac_net_4_5.make +++ b/mcs/build/profiles/xammac_net_4_5.make @@ -1,6 +1,6 @@ include $(topdir)/build/profiles/net_4_x.make -PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) \ +PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) \ -d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \ -d:NO_SYSTEM_DRAWING_DEPENDENCY \ -d:NO_WINFORMS_DEPENDENCY \ diff --git a/mcs/build/profiles/xbuild_12.make b/mcs/build/profiles/xbuild_12.make index 2e66d59b310..842e64a2e02 100644 --- a/mcs/build/profiles/xbuild_12.make +++ b/mcs/build/profiles/xbuild_12.make @@ -5,7 +5,7 @@ include $(topdir)/build/profiles/net_4_x.make PLATFORMS:= PARENT_PROFILE = ../net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/ -DEFAULT_REFERENCES = -r:$(topdir)/class/lib/net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/mscorlib.dll +DEFAULT_REFERENCES = ../net_4_x/mscorlib PROFILE_MCS_FLAGS += -d:XBUILD_12 XBUILD_VERSION = 12.0 diff --git a/mcs/build/tests.make b/mcs/build/tests.make index 3f31866ddd6..63ecdd818a4 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -42,8 +42,8 @@ xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$ xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll) xunit_libs_ref += $(xunit_libs_dep:%=-r:%) -TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS)) -XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS)) +TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS) $(DEFAULT_REFERENCES)) +XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS) $(DEFAULT_REFERENCES)) test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%) test_nunit_ref = $(test_nunit_dep:%=-r:%) @@ -296,7 +296,7 @@ run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR) # Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase) $(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs - $(TEST_COMPILE) $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs -out:$@ + $(TEST_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@ $(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src) diff --git a/mcs/class/Microsoft.Build.Engine/Makefile b/mcs/class/Microsoft.Build.Engine/Makefile index c8ce9a22816..30fdb0fd1e1 100644 --- a/mcs/class/Microsoft.Build.Engine/Makefile +++ b/mcs/class/Microsoft.Build.Engine/Makefile @@ -23,7 +23,7 @@ EXTRA_DISTFILES = \ CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$(PROFILE).dll.mdb Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs - $(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library + $(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)/mscorlib.dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library test-local: compile-resources diff --git a/mcs/class/Microsoft.Build.Tasks/Makefile b/mcs/class/Microsoft.Build.Tasks/Makefile index b926ba9ff31..09aeca3b10b 100644 --- a/mcs/class/Microsoft.Build.Tasks/Makefile +++ b/mcs/class/Microsoft.Build.Tasks/Makefile @@ -29,7 +29,7 @@ EXTRA_DISTFILES = \ Test/resources/junk.txt Test/resources/test.dll: Test/resources/test.cs - $(CSCOMPILE) -target:library /out:$@ $< + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -target:library /out:$@ $< clean-test-resources: rm -f Test/resources/test.dll diff --git a/mcs/class/Mono.Debugger.Soft/Makefile b/mcs/class/Mono.Debugger.Soft/Makefile index 4fb6f306a97..5b002b86eeb 100644 --- a/mcs/class/Mono.Debugger.Soft/Makefile +++ b/mcs/class/Mono.Debugger.Soft/Makefile @@ -23,7 +23,7 @@ TEST_HELPERS_SOURCES = \ test-local: dtest-app.exe dtest-excfilter.exe dtest-app.exe: Test/dtest-app.cs $(TEST_HELPERS_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -out:$@ -unsafe $(PLATFORM_DEBUG_FLAGS) -optimize- Test/dtest-app.cs $(TEST_HELPERS_SOURCES) dtest-excfilter.exe: Test/dtest-excfilter.il $(ILASM) -out:$@ /exe /debug Test/dtest-excfilter.il diff --git a/mcs/class/Mono.Options/Makefile b/mcs/class/Mono.Options/Makefile index cf83d944572..28d27326fe0 100644 --- a/mcs/class/Mono.Options/Makefile +++ b/mcs/class/Mono.Options/Makefile @@ -23,7 +23,7 @@ test-local: Mono.Options-PCL.dll clean-local: clean-pcl Mono.Options-PCL.dll: Mono.Options.dll.sources $(shell cat Mono.Options.dll.sources) - $(CSCOMPILE) -target:library -out:$@ -debug+ -d:PCL -r:../lib/$(PROFILE)/System.dll @$< + $(CSCOMPILE) -target:library -out:$@ -d:PCL -r:../lib/$(PROFILE)/mscorlib.dll -r:../lib/$(PROFILE)/System.dll @$< clean-pcl: -rm Mono.Options-PCL.dll diff --git a/mcs/class/Mono.WebBrowser/Makefile b/mcs/class/Mono.WebBrowser/Makefile index 65b6d44df17..93cf7f68576 100644 --- a/mcs/class/Mono.WebBrowser/Makefile +++ b/mcs/class/Mono.WebBrowser/Makefile @@ -7,7 +7,7 @@ LIB_REFS = System KEYFILE = ../mono.snk LIB_MCS_FLAGS = -warn:1 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = EXTRA_DISTFILES = README diff --git a/mcs/class/System.ComponentModel.DataAnnotations/Makefile b/mcs/class/System.ComponentModel.DataAnnotations/Makefile index 53519907a9c..a46151a796b 100644 --- a/mcs/class/System.ComponentModel.DataAnnotations/Makefile +++ b/mcs/class/System.ComponentModel.DataAnnotations/Makefile @@ -7,7 +7,8 @@ LIB_REFS = System System.Core System.Data System.Xml KEYFILE = ../winfx.pub LIB_MCS_FLAGS = -nowarn:414 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System System.Core TXT_RESOURCE_STRINGS = ../referencesource/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.txt diff --git a/mcs/class/System.Data.OracleClient/Makefile b/mcs/class/System.Data.OracleClient/Makefile index 66fbba34971..9b6f7cbafd4 100644 --- a/mcs/class/System.Data.OracleClient/Makefile +++ b/mcs/class/System.Data.OracleClient/Makefile @@ -7,7 +7,8 @@ LIB_REFS = System System.Xml System.Data System.EnterpriseServices System.Drawin KEYFILE = ../ecma.pub LIB_MCS_FLAGS = -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 +TEST_MCS_FLAGS = /nowarn:618 +TEST_LIB_REFS = System System.Data EXTRA_DISTFILES = Test/*.cs diff --git a/mcs/class/System.IdentityModel/Makefile b/mcs/class/System.IdentityModel/Makefile index 000c536c02d..5d00d28a478 100644 --- a/mcs/class/System.IdentityModel/Makefile +++ b/mcs/class/System.IdentityModel/Makefile @@ -29,7 +29,8 @@ LIB_REFS += System.Web.ApplicationServices endif endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System System.Xml System.Security System.Runtime.Serialization ifdef MOBILE_PROFILE NO_TEST = yes diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile index 56c51c6330d..5b4c8fbfbf1 100644 --- a/mcs/class/System.Json.Microsoft/Makefile +++ b/mcs/class/System.Json.Microsoft/Makefile @@ -18,6 +18,6 @@ ifdef MOBILE_DYNAMIC LIB_MCS_FLAGS += -d:FEATURE_DYNAMIC endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = include ../../build/library.make diff --git a/mcs/class/System.Reactive.Linq/Makefile b/mcs/class/System.Reactive.Linq/Makefile index 071bd7c2451..2c79f2d1089 100644 --- a/mcs/class/System.Reactive.Linq/Makefile +++ b/mcs/class/System.Reactive.Linq/Makefile @@ -29,7 +29,7 @@ ifdef NET_4_5 LIB_MCS_FLAGS += -d:HAS_EDI -d:PREFERASYNC -d:PREFER_ASYNC -d:HAS_AWAIT endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = EXTRA_DISTFILES = $(RESX_RESOURCES:.resources=.resx) $(PREBUILT) diff --git a/mcs/class/System.ServiceProcess/Makefile b/mcs/class/System.ServiceProcess/Makefile index 8414fa099f5..13195ce8eb2 100644 --- a/mcs/class/System.ServiceProcess/Makefile +++ b/mcs/class/System.ServiceProcess/Makefile @@ -6,7 +6,8 @@ LIBRARY = System.ServiceProcess.dll LIB_REFS = System System.Configuration.Install System.Windows.Forms KEYFILE = ../msfinal.pub LIB_MCS_FLAGS = /nowarn:0618 -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) +TEST_MCS_FLAGS = +TEST_LIB_REFS = System EXTRA_DISTFILES = diff --git a/mcs/class/System.Threading.Tasks.Dataflow/Makefile b/mcs/class/System.Threading.Tasks.Dataflow/Makefile index 77e279ebb23..6ca3d61e47a 100644 --- a/mcs/class/System.Threading.Tasks.Dataflow/Makefile +++ b/mcs/class/System.Threading.Tasks.Dataflow/Makefile @@ -8,9 +8,9 @@ LIB_REFS += System.Core System KEYFILE = ../ecma.pub LIB_MCS_FLAGS += -d:CONCURRENT_COLLECTIONS -include ../../build/library.make - TEST_MCS_FLAGS = TEST_LIB_REFS = System.Core System EXTRA_DISTFILES=README.md + +include ../../build/library.make diff --git a/mcs/class/System.Web.Extensions/Makefile b/mcs/class/System.Web.Extensions/Makefile index 1d2c48154a2..317cd320295 100644 --- a/mcs/class/System.Web.Extensions/Makefile +++ b/mcs/class/System.Web.Extensions/Makefile @@ -39,7 +39,7 @@ NUNIT_RESOURCE_FILES= \ CLASSLIB_DIR = $(topdir)/class/lib/$(PROFILE) STANDALONE_RUNNER_SUPPORT_ASSEMBLY = $(CLASSLIB_DIR)/standalone-runner-support.dll -STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:$(topdir)/class/lib/$(PROFILE)/System.Web.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.Extensions.dll -r:$(topdir)/class/lib/$(PROFILE)/nunit.framework.dll +STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Web.Extensions.dll -r:$(topdir)/class/lib/$(PROFILE)/nunit.framework.dll STANDALONE_TEST_ASSEMBLY = System.Web.Extensions_standalone_test_$(PROFILE).dll STANDALONE_TEST_MAKEFRAG = $(depsdir)/$(STANDALONE_TEST_ASSEMBLY).makefrag diff --git a/mcs/class/System.Web/Test/tools/Makefile b/mcs/class/System.Web/Test/tools/Makefile index 9cbb4159d00..09755061ff6 100644 --- a/mcs/class/System.Web/Test/tools/Makefile +++ b/mcs/class/System.Web/Test/tools/Makefile @@ -12,7 +12,8 @@ STANDALONE_RUNNER_SOURCES = \ STANDALONE_RUNNER_REFERENCES = \ -r:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) \ -r:$(CLASSLIB_DIR)/System.Web.dll \ - -r:$(CLASSLIB_DIR)/System.dll + -r:$(CLASSLIB_DIR)/System.dll \ + -r:$(CLASSLIB_DIR)/mscorlib.dll CACHE_PQ_TEST_GENERATOR_SOURCES = \ CachePQTestGenerator/CacheItemComparer.cs \ diff --git a/mcs/class/System.Xml.Linq/Makefile b/mcs/class/System.Xml.Linq/Makefile index 3b058bd9c42..c2355bac19e 100644 --- a/mcs/class/System.Xml.Linq/Makefile +++ b/mcs/class/System.Xml.Linq/Makefile @@ -16,8 +16,8 @@ ifeq (2.1, $(FRAMEWORK_VERSION)) LIB_MCS_FLAGS += -d:MONO_HYBRID_SYSTEM_XML endif -TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) - +TEST_LIB_REFS = System.Core System.Xml System +TEST_MCS_FLAGS = EXTRA_DISTFILES = include ../../build/library.make diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile index 90e83ea515d..b9575562923 100644 --- a/mcs/errors/Makefile +++ b/mcs/errors/Makefile @@ -2,11 +2,6 @@ thisdir = errors SUBDIRS = include ../build/rules.make -with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" - -ilasm = $(topdir)/class/lib/$(PROFILE)/ilasm.exe -ILASM = $(with_mono_path) $(RUNTIME) $(RUNTIME_FLAGS) $(ilasm) - DISTFILES = \ CONTRIBUTORS_README \ errors.txt \ @@ -84,52 +79,52 @@ dist-local: dist-default csproj-local install-local uninstall-local: CS0029-26-lib.dll : CS0029-26-lib.cs - $(CSCOMPILE) /target:library /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /publicsign /keyfile:key.snk /out:$@ $< CS0266-25-lib.dll: CS0266-25-lib.cs - $(CSCOMPILE) /target:library /r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll /out:$@ $< dlls/first/CS1701-lib.dll: dlls/first/CS1701-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/first/CS1702-lib.dll: dlls/first/CS1702-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/first/CS1703-lib.dll: dlls/first/CS1703-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/first/CS1705-lib.dll: dlls/first/CS1705-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/second/CS1701-lib.dll: dlls/second/CS1701-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/second/CS1702-lib.dll: dlls/second/CS1702-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/second/CS1703-lib.dll: dlls/second/CS1703-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< dlls/second/CS1705-lib.dll: dlls/second/CS1705-lib.cs - $(CSCOMPILE) /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /publicsign /keyfile:key.snk /out:$@ $< CS1701-lib.dll : CS1701-lib.cs - $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1701-lib.dll /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1701-lib.dll /out:$@ $< CS1702-lib.dll : CS1702-lib.cs - $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1702-lib.dll /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1702-lib.dll /out:$@ $< CS1705-lib.dll : CS1705-lib.cs - $(CSCOMPILE) /target:library /warn:0 /r:dlls/first/CS1705-lib.dll /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /r:dlls/first/CS1705-lib.dll /out:$@ $< CSFriendAssembly-lib.dll : CSFriendAssembly-lib.cs - $(CSCOMPILE) /target:library /publicsign /keyfile:key.snk /warn:0 /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /publicsign /keyfile:key.snk /warn:0 /out:$@ $< %-lib.dll: %-lib.cs - $(CSCOMPILE) /target:library /warn:0 /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:library /warn:0 /out:$@ $< %-module.dll: %-module.cs - $(CSCOMPILE) /target:module /out:$@ $< + $(CSCOMPILE) /r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll /target:module /out:$@ $< %-lib.dll: %-lib.il $(ILASM) /dll /out:$@ $< diff --git a/mcs/tools/mdoc/Makefile b/mcs/tools/mdoc/Makefile index e4bd162730c..13ab3737646 100644 --- a/mcs/tools/mdoc/Makefile +++ b/mcs/tools/mdoc/Makefile @@ -24,6 +24,8 @@ LIB_REFS = monodoc System System.Xml System.Core Mono.Cecil ICSharpCode.SharpZip LOCAL_MCS_FLAGS = $(MDOC_RESOURCES_COMMAND) $(MONODOC_RESOURCES_COMMAND) PROGRAM = $(topdir)/class/lib/$(PROFILE)/mdoc.exe PROGRAM_DEPS = $(topdir)/class/lib/$(PROFILE)/monodoc.dll +MSCORLIB = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll + MDOC_TEST_FILES = \ Test/CLILibraryTypes.dtd \ @@ -77,51 +79,51 @@ cleanup: -rm -f monodocer1.exe* Test/DocTest-addNonGeneric.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-addNonGeneric.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-addNonGeneric.cs Test/DocTest-addNonGeneric-v2.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-addNonGeneric.cs /define:V2 + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-addNonGeneric.cs /define:V2 Test/DocTest-DropNS-classic-secondary.dll: @echo $(value @) - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic-secondary.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic-secondary.cs Test/DocTest-DropNS-classic.dll: @echo $(value @) - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs Test/DocTest-DropNS-unified.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs Test/DocTest-DropNS-unified-multitest.dll: rm -f $@ - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs /define:MULTITEST + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs /define:MULTITEST Test/DocTest-DropNS-classic-multitest.dll: rm -f $@ - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs /define:MULTITEST + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs /define:MULTITEST Test/DocTest-DropNS-unified-deletetest.dll: rm -f Test/DocTest-DropNS-unified-deletetest.dll - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs /define:DELETETEST + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-unified.cs /define:DELETETEST Test/DocTest-DropNS-unified-deletetest-V2.dll: rm -f Test/DocTest-DropNS-unified-deletetest.dll - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:Test/DocTest-DropNS-unified-deletetest.dll Test/DocTest-DropNS-unified.cs /define:DELETETEST,V2 + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:Test/DocTest-DropNS-unified-deletetest.dll Test/DocTest-DropNS-unified.cs /define:DELETETEST,V2 Test/DocTest-DropNS-classic-deletetest.dll: rm -f Test/DocTest-DropNS-classic-deletetest.dll - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs /define:DELETETEST + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-DropNS-classic.cs /define:DELETETEST Test/DocTest-DropNS-classic-deletetest-V2.dll: rm -f Test/DocTest-DropNS-classic-deletetest.dll - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:Test/DocTest-DropNS-classic-deletetest.dll Test/DocTest-DropNS-classic.cs /define:DELETETEST,V2 + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:Test/DocTest-DropNS-classic-deletetest.dll Test/DocTest-DropNS-classic.cs /define:DELETETEST,V2 Test/DocTest.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest.cs -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/Microsoft.CSharp.dll + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest.cs -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll -r:$(topdir)/class/lib/$(PROFILE)/Microsoft.CSharp.dll Test/DocTest-InternalInterface.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-InternalInterface.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-InternalInterface.cs Test/DocTest.dll-v1: -rm -f Test/DocTest.cs @@ -137,7 +139,7 @@ Test/DocTest.dll-v2: $(MAKE) TEST_CSCFLAGS=$(TEST_CSCFLAGS) Test/DocTest.dll Test/DocTest-enumerations.dll: - $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -target:library -out:$@ Test/DocTest-enumerations.cs + $(CSCOMPILE) $(TEST_CSCFLAGS) $(MSCORLIB) -unsafe -target:library -out:$@ Test/DocTest-enumerations.cs check-monodocer-addNonGeneric: $(PROGRAM) -rm -Rf Test/en.actual diff --git a/mcs/tools/mono-service/Makefile b/mcs/tools/mono-service/Makefile index e27822addc6..b1c6d2f32e8 100644 --- a/mcs/tools/mono-service/Makefile +++ b/mcs/tools/mono-service/Makefile @@ -6,11 +6,11 @@ PROGRAM = mono-service.exe PROGRAM_SNK = ../../class/mono.snk -include ../../build/executable.make - LOCAL_MCS_FLAGS = -unsafe -publicsign -keyfile:../../class/mono.snk LIB_REFS = System.ServiceProcess Mono.Posix System +include ../../build/executable.make + # Copied from library.make # -- begin -- diff --git a/mcs/tools/mono-symbolicate/Makefile b/mcs/tools/mono-symbolicate/Makefile index 440dfe9f8e6..38a345454e7 100644 --- a/mcs/tools/mono-symbolicate/Makefile +++ b/mcs/tools/mono-symbolicate/Makefile @@ -45,7 +45,7 @@ PREPARE_OUTDIR = @\ mkdir -p $(MSYM_DIR); COMPILE = \ - $(CSCOMPILE) $(TEST_CS) -out:$(TEST_EXE); \ + $(CSCOMPILE) $(TEST_CS) -r:$(LIB_PATH)/mscorlib.dll -out:$(TEST_EXE); \ $(MONO) $(LIB_PATH)/$(PROGRAM) store-symbols $(MSYM_DIR) $(OUT_DIR); \ $(MONO) $(LIB_PATH)/$(PROGRAM) store-symbols $(MSYM_DIR) $(LIB_PATH); diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile index be162957fa8..b01c75796be 100644 --- a/mcs/tools/security/Makefile +++ b/mcs/tools/security/Makefile @@ -60,10 +60,10 @@ clean-local: dist-local: dist-default sn.exe $(topdir)/class/lib/$(PROFILE)/sn.exe: $(SN_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll /out:$@ $(SN_SOURCES) + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll /out:$@ $(SN_SOURCES) permview.exe: permview.cs - $(CSCOMPILE) $^ $(HELPER_SOURCES) -r:$(topdir)/class/lib/$(PROFILE)/Mono.Cecil.dll + $(CSCOMPILE) $^ $(HELPER_SOURCES) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Cecil.dll %.exe: %.cs $(HELPER_SOURCES) - $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll $^ + $(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll $^ |