From 8cdc076e16ad14f67aac7e15abfe5de36f198914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 24 May 2019 19:44:49 +0200
Subject: [PATCH] Add symlink that points to current mono sdks dir

Use that instead of an msbuild variable that won't work in VSMac.

Also bump maccore to get an equivalent fix there.

Diff: https://github.com/xamarin/maccore/compare/34725fe136aee39a9f9984bbb508b6670654f7b3..104656b89060d3c98cdc626709f7cadc467549af
---
 builds/.gitignore          |   2 +-
 builds/Makefile            |   6 ++
 mk/xamarin.mk              |   2 +-
 src/generator.csproj       | 180 ++++++++++++++++++-------------------
 tools/mmp/mmp.csproj       | 112 +++++++++++------------
 tools/mtouch/mtouch.csproj | 108 +++++++++++-----------
 6 files changed, 208 insertions(+), 202 deletions(-)

diff --git a/builds/.gitignore b/builds/.gitignore
index b3557803f791..f28d20e17587 100644
--- a/builds/.gitignore
+++ b/builds/.gitignore
@@ -22,4 +22,4 @@ target64
 targettv
 targetwatch
 watchbcl
-
+mono-ios-sdk-destdir
diff --git a/builds/Makefile b/builds/Makefile
index d13a34694eaf..3dbbfedb61a2 100644
--- a/builds/Makefile
+++ b/builds/Makefile
@@ -46,6 +46,8 @@ IPHONESIMULATOR_PREFIX=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphonesimulator.sdk/us
 IPHONEOS_SDK=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphoneos.sdk
 IPHONEOS_PREFIX=$(MONOTOUCH_PREFIX)/SDKs/MonoTouch.iphoneos.sdk/usr
 
+all-local:: .stamp-mono-ios-sdk-destdir
+
 ifdef ENABLE_XAMARIN
 XAMARIN_AUTOGEN_FLAGS=--enable-extension-module=xamarin
 XAMARIN_IOS_CONFIGURE_FLAGS=--enable-extension-module=xamarin
@@ -142,6 +144,10 @@ endif
 SDK_BUILDDIR = $(MONO_PATH)/sdks/builds
 SDK_DESTDIR = $(abspath $(MONO_PATH)/sdks/out)
 
+.stamp-mono-ios-sdk-destdir:
+	ln -sf $(MONO_IOS_SDK_DESTDIR) mono-ios-sdk-destdir
+	$(Q) touch $@
+
 $(MONO_PATH)/sdks/Make.config:
 	echo "DISABLE_ANDROID=1" > $@
 
diff --git a/mk/xamarin.mk b/mk/xamarin.mk
index b715eddd37cf..7b678a0caf3b 100644
--- a/mk/xamarin.mk
+++ b/mk/xamarin.mk
@@ -1,5 +1,5 @@
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 34725fe136aee39a9f9984bbb508b6670654f7b3
+NEEDED_MACCORE_VERSION := 104656b89060d3c98cdc626709f7cadc467549af
 NEEDED_MACCORE_BRANCH := master
 
 MACCORE_DIRECTORY := maccore
