Skip to content

Commit

Permalink
Merge Touch.Unit and MonoTouch.Dialog into repository (#21766)
Browse files Browse the repository at this point in the history
Touch.Unit and MonoTouch.Dialog are very stable and have low churn. To
maintenance and for other reasons, these source for these two submodules
will be moved into the repository.

---------

Co-authored-by: GitHub Actions Autoformatter <[email protected]>
Co-authored-by: Rolf Bjarne Kvinge <[email protected]>
  • Loading branch information
3 people authored Jan 10, 2025
1 parent b5b41b1 commit e7f4ff5
Show file tree
Hide file tree
Showing 53 changed files with 9,550 additions and 29 deletions.
9 changes: 1 addition & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
[submodule "external/Touch.Unit"]
path = external/Touch.Unit
url = ../../xamarin/Touch.Unit.git
branch = main
[submodule "external/Xamarin.MacDev"]
path = external/Xamarin.MacDev
url = ../../xamarin/Xamarin.MacDev
branch = main
[submodule "external/MonoTouch.Dialog"]
path = external/MonoTouch.Dialog
url = ../../xamarin/MonoTouch.Dialog
branch = dotnet

1 change: 0 additions & 1 deletion Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
# paths to the modules we depend on, as variables, so people can put
# things in other places if they absolutely must.
MONO_PATH=$(TOP)/external/mono
TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
API_TOOLS_PATH=$(TOP)/external/api-tools
Expand Down
1 change: 0 additions & 1 deletion external/MonoTouch.Dialog
Submodule MonoTouch.Dialog deleted from 77b333
1 change: 0 additions & 1 deletion external/Touch.Unit
Submodule Touch.Unit deleted from 92a072
3 changes: 1 addition & 2 deletions mk/versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ endef

$(shell rm -f .check-versions-failure)

$(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
$(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))


include $(TOP)/mk/xamarin.mk

Expand Down
Loading

0 comments on commit e7f4ff5

Please sign in to comment.