diff --git a/.gitmodules b/.gitmodules index fc08235f8755..bce266e9d8c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,10 +22,6 @@ path = external/Touch.Unit url = git://github.com/spouliot/Touch.Unit.git branch = master -[submodule "external/NUnitLite"] - path = external/NUnitLite - url = git://github.com/spouliot/NUnitLite.git - branch = master [submodule "external/opentk"] path = external/opentk url = git://github.com/mono/opentk.git diff --git a/Make.config b/Make.config index 0a2fbc59eb42..883f2ff4b61c 100644 --- a/Make.config +++ b/Make.config @@ -218,7 +218,7 @@ FSHARP_PATH=$(TOP)/external/fsharp CECIL_PATH=$(TOP)/external/cecil MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit -NUNITLITE_PATH=$(TOP)/external/NUnitLite +NUNITLITE_PATH=$(TOP)/external/mono/external/nunit-lite OPENTK_PATH=$(TOP)/external/opentk MODERNHTTPCLIENT_PATH=$(TOP)/external/ModernHttpClient XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev diff --git a/external/Touch.Unit b/external/Touch.Unit index 3b84fc272cad..1b5be087a7f1 160000 --- a/external/Touch.Unit +++ b/external/Touch.Unit @@ -1 +1 @@ -Subproject commit 3b84fc272cadc807606a27f2be87d97da991c27b +Subproject commit 1b5be087a7f1db09046185a9617ade34772b9bef diff --git a/mk/versions.mk b/mk/versions.mk index 97eb53e45bed..3293c1e9744b 100644 --- a/mk/versions.mk +++ b/mk/versions.mk @@ -63,7 +63,6 @@ $(eval $(call CheckSubmoduleTemplate,fsharp,FSHARP)) $(eval $(call CheckSubmoduleTemplate,cecil,CECIL)) $(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG)) $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT)) -$(eval $(call CheckSubmoduleTemplate,NUnitLite,NUNITLITE)) $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK)) $(eval $(call CheckSubmoduleTemplate,ModernHttpClient,MODERNHTTPCLIENT)) $(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV)) diff --git a/src/touch-unit.sources b/src/touch-unit.sources index 0dc4ce4401e7..363ea568035a 100644 --- a/src/touch-unit.sources +++ b/src/touch-unit.sources @@ -171,6 +171,7 @@ NUNITLITE_SOURCES = \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Extensibility/ISuiteBuilder.cs \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Extensibility/ITestCaseBuilder.cs \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Extensibility/ITestCaseProvider.cs \ + $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/FinallyDelegate.cs \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Internal/AssemblyHelper.cs \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Internal/CultureDetector.cs \ $(NUNITLITE_PATH)/NUnitLite-1.0.0/src/framework/Internal/ExceptionHelper.cs \