diff --git a/src/generator.csproj b/src/generator.csproj
index 3753f9a8666e..50e942306f09 100644
--- a/src/generator.csproj
+++ b/src/generator.csproj
@@ -80,271 +80,271 @@
     <None Include="..\docs\website\generator-errors.md">
       <Link>generator-errors.md</Link>
     </None>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Impl\ITypeOwner.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Impl\ITypeOwner.cs">
       <Link>ikvm\ITypeOwner.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Impl\SymbolSupport.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Impl\SymbolSupport.cs">
       <Link>ikvm\SymbolSupport.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\mcs\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\mcs\class\Mono.Security\Mono.Security.Cryptography\CryptoConvert.cs">
       <Link>ikvm\CryptoConvert.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\AmbiguousMatchException.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\AmbiguousMatchException.cs">
       <Link>ikvm\AmbiguousMatchException.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Assembly.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Assembly.cs">
       <Link>ikvm\Assembly.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\AssemblyName.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\AssemblyName.cs">
       <Link>ikvm\AssemblyName.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\BadImageFormatException.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\BadImageFormatException.cs">
       <Link>ikvm\BadImageFormatException.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Binder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Binder.cs">
       <Link>ikvm\Binder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\ConstructorInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\ConstructorInfo.cs">
       <Link>ikvm\ConstructorInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\CustomAttributeData.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\CustomAttributeData.cs">
       <Link>ikvm\CustomAttributeData.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\CustomAttributeNamedArgument.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\CustomAttributeNamedArgument.cs">
       <Link>ikvm\CustomAttributeNamedArgument.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\CustomAttributeTypedArgument.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\CustomAttributeTypedArgument.cs">
       <Link>ikvm\CustomAttributeTypedArgument.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\CustomModifiers.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\CustomModifiers.cs">
       <Link>ikvm\CustomModifiers.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Enums.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Enums.cs">
       <Link>ikvm\Enums.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\EventInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\EventInfo.cs">
       <Link>ikvm\EventInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\ExceptionHandlingClause.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\ExceptionHandlingClause.cs">
       <Link>ikvm\ExceptionHandlingClause.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\FieldInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\FieldInfo.cs">
       <Link>ikvm\FieldInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\FieldSignature.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\FieldSignature.cs">
       <Link>ikvm\FieldSignature.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Fusion.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Fusion.cs">
       <Link>ikvm\Fusion.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\GenericWrappers.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\GenericWrappers.cs">
       <Link>ikvm\GenericWrappers.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\InterfaceMapping.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\InterfaceMapping.cs">
       <Link>ikvm\InterfaceMapping.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\LocalVariableInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\LocalVariableInfo.cs">
       <Link>ikvm\LocalVariableInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\ManifestResourceInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\ManifestResourceInfo.cs">
       <Link>ikvm\ManifestResourceInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MarshalSpec.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MarshalSpec.cs">
       <Link>ikvm\MarshalSpec.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MemberInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MemberInfo.cs">
       <Link>ikvm\MemberInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MethodBase.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MethodBase.cs">
       <Link>ikvm\MethodBase.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MethodBody.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MethodBody.cs">
       <Link>ikvm\MethodBody.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MethodImplMap.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MethodImplMap.cs">
       <Link>ikvm\MethodImplMap.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MethodInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MethodInfo.cs">
       <Link>ikvm\MethodInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\MethodSignature.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\MethodSignature.cs">
       <Link>ikvm\MethodSignature.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Missing.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Missing.cs">
       <Link>ikvm\Missing.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Module.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Module.cs">
       <Link>ikvm\Module.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\ParameterInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\ParameterInfo.cs">
       <Link>ikvm\ParameterInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\ParameterModifier.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\ParameterModifier.cs">
       <Link>ikvm\ParameterModifier.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Projection.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Projection.cs">
       <Link>ikvm\Projection.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\PropertyInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\PropertyInfo.cs">
       <Link>ikvm\PropertyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\PropertySignature.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\PropertySignature.cs">
       <Link>ikvm\PropertySignature.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Signature.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Signature.cs">
       <Link>ikvm\Signature.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\StandAloneMethodSig.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\StandAloneMethodSig.cs">
       <Link>ikvm\StandAloneMethodSig.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\StrongNameKeyPair.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\StrongNameKeyPair.cs">
       <Link>ikvm\StrongNameKeyPair.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Type.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Type.cs">
       <Link>ikvm\Type.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\TypeInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\TypeInfo.cs">
       <Link>ikvm\TypeInfo.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\TypeNameParser.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\TypeNameParser.cs">
       <Link>ikvm\TypeNameParser.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Universe.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Universe.cs">
       <Link>ikvm\Universe.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Util.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Util.cs">
       <Link>ikvm\Util.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\coreclr.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\coreclr.cs">
       <Link>ikvm\coreclr.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\AssemblyBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\AssemblyBuilder.cs">
       <Link>ikvm\AssemblyBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\ConstructorBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\ConstructorBuilder.cs">
       <Link>ikvm\ConstructorBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\CustomAttributeBuilder.cs">
       <Link>ikvm\CustomAttributeBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\CustomModifiersBuilder.cs">
       <Link>ikvm\CustomModifiersBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\EnumBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\EnumBuilder.cs">
       <Link>ikvm\EnumBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\Enums.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\Enums.cs">
       <Link>ikvm\Enums.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\EventBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\EventBuilder.cs">
       <Link>ikvm\EventBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\ExceptionHandler.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\ExceptionHandler.cs">
       <Link>ikvm\ExceptionHandler.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\FieldBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\FieldBuilder.cs">
       <Link>ikvm\FieldBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\ILGenerator.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\ILGenerator.cs">
       <Link>ikvm\ILGenerator.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\MethodBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\MethodBuilder.cs">
       <Link>ikvm\MethodBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\ModuleBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\ModuleBuilder.cs">
       <Link>ikvm\ModuleBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\OpCode.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\OpCode.cs">
       <Link>ikvm\OpCode.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\OpCodes.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\OpCodes.cs">
       <Link>ikvm\OpCodes.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\ParameterBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\ParameterBuilder.cs">
       <Link>ikvm\ParameterBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\PropertyBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\PropertyBuilder.cs">
       <Link>ikvm\PropertyBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\SignatureHelper.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\SignatureHelper.cs">
       <Link>ikvm\SignatureHelper.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\Tokens.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\Tokens.cs">
       <Link>ikvm\Tokens.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Emit\TypeBuilder.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Emit\TypeBuilder.cs">
       <Link>ikvm\TypeBuilder.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Metadata\CliHeader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Metadata\CliHeader.cs">
       <Link>ikvm\CliHeader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Metadata\MetadataRW.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Metadata\MetadataRW.cs">
       <Link>ikvm\MetadataRW.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Metadata\Tables.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Metadata\Tables.cs">
       <Link>ikvm\Tables.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\AssemblyReader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\AssemblyReader.cs">
       <Link>ikvm\AssemblyReader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\Authenticode.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\Authenticode.cs">
       <Link>ikvm\Authenticode.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\ByteReader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\ByteReader.cs">
       <Link>ikvm\ByteReader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\EventInfoImpl.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\EventInfoImpl.cs">
       <Link>ikvm\EventInfoImpl.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\Field.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\Field.cs">
       <Link>ikvm\Field.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\GenericTypeParameter.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\GenericTypeParameter.cs">
       <Link>ikvm\GenericTypeParameter.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\MetadataReader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\MetadataReader.cs">
       <Link>ikvm\MetadataReader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\Method.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\Method.cs">
       <Link>ikvm\Method.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\ModuleReader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\ModuleReader.cs">
       <Link>ikvm\ModuleReader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\PEReader.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\PEReader.cs">
       <Link>ikvm\PEReader.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\PropertyInfoImpl.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\PropertyInfoImpl.cs">
       <Link>ikvm\PropertyInfoImpl.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\ResourceModule.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\ResourceModule.cs">
       <Link>ikvm\ResourceModule.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Reader\TypeDefImpl.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Reader\TypeDefImpl.cs">
       <Link>ikvm\TypeDefImpl.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\ByteBuffer.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\ByteBuffer.cs">
       <Link>ikvm\ByteBuffer.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\Heaps.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\Heaps.cs">
       <Link>ikvm\Heaps.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\MetadataWriter.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\MetadataWriter.cs">
       <Link>ikvm\MetadataWriter.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\ModuleWriter.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\ModuleWriter.cs">
       <Link>ikvm\ModuleWriter.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\PEWriter.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\PEWriter.cs">
       <Link>ikvm\PEWriter.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\ResourceSection.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\ResourceSection.cs">
       <Link>ikvm\ResourceSection.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\TextSection.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\TextSection.cs">
       <Link>ikvm\TextSection.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\external\ikvm\reflect\Writer\VersionInfo.cs">
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\external\ikvm\reflect\Writer\VersionInfo.cs">
       <Link>ikvm\VersionInfo.cs</Link>
     </Compile>
     <Compile Include="..\src\btouch.cs" />
