diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-10-29 14:56:44 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-10-29 15:09:32 +0300 |
| commit | 01c9543e084d1196a051c4a980b255b0f8b399d5 (patch) | |
| tree | ab7bcb8e36e2eb0d06b678c8cad219cf25a690ab /mcs/class/Microsoft.Build | |
| parent | a0f51a380344065651abb0d07763350303680247 (diff) | |
[bcl] Add patching of nunit-lite-console.exe.config file
Because nunit-lite runs everything in the same AppDomain, we can't use dll.config files for settings anymore.
Since a few test suites rely on being able to read those settings we need to patch them into the main
nunit-lite-console.exe.config file instead before the test.
Remove all _test.dll.config files and replace with nunit-lite patcher equivalent
Diffstat (limited to 'mcs/class/Microsoft.Build')
| -rw-r--r-- | mcs/class/Microsoft.Build/.gitignore | 1 | ||||
| -rw-r--r-- | mcs/class/Microsoft.Build/Makefile | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mcs/class/Microsoft.Build/.gitignore b/mcs/class/Microsoft.Build/.gitignore index bc686cf9c83..07547b0fc20 100644 --- a/mcs/class/Microsoft.Build/.gitignore +++ b/mcs/class/Microsoft.Build/.gitignore @@ -6,3 +6,4 @@ bin/ Microsoft.Build.Internal/ExpressionParser.cs Microsoft.Build.Internal/y.output Test/FunctionalTestProject*.csproj +Test/test-config-file-* diff --git a/mcs/class/Microsoft.Build/Makefile b/mcs/class/Microsoft.Build/Makefile index 933782ff268..47e9cf9ad41 100644 --- a/mcs/class/Microsoft.Build/Makefile +++ b/mcs/class/Microsoft.Build/Makefile @@ -10,9 +10,10 @@ LIBRARY = Microsoft.Build.dll LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml Microsoft.Build.Engine Microsoft.Build.Framework LIB_MCS_FLAGS = \ /d:MICROSOFT_BUILD_DLL - + TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) TEST_LIB_REFS = $(XBUILD_UTILITIES) +TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE) EXTRA_DISTFILES = \ Microsoft.Build.Internal/ExpressionParser.jay \ |