Skip to content

Commit e7f4ff5

Browse files
mcummingGitHub Actions Autoformatterrolfbjarne
authored
Merge Touch.Unit and MonoTouch.Dialog into repository (#21766)
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 <github-actions-autoformatter@xamarin.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
1 parent b5b41b1 commit e7f4ff5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+9550
-29
lines changed

.gitmodules

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
[submodule "external/Touch.Unit"]
2-
path = external/Touch.Unit
3-
url = ../../xamarin/Touch.Unit.git
4-
branch = main
51
[submodule "external/Xamarin.MacDev"]
62
path = external/Xamarin.MacDev
73
url = ../../xamarin/Xamarin.MacDev
84
branch = main
9-
[submodule "external/MonoTouch.Dialog"]
10-
path = external/MonoTouch.Dialog
11-
url = ../../xamarin/MonoTouch.Dialog
12-
branch = dotnet
5+

Make.config

-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
303303
# paths to the modules we depend on, as variables, so people can put
304304
# things in other places if they absolutely must.
305305
MONO_PATH=$(TOP)/external/mono
306-
TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
307306
XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
308307
MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
309308
API_TOOLS_PATH=$(TOP)/external/api-tools

external/MonoTouch.Dialog

-1
This file was deleted.

external/Touch.Unit

-1
This file was deleted.

mk/versions.mk

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ endef
6464

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

67-
$(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
6867
$(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
69-
$(eval $(call CheckSubmoduleTemplate,MonoTouch.Dialog,MONOTOUCH_DIALOG))
68+
7069

7170
include $(TOP)/mk/xamarin.mk
7271

0 commit comments

Comments
 (0)