@@ -359,7 +359,7 @@
     <Compile Include="..\tools\common\TargetFramework.cs" />
     <Compile Include="..\tools\common\StringUtils.cs" />
     <Compile Include="$(BuildDir)generator-frameworks.g.cs" />
-    <Compile Include="..\external\mono\mcs\class\Mono.Options\Mono.Options\Options.cs" />
+    <Compile Include="..\builds\mono-ios-sdk-destdir\ios-sources\mcs\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="..\src\Foundation\AdviceAttribute.cs" />
     <Compile Include="..\src\Foundation\ExportAttribute.cs" />
     <Compile Include="..\src\Foundation\FieldAttribute.cs" />
diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj
index b4a5e4fd932f..508b0214efc0 100644
--- a/tools/mmp/mmp.csproj
+++ b/tools/mmp/mmp.csproj
@@ -46,172 +46,172 @@
     <Compile Include="Assembly.cs" />
     <Compile Include="error.cs" />
     <Compile Include="SdkVersions.cs" />
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
       <Link>Mono.Tuner\ApplyPreserveAttributeBase.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\CecilRocks.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\CecilRocks.cs">
       <Link>Mono.Tuner\CecilRocks.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\CustomizeActions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\CustomizeActions.cs">
       <Link>Mono.Tuner\CustomizeActions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Dispatcher.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Dispatcher.cs">
       <Link>Mono.Tuner\Dispatcher.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Extensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Extensions.cs">
       <Link>Mono.Tuner\Extensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\PreserveCrypto.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\PreserveCrypto.cs">
       <Link>Mono.Tuner\PreserveCrypto.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
       <Link>Mono.Tuner\PreserveSoapHttpClients.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveAttributesBase.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveAttributesBase.cs">
       <Link>Mono.Tuner\RemoveAttributesBase.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveResources.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveResources.cs">
       <Link>Mono.Tuner\RemoveResources.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveSecurity.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveSecurity.cs">
       <Link>Mono.Tuner\RemoveSecurity.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\TunerAnnotations.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\TunerAnnotations.cs">
       <Link>Mono.Tuner\TunerAnnotations.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Annotations.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Annotations.cs">
       <Link>Linker\Annotations.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Inflater.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Inflater.cs">
       <Link>Linker\Inflater.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyAction.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyAction.cs">
       <Link>Linker\AssemblyAction.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyResolver.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyResolver.cs">
       <Link>Linker\AssemblyResolver.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\I18nAssemblies.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\I18nAssemblies.cs">
       <Link>Linker\I18nAssemblies.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\IXApiVisitor.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IXApiVisitor.cs">
       <Link>Linker\IXApiVisitor.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\ILogger.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\ILogger.cs">
       <Link>Linker\ILogger.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\ConsoleLogger.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\ConsoleLogger.cs">
       <Link>Linker\ConsoleLogger.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\LinkContext.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LinkContext.cs">
       <Link>Linker\LinkContext.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\LoadException.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LoadException.cs">
       <Link>Linker\LoadException.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MarkException.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MarkException.cs">
       <Link>Linker\MarkException.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodAction.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodAction.cs">
       <Link>Linker\MethodAction.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Pipeline.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Pipeline.cs">
       <Link>Linker\Pipeline.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodReferenceExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodReferenceExtensions.cs">
       <Link>Linker\Linker\MethodReferenceExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MarkingHelpers.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MarkingHelpers.cs">
       <Link>Linker\Linker\MarkingHelpers.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Tracer.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Tracer.cs">
       <Link>Linker\Linker\Tracer.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeReferenceExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeReferenceExtensions.cs">
       <Link>Linker\Linker\TypeReferenceExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypePreserve.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypePreserve.cs">
       <Link>Linker\TypePreserve.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\KnownMembers.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\KnownMembers.cs">
       <Link>Linker\KnownMembers.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\BCL.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\BCL.cs">
       <Link>Linker\BCL.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodDefinitionExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodDefinitionExtensions.cs">
       <Link>Linker\MethodDefinitionExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeDefinitionExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeDefinitionExtensions.cs">
       <Link>Linker\TypeDefinitionExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodBodyScanner.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodBodyScanner.cs">
       <Link>Linker\MethodBodyScanner.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\OverrideInformation.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OverrideInformation.cs">
       <Link>Linker\OverrideInformation.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyUtilities.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyUtilities.cs">
       <Link>Linker\AssemblyUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeNameParser.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeNameParser.cs">
       <Link>Linker\TypeNameParser.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\XApiReader.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\XApiReader.cs">
       <Link>Linker\XApiReader.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\BaseStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
       <Link>Linker.Steps\BaseStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\BlacklistStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BlacklistStep.cs">
       <Link>Linker.Steps\BlacklistStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\CleanStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\CleanStep.cs">
       <Link>Linker.Steps\CleanStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\IStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\IStep.cs">
       <Link>Linker.Steps\IStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\LoadI18nAssemblies.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\LoadI18nAssemblies.cs">
       <Link>Linker.Steps\LoadI18nAssemblies.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\LoadReferencesStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\LoadReferencesStep.cs">
       <Link>Linker.Steps\LoadReferencesStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\MarkStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\MarkStep.cs">
       <Link>Linker.Steps\MarkStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\OutputStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\OutputStep.cs">
       <Link>Linker.Steps\OutputStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\PreserveDependencyLookupStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\PreserveDependencyLookupStep.cs">
       <Link>Linker.Steps\PreserveDependencyLookupStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\RegenerateGuidStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\RegenerateGuidStep.cs">
       <Link>Linker.Steps\RegenerateGuidStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
       <Link>Linker.Steps\ResolveFromAssemblyStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromXApiStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromXApiStep.cs">
       <Link>Linker.Steps\ResolveFromXApiStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromXmlStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromXmlStep.cs">
       <Link>Linker.Steps\ResolveFromXmlStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveStep.cs">
       <Link>Linker.Steps\ResolveStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\SweepStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\SweepStep.cs">
       <Link>Linker.Steps\SweepStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\TypeMapStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\TypeMapStep.cs">
       <Link>Linker.Steps\TypeMapStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Profile.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Profile.cs">
       <Link>Mono.Tuner\Profile.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\mcs\class\Mono.Options\Mono.Options\Options.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\mcs\class\Mono.Options\Mono.Options\Options.cs">
       <Link>Options.cs</Link>
     </Compile>
     <Compile Include="linker\MonoMac.Tuner\MonoMacMarkStep.cs">
