From da6b8272f01a1be1839c85eed682e61cdd5e9e1e Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 13 Oct 2017 07:48:52 +0200 Subject: [PATCH] Unset MSBuildExtensionPath for every msbuild invocation at once, not once per invocation. (#2881) --- Make.config | 2 +- tests/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Make.config b/Make.config index 20b0053061..2d0708a90c 100644 --- a/Make.config +++ b/Make.config @@ -242,7 +242,7 @@ SYSTEM_SN=$(MONO_PREFIX)/bin/sn SYSTEM_MONO=$(MONO_PREFIX)/bin/mono SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32 SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild -SYSTEM_MSBUILD=$(MONO_PREFIX)/bin/msbuild +SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config diff --git a/tests/Makefile b/tests/Makefile index 9dd2863cc0..bfe6fa146b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -171,7 +171,7 @@ $(TOP)/tools/mtouch/SdkVersions.cs: $(TOP)/tools/common/SdkVersions.cs.in @touch $@ xharness/xharness.exe: $(wildcard xharness/*.cs) xharness/xharness.csproj $(TOP)/tools/mtouch/SdkVersions.cs test.config test-system.config .stamp-src-project-files - $(Q_GEN) unset MSBuildExtensionsPath && $(SYSTEM_MSBUILD) $(MSBUILD_VERBOSITY_QUIET) xharness/xharness.csproj + $(Q_GEN) $(SYSTEM_MSBUILD) $(MSBUILD_VERBOSITY_QUIET) xharness/xharness.csproj killall: @killall "iPhone Simulator" >/dev/null 2>&1 || true