Mono 2017-02 integration

.gitignore

@@ -9,6 +9,7 @@ _mac-build
 *.exe
 *.dll
 *.mdb
+*.pdb
 bin
 obj
 packages

.gitmodules

@@ -5,7 +5,7 @@
 [submodule "external/mono"]
 	path = external/mono
 	url = ../../mono/mono.git
-	branch = mono-4.6.0-branch
+	branch = 2017-02
 [submodule "external/fsharp"]
 	path = external/fsharp
 	url = ../../fsharp/fsharp.git
@@ -29,3 +29,6 @@
 [submodule "external/guiunit"]
 	path = external/guiunit
 	url = ../../mono/guiunit.git
+[submodule "external/linker"]
+	path = external/linker
+	url = ../../mono/linker.git

Make.config

@@ -53,9 +53,9 @@ XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.3.xip
 XCODE_DEVELOPER_ROOT=/Applications/Xcode83.app/Contents/Developer
 
 # Minimum Mono version
-MIN_MONO_VERSION=4.8.0.269
-MAX_MONO_VERSION=4.8.99
-MIN_MONO_URL=http://bosstoragemirror.blob.core.windows.net/wrench/mono-4.8.0/e5/e51aa0a7043a8185e264d6332ac7bc1f8f87cd39/MonoFramework-MDK-4.8.0.269.macos10.xamarin.universal.pkg
+MIN_MONO_VERSION=5.0.0.18
+MAX_MONO_VERSION=5.0.99
+MIN_MONO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-02/9e/9ed0907eea13005d4e93b9c5f42c5c3015eba409/MonoFramework-MDK-5.0.0.18.macos10.xamarin.universal.pkg
 
 # Minimum Xamarin Studio version
 MIN_XAMARIN_STUDIO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/monodevelop-lion-master/a0/a04f5191c0d91121215fbbaa866f9d420521b6ee/XamarinStudio-6.4.0.5.dmg
@@ -228,6 +228,7 @@ OPENTK_PATH=$(TOP)/external/opentk
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 GUI_UNIT_PATH=$(TOP)/external/guiunit
 MACCORE_PATH=$(TOP)/../maccore
+LINKER_TOOLS_PATH=$(TOP)/external/linker
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MCS=$(MONO_PREFIX)/bin/mcs
@@ -269,8 +270,6 @@ MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
 MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
 MAC_PACKAGE_INSTALL_LOCATION=$(MAC_FRAMEWORK_VERSIONED_DIR)
 
-MDB_REBASE_EXE = $(abspath $(MONO_PATH))/mcs/class/lib/net_4_x/mdbrebase.exe
-MDB_REBASE = MONO_PATH=$(dir $(MDB_REBASE_EXE)) $(TOP)/builds/install/tools64/bin/mono --debug $(MDB_REBASE_EXE)
 TT = $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.TextTemplating/TextTransform.exe"
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
@@ -279,6 +278,12 @@ include $(TOP)/mk/quiet.mk
 
 MDTOOL?=DYLD_FALLBACK_LIBRARY_PATH=$(HOME)/lib:/usr/local/lib:/lib:/usr/lib:/Library/Frameworks/Mono.framework/Versions/Current/lib $(SYSTEM_MONO) "/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/bin/mdtool.exe" $(MDTOOL_VERBOSITY)
 
+ifneq ($(BUILD_REVISION),)
+# wrench build only
+IOS_MCS_FLAGS=-pathmap:$(abspath $(MONO_PATH))/=$(IOS_FRAMEWORK_DIR)/Versions/$(IOS_PACKAGE_VERSION)/src/mono/
+MAC_MCS_FLAGS=-pathmap:$(abspath $(MONO_PATH))/=$(MAC_FRAMEWORK_DIR)/Versions/$(MAC_PACKAGE_VERSION)/src/mono/
+endif
+
 ifdef ENABLE_XAMARIN
 -include $(MACCORE_PATH)/Make.config
 endif