diff --git a/tools/mtouch/mtouch.csproj b/tools/mtouch/mtouch.csproj
index fce048fb3cee..9b9b5d7accae 100644
--- a/tools/mtouch/mtouch.csproj
+++ b/tools/mtouch/mtouch.csproj
@@ -43,7 +43,7 @@
     <Compile Include="Stripper.cs" />
     <Compile Include="Target.cs" />
     <Compile Include="Tuning.cs" />
-    <Compile Include="..\..\external\mono\mcs\class\Mono.Options\Mono.Options\Options.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\mcs\class\Mono.Options\Mono.Options\Options.cs">
       <Link>Options.cs</Link>
     </Compile>
     <Compile Include="..\..\src\build\ios\Constants.cs">
@@ -79,154 +79,154 @@
     <Compile Include="..\linker\MonoTouch.Tuner\RemoveCode.cs">
       <Link>MonoTouch.Tuner\RemoveCode.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\XApiReader.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\XApiReader.cs">
       <Link>Linker\XApiReader.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Annotations.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Annotations.cs">
       <Link>Linker\Annotations.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Inflater.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Inflater.cs">
       <Link>Linker\Inflater.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\LinkContext.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LinkContext.cs">
       <Link>Linker\LinkContext.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Pipeline.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Pipeline.cs">
       <Link>Linker\Pipeline.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodReferenceExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodReferenceExtensions.cs">
       <Link>Linker\MethodReferenceExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MarkingHelpers.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MarkingHelpers.cs">
       <Link>Linker\Linker\MarkingHelpers.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\Tracer.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\Tracer.cs">
       <Link>Linker\Linker\Tracer.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeReferenceExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeReferenceExtensions.cs">
       <Link>Linker\TypeReferenceExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\KnownMembers.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\KnownMembers.cs">
       <Link>Linker\KnownMembers.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\BCL.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\BCL.cs">
       <Link>Linker\BCL.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodDefinitionExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodDefinitionExtensions.cs">
       <Link>Linker\MethodDefinitionExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeDefinitionExtensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeDefinitionExtensions.cs">
       <Link>Linker\TypeDefinitionExtensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodBodyScanner.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodBodyScanner.cs">
       <Link>Linker\MethodBodyScanner.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\OverrideInformation.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\OverrideInformation.cs">
       <Link>Linker\OverrideInformation.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyResolver.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyResolver.cs">
       <Link>Linker\AssemblyResolver.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\IXApiVisitor.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\IXApiVisitor.cs">
       <Link>Linker\IXApiVisitor.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\ILogger.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\ILogger.cs">
       <Link>Linker\ILogger.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\ConsoleLogger.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\ConsoleLogger.cs">
       <Link>Linker\ConsoleLogger.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\I18nAssemblies.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\I18nAssemblies.cs">
       <Link>Linker\I18nAssemblies.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyAction.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyAction.cs">
       <Link>Linker\AssemblyAction.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypePreserve.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypePreserve.cs">
       <Link>Linker\TypePreserve.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\LoadException.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\LoadException.cs">
       <Link>Linker\LoadException.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MarkException.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MarkException.cs">
       <Link>Linker\MarkException.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\MethodAction.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\MethodAction.cs">
       <Link>Linker\MethodAction.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\BaseStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BaseStep.cs">
       <Link>Linker.Steps\BaseStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\BlacklistStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\BlacklistStep.cs">
       <Link>Linker.Steps\BlacklistStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\CleanStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\CleanStep.cs">
       <Link>Linker.Steps\CleanStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\IStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\IStep.cs">
       <Link>Linker.Steps\IStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\LoadI18nAssemblies.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\LoadI18nAssemblies.cs">
       <Link>Linker.Steps\LoadI18nAssemblies.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\LoadReferencesStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\LoadReferencesStep.cs">
       <Link>Linker.Steps\LoadReferencesStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\MarkStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\MarkStep.cs">
       <Link>Linker.Steps\MarkStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\OutputStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\OutputStep.cs">
       <Link>Linker.Steps\OutputStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\PreserveDependencyLookupStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\PreserveDependencyLookupStep.cs">
       <Link>Linker.Steps\PreserveDependencyLookupStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromAssemblyStep.cs">
       <Link>Linker.Steps\ResolveFromAssemblyStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromXApiStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromXApiStep.cs">
       <Link>Linker.Steps\ResolveFromXApiStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveFromXmlStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveFromXmlStep.cs">
       <Link>Linker.Steps\ResolveFromXmlStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\ResolveStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\ResolveStep.cs">
       <Link>Linker.Steps\ResolveStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\SweepStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\SweepStep.cs">
       <Link>Linker.Steps\SweepStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker.Steps\TypeMapStep.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker.Steps\TypeMapStep.cs">
       <Link>Linker.Steps\TypeMapStep.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\ApplyPreserveAttributeBase.cs">
       <Link>Mono.Tuner\ApplyPreserveAttributeBase.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveAttributesBase.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveAttributesBase.cs">
       <Link>Mono.Tuner\RemoveAttributesBase.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\PreserveSoapHttpClients.cs">
       <Link>Mono.Tuner\PreserveSoapHttpClients.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Profile.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Profile.cs">
       <Link>Mono.Tuner\Profile.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\CustomizeActions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\CustomizeActions.cs">
       <Link>Mono.Tuner\CustomizeActions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveResources.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveResources.cs">
       <Link>Mono.Tuner\RemoveResources.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\RemoveSecurity.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\RemoveSecurity.cs">
       <Link>Mono.Tuner\RemoveSecurity.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Extensions.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Extensions.cs">
       <Link>Mono.Tuner\Extensions.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\FixModuleFlags.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\FixModuleFlags.cs">
       <Link>Mono.Tuner\FixModuleFlags.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\Dispatcher.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\Dispatcher.cs">
       <Link>Mono.Tuner\Dispatcher.cs</Link>
     </Compile>
     <Compile Include="..\linker\MonoTouch.Tuner\MonoTouchSweepStep.cs">
@@ -235,7 +235,7 @@
     <Compile Include="..\linker\MonoTouch.Tuner\ProcessExportedFields.cs">
       <Link>MonoTouch.Tuner\ProcessExportedFields.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\tuner\Mono.Tuner\CecilRocks.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\tuner\Mono.Tuner\CecilRocks.cs">
       <Link>Mono.Tuner\CecilRocks.cs</Link>
     </Compile>
     <Compile Include="..\linker\MobileProfile.cs">
@@ -404,10 +404,10 @@
     <Compile Include="..\..\src\ObjCRuntime\BindingImplAttribute.cs">
       <Link>external\maccore\BindingImplAttribute.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\AssemblyUtilities.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\AssemblyUtilities.cs">
       <Link>Linker\AssemblyUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\..\external\mono\external\linker\src\linker\Linker\TypeNameParser.cs">
+    <Compile Include="..\..\builds\mono-ios-sdk-destdir\ios-sources\external\linker\src\linker\Linker\TypeNameParser.cs">
       <Link>Linker\TypeNameParser.cs</Link>
     </Compile>
     <Compile Include="..\linker\MonoTouch.Tuner\RemoveBitcodeIncompatibleCodeStep.cs">