Branching for d15-3-xcode9

xamarin · Jul 12, 2017 · 2869ca5 · 2869ca5
1 parent 3f9ff7c
commit 2869ca5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,34 +1,34 @@
+[submodule "external/fsharp"]
+    path = external/fsharp
+    url = ../../fsharp/fsharp.git
+    branch = master
+[submodule "external/guiunit"]
+    path = external/guiunit
+    url = ../../mono/guiunit.git
+[submodule "external/linker"]
+    path = external/linker
+    url = ../../mono/linker.git
 [submodule "external/llvm"]
-	path = external/llvm
-	url = ../../mono/llvm.git
-	branch = master
+    path = external/llvm
+    url = ../../mono/llvm.git
+    branch = master
 [submodule "external/mono"]
-	path = external/mono
-	url = ../../mono/mono.git
-	branch = 2017-04
-[submodule "external/fsharp"]
-	path = external/fsharp
-	url = ../../fsharp/fsharp.git
-	branch = master
+    path = external/mono
+    url = ../../mono/mono.git
+    branch = 2017-04
 [submodule "external/MonoTouch.Dialog"]
-	path = external/MonoTouch.Dialog
-	url = ../../migueldeicaza/MonoTouch.Dialog.git
-	branch = master
-[submodule "external/Touch.Unit"]
-	path = external/Touch.Unit
-	url = ../../spouliot/Touch.Unit.git
-	branch = master
+    path = external/MonoTouch.Dialog
+    url = ../../migueldeicaza/MonoTouch.Dialog.git
+    branch = master
 [submodule "external/opentk"]
-	path = external/opentk
-	url = ../../mono/opentk.git
-	branch = master
+    path = external/opentk
+    url = ../../mono/opentk.git
+    branch = master
+[submodule "external/Touch.Unit"]
+    path = external/Touch.Unit
+    url = ../../spouliot/Touch.Unit.git
+    branch = master
 [submodule "external/Xamarin.MacDev"]
-	path = external/Xamarin.MacDev
-	url = ../../xamarin/Xamarin.MacDev
-	branch = d15-3
-[submodule "external/guiunit"]
-	path = external/guiunit
-	url = ../../mono/guiunit.git
-[submodule "external/linker"]
-	path = external/linker
-	url = ../../mono/linker.git
+    path = external/Xamarin.MacDev
+    url = ../../xamarin/Xamarin.MacDev
+    branch = d15-3-xcode9
diff --git a/external/Xamarin.MacDev b/external/Xamarin.MacDev
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 16f7b4ca4b5c0766ae8e257080ad8d9f28a1a4e1
+NEEDED_MACCORE_VERSION := 1e99df5120e5230601eee99e701552d29e084258
 NEEDED_MACCORE_BRANCH := xcode9
 
 MACCORE_DIRECTORY := maccore
+3 −0		Xamarin.MacDev/EntitlementExtensions.cs
+17 −0		Xamarin.MacDev/IPhoneSdkVersion.cs