mk/versions.mk

@@ -65,6 +65,7 @@ $(eval $(call CheckSubmoduleTemplate,Touch.Unit,TOUCH_UNIT))
 $(eval $(call CheckSubmoduleTemplate,opentk,OPENTK))
 $(eval $(call CheckSubmoduleTemplate,Xamarin.MacDev,XAMARIN_MACDEV))
 $(eval $(call CheckSubmoduleTemplate,guiunit,GUI_UNIT))
+$(eval $(call CheckSubmoduleTemplate,linker,LINKER_TOOLS))
 
 include $(TOP)/mk/xamarin.mk
 

mono/4.5/machine.config

@@ -12,6 +12,8 @@
 			<map Token="7cec85d7bea7798e" PublicKey="0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db" />
 			<!-- Mono key: I18N*.dll, Mono.Data.Sqlite.dll, Mono.Data.Tds.dll, Mono.Security.dll -->
 			<map Token="0738eb9f132ed756" PublicKey="0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db" />
+			<!-- .NET Core open source key: System.ValueTuple.dll -->
+			<map Token="cc7b13ffcd2ddd51" PublicKey="0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db" />
 		</pubTokenMapping>
 	</strongNames>
 </configuration>

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.props

@@ -34,7 +34,8 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
 		<AllowedReferenceRelatedFileExtensions>
 			$(AllowedReferenceRelatedFileExtensions);
 			.dll.mdb;
-			.exe.mdb
+			.exe.mdb;
+			.pdb
 		</AllowedReferenceRelatedFileExtensions>
 	</PropertyGroup>
 

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.FSharp.targets

@@ -14,19 +14,25 @@
 		<!-- Version/fx properties -->
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkIdentifier)' == '' And '$(TargetFrameworkVersion)' ==''">v4.5</TargetFrameworkVersion>
 
-		<FSharpTargets Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')">$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargets>
-		<FSharpTargets Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargets>
-		<FSharpTargets Condition="'$(FSharpTargets)' == '' And Exists('$(MSBuildFrameworkToolsPath32)\Microsoft.FSharp.Targets')">$(MSBuildFrameworkToolsPath32)\Microsoft.FSharp.Targets</FSharpTargets>
-		<FSharpTargets Condition="'$(FSharpTargets)' == ''">$(MSBuildBinPath)\Microsoft.FSharp.Targets</FSharpTargets>
-
 		<!-- This should be done in the F# target files, but _DebugFileExt is not an upstream
 		     msbuild feature yet, so F# doesn't have this. Once, upstream F# adds it, we can
 		     remove this -->
 		<_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt>
 		<_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt>
 	</PropertyGroup>
 
-	<Import Project="$(FSharpTargets)" />
+        <Import Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"
+                Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+
+        <Import Condition="!$(MSBuildAllProjects.Contains('Microsoft.FSharp.Targets')) and Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')"
+                Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+
+        <Import Condition="!$(MSBuildAllProjects.Contains('Microsoft.FSharp.Targets')) and Exists('$(MSBuildFrameworkToolsPath32)\Microsoft.FSharp.Targets')"
+                Project="$(MSBuildFrameworkToolsPath32)\Microsoft.FSharp.Targets" />
+
+        <Import Condition="!$(MSBuildAllProjects.Contains('Microsoft.FSharp.Targets'))"
+                Project="$(MSBuildBinPath)\Microsoft.FSharp.Targets" />
+
 	<Import Project="Xamarin.Mac.Common.targets" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"

msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.ObjCBinding.Common.props

@@ -29,7 +29,8 @@ Copyright (C) 2014 Xamarin. All rights reserved.
 		<AllowedReferenceRelatedFileExtensions>
 			$(AllowedReferenceRelatedFileExtensions);
 			.dll.mdb;
-			.exe.mdb
+			.exe.mdb;
+			.pdb
 		</AllowedReferenceRelatedFileExtensions>
 	</PropertyGroup>
 

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.AppExtension.CSharp.targets

@@ -21,13 +21,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 		<!-- Version/fx properties -->
 		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.iOS</TargetFrameworkIdentifier>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/usr/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/usr/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch')">/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == ''">/Developer/MonoTouch/usr/bin</CscToolPath>
-		<CscToolExe Condition="'$(CscToolExe)' == ''">smcs</CscToolExe>
-		<!-- We default to smcs compiler above, so, select the .mdb as the debug ext -->
-		<CscDebugFileExt Condition="'$(CscDebugFileExt)' == ''">.mdb</CscDebugFileExt>
 
 		<DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.CSharp.targets

@@ -21,14 +21,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<!-- Version/fx properties -->
 		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.iOS</TargetFrameworkIdentifier>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/usr/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/usr/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch')">/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == ''">/Developer/MonoTouch/usr/bin</CscToolPath>
-		<CscToolExe Condition="'$(CscToolExe)' == '' And '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">smcs</CscToolExe>
-		<CscToolExe Condition="'$(CscToolExe)' == ''">/Library/Frameworks/Mono.framework/Commands/mcs</CscToolExe>
-		<!-- We default to *mcs compiler above, so, select the .mdb as the debug ext -->
-		<CscDebugFileExt Condition="'$(CscDebugFileExt)' == ''">.mdb</CscDebugFileExt>
 
 		<DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.props

@@ -29,7 +29,8 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<AllowedReferenceRelatedFileExtensions>
 			$(AllowedReferenceRelatedFileExtensions);
 			.dll.mdb;
-			.exe.mdb
+			.exe.mdb;
+			.pdb
 		</AllowedReferenceRelatedFileExtensions>
 	</PropertyGroup>
 

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.CSharp.props

@@ -31,17 +31,6 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
 		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.iOS</TargetFrameworkIdentifier>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
 
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('$(MonoTouchSdkRoot)/bin/mtouch')">$(MonoTouchSdkRoot)/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('$(MonoTouchSdkRoot)/usr/bin/mtouch')">$(MonoTouchSdkRoot)/usr/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch')">/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == ''">/Developer/MonoTouch/usr/bin</CscToolPath>
-		<CscToolExe Condition="'$(CscToolExe)' == '' And '$(TargetFrameworkIdentifier)' == 'Xamarin.TVOS'">/Library/Frameworks/Mono.framework/Commands/mcs</CscToolExe>
-		<CscToolExe Condition="'$(CscToolExe)' == '' And '$(TargetFrameworkIdentifier)' == 'Xamarin.WatchOS'">/Library/Frameworks/Mono.framework/Commands/mcs</CscToolExe>
-		<CscToolExe Condition="'$(CscToolExe)' == ''">smcs</CscToolExe>
-		<!-- We default to *mcs compiler above, so, select the .mdb as the debug ext. This file gets correctly
-		     imported *before* Microsoft.CSharp.targets -->
-		<CscDebugFileExt Condition="'$(CscDebugFileExt)' == ''">.mdb</CscDebugFileExt>
-
 		<BaseLibDllPath Condition="'$(OS)' == 'Unix' And '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">$(MonoTouchSdkRoot)/lib/mono/Xamarin.iOS/Xamarin.iOS.dll</BaseLibDllPath>
 		<BaseLibDllPath Condition="'$(OS)' != 'Unix' And '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">$(MSBuildExtensionsPath)\Xamarin\DontKnowWhereYet\Xamarin.iOS.dll</BaseLibDllPath>
 		<BTouchToolPath Condition="'$(OS)' == 'Unix' And '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' And '$(BTouchToolPath)' == ''">$(MonoTouchSdkRoot)/bin/</BTouchToolPath>

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.props

@@ -35,7 +35,8 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<AllowedReferenceRelatedFileExtensions>
 			$(AllowedReferenceRelatedFileExtensions);
 			.dll.mdb;
-			.exe.mdb
+			.exe.mdb;
+			.pdb
 		</AllowedReferenceRelatedFileExtensions>
 	</PropertyGroup>
 

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.WatchApp.CSharp.targets

@@ -21,13 +21,6 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 		<!-- Version/fx properties -->
 		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.iOS</TargetFrameworkIdentifier>
 		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And '$(MD_MTOUCH_SDK_ROOT)' != '' And Exists('$(MD_MTOUCH_SDK_ROOT)/usr/bin/mtouch')">$(MD_MTOUCH_SDK_ROOT)/usr/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == '' And Exists('/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mtouch')">/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin</CscToolPath>
-		<CscToolPath Condition="'$(CscToolPath)' == ''">/Developer/MonoTouch/usr/bin</CscToolPath>
-		<CscToolExe Condition="'$(CscToolExe)' == ''">smcs</CscToolExe>
-		<!-- We default to smcs compiler above, so, select .mdb as the debug ext -->
-		<CscDebugFileExt Condition="'$(CscDebugFileExt)' == ''">.mdb</CscDebugFileExt>
 
 		<DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;$(DefineConstants)</DefineConstants>
 	</PropertyGroup>

msbuild/tests/Xamarin.iOS.Tasks.Tests/TargetTests/TargetTests.cs

@@ -66,23 +66,21 @@ string[] ExpectedExecutableFiles {
 					"MonoTouchDebugConfiguration.txt",
 					"Info.plist",
 					Path.Combine ("Settings.bundle", "Root.plist"),
-					"Mono.Dynamic.Interpreter.dll",
-					"Mono.Dynamic.Interpreter.dll.mdb",
 					"MyLibrary.dll",
-					"MyLibrary.dll.mdb",
+					"MyLibrary.pdb",
 					"MySingleView",
 					"MySingleView.exe",
-					"MySingleView.exe.mdb",
+					"MySingleView.pdb",
 					"System.Core.dll",
-					"System.Core.dll.mdb",
+					"System.Core.pdb",
 					"System.Xml.dll",
-					"System.Xml.dll.mdb",
+					"System.Xml.pdb",
 					"System.dll",
-					"System.dll.mdb",
+					"System.pdb",
 					"Xamarin.iOS.dll",
 					"Xamarin.iOS.dll.mdb",
 					"mscorlib.dll",
-					"mscorlib.dll.mdb",
+					"mscorlib.pdb",
 					"runtime-options.plist",
 				};
 
@@ -371,7 +369,7 @@ void BuildLibraryCore (string[] expectedResources)
 			var entries = Directory.GetFileSystemEntries (LibraryProjectBinPath);
 			Assert.AreEqual (2, entries.Length, "#1");
 			Assert.IsTrue (File.Exists (library), "#2");
-			Assert.IsTrue (File.Exists (library + ".mdb"), "#3");
+			Assert.IsTrue (File.Exists (Path.ChangeExtension (library, ".pdb")), "#3");
 
 			var assemblyDef = AssemblyDefinition.ReadAssembly (library);
 			var actualResources = assemblyDef.MainModule.Resources.Select (n => n.Name).ToList ();

msbuild/tests/Xamarin.iOS.Tasks.Tests/TestHelpers/TestBase.cs

@@ -49,11 +49,11 @@ public string[] GetCoreAppFiles (string platform, string config, string managedE
 
 			coreFiles.Add ("mscorlib.dll");
 			if (config == "Debug")
-				coreFiles.Add ("mscorlib.dll.mdb");
+				coreFiles.Add ("mscorlib.pdb");
 
 			coreFiles.Add (managedExe);
 			if (config == "Debug")
-				coreFiles.Add (managedExe + ".mdb");
+				coreFiles.Add (Path.ChangeExtension (managedExe, ".pdb"));
 
 			coreFiles.Add (nativeExe);