Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Touch.Unit and MonoTouch.Dialog into repository #21766

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Merge Touch.Unit and MonoTouch.Dialog into repository #21766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8098b3
Remove submodules for Touch.Unit and MonoTouch.Dialog
mcumming Dec 6, 2024
4cc9277
Merge heads of Touch.Unit and MonoTouch.Dialog into tests/common
mcumming Dec 6, 2024
60448f9
Remove references to external dependency for Touch.Unit and MonoTouch…
mcumming Dec 6, 2024
2583c6f
Update reference to /external/MonoTouch.Dialog and /external/Touch.Un…
mcumming Dec 6, 2024
7a08f36
Auto-format source code
Dec 6, 2024
77e3456
Trim MonoTouch.Dialog to just needed parts
mcumming Dec 6, 2024
0c1ec60
Trim Touch.Unit
mcumming Dec 6, 2024
28840e1
Update Autoformat
mcumming Dec 9, 2024
c0e1ead
Back to separate csproj files
mcumming Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .gitmodules
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,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
Open in desktop
Submodule MonoTouch.Dialog deleted from 77b333
1 change: 0 additions & 1 deletion external/Touch.Unit
Open in desktop
Submodule Touch.Unit deleted from 92a072
3 changes: 1 addition & 2 deletions mk/versions.mk
View file
Open in desktop
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
Loading