diff --git a/Makefile b/Makefile index 80cca6ecaab..21674ba37d5 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,6 @@ NUNIT_TESTS = \ NUNIT_CONSOLE = packages/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe -NUNIT_WORKERS ?= --workers=1 - ifneq ($(V),0) MONO_OPTIONS += --debug endif @@ -140,7 +138,7 @@ define RUN_NUNIT_TEST MONO_TRACE_LISTENER=Console.Out \ USE_MSBUILD=$(if $(USE_MSBUILD),$(USE_MSBUILD),0) \ $(RUNTIME) --runtime=v4.0.0 \ - $(NUNIT_CONSOLE) $(NUNIT_EXTRA) $(NUNIT_WORKERS) $(1) \ + $(NUNIT_CONSOLE) $(NUNIT_EXTRA) $(1) \ $(if $(TEST),--test=$(TEST)) \ --result="TestResult-$(basename $(notdir $(1))).xml;format=nunit2" \ -output=bin/Test$(CONFIGURATION)/TestOutput-$(basename $(notdir $(1))).txt \ diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj index 58e0c9b832f..11100590be9 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj @@ -36,7 +36,7 @@ - ..\..\..\..\packages\NUnit.3.7.0\lib\net45\nunit.framework.dll + ..\..\..\..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config index 034e9db2bbb..726cd3e84ea 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/packages.config @@ -1,6 +1,6 @@  - + @@ -9,4 +9,4 @@ - + \ No newline at end of file