From 412d9b0953e5ada2139579fc5f48c31d8bc13e71 Mon Sep 17 00:00:00 2001
From: Andi McClure <andi.mcclure@xamarin.com>
Date: Wed, 8 Feb 2017 16:55:31 -0500
Subject: [PATCH 1/2] Update mono to 2017-02 "monthly master" branch and fix a
 build script for compatibility.

---
 build-tools/mono-runtimes/mono-runtimes.targets | 3 ++-
 external/mono                                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index 969f7786fce..852120d5f3a 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -8,7 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <MonoDocCopyItem Include="monodoc.dll" />
-    <MonoDocCopyItem Include="monodoc.dll.mdb" />
+    <MonoDocCopyItem Include="monodoc.pdb"  Condition="Exists ('monodoc.pdb')" />
+    <MonoDocCopyItem Include="monodoc.dll.mdb"  Condition="Exists ('monodoc.dll.mdb')" />
     <MonoDocCopyItem Include="monodoc.dll.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/external/mono b/external/mono
index dd8ecf3a1dc..6019eeb483e 160000
--- a/external/mono
+++ b/external/mono
@@ -1 +1 @@
-Subproject commit dd8ecf3a1dc09e88fd5c82dddf56d14a2aff65d9
+Subproject commit 6019eeb483e1da51fbb0171b72ee6baf44fd78cf

From ae72e88fa41653cfaca4c15717abc179381ddc7f Mon Sep 17 00:00:00 2001
From: Andi McClure <andi.mcclure@xamarin.com>
Date: Thu, 9 Feb 2017 18:28:11 -0500
Subject: [PATCH 2/2] Correct "Exists" logic on monodoc debug files

The previous commit's attempts to copy the pdb/mdb files for monodoc had a problem where they would be evaluated too early (probably before the files existed) and in the wrong directory. To address this, the files are instead specified as a MonoDocCopyItemOptional, a new target _GetMonodocItems is created and the ItemGroups for _MonoDocCopyItems/_MonoDocInstalledItems are evaluated in this target with correct Exists logic for the Optional files. Additional DependsOnTargets attributes were distributed through the file to ensure this new target is evaluated at the correct time.
---
 .../mono-runtimes/mono-runtimes.targets       | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets
index 852120d5f3a..9195951ad1f 100644
--- a/build-tools/mono-runtimes/mono-runtimes.targets
+++ b/build-tools/mono-runtimes/mono-runtimes.targets
@@ -8,8 +8,8 @@
   </PropertyGroup>
   <ItemGroup>
     <MonoDocCopyItem Include="monodoc.dll" />
-    <MonoDocCopyItem Include="monodoc.pdb"  Condition="Exists ('monodoc.pdb')" />
-    <MonoDocCopyItem Include="monodoc.dll.mdb"  Condition="Exists ('monodoc.dll.mdb')" />
+    <MonoDocCopyItemOptional Include="monodoc.pdb" />
+    <MonoDocCopyItemOptional Include="monodoc.dll.mdb" />
     <MonoDocCopyItem Include="monodoc.dll.config" />
   </ItemGroup>
   <ItemGroup>
@@ -26,13 +26,6 @@
     <_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
     <_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\net_4_x</_MonoOutputDir>
   </PropertyGroup>
-  <ItemGroup>
-    <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
-  </ItemGroup>
-  <ItemGroup>
-    <_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
-    <_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
-  </ItemGroup>
   <PropertyGroup>
     <ForceBuildDependsOn>
       _BuildLlvm;
@@ -147,7 +140,7 @@
     />
   </Target>
   <Target Name="_ConfigureRuntimes"
-      DependsOnTargets="_BuildLlvm"
+      DependsOnTargets="_BuildLlvm;_Autogen"
       Inputs="$(MonoSourceFullPath)\configure"
       Outputs="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\Makefile">
     <MakeDir Directories="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)" />
@@ -231,7 +224,7 @@
     </ItemGroup>
   </Target>
   <Target Name="_BuildRuntimes"
-      DependsOnTargets="_GetRuntimesOutputItems"
+      DependsOnTargets="_GetRuntimesOutputItems;_ConfigureRuntimes"
       Inputs="@(_RuntimeBuildStamp)"
       Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)">
     <Exec
@@ -324,9 +317,27 @@
     />
     <Touch Files="@(_InstallMonoPosixHelperOutput);@(_InstallUnstrippedMonoPosixHelperOutput)" />
   </Target>
+  <Target Name="_GetMonodocItems" DependsOnTargets="_BuildRuntimes">
+    <ItemGroup>
+      <_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
+      <_MonoDocCopyItems
+          Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
+          Include="@(MonoDocCopyItemOptional->'$(_MonoOutputDir)\%(Identity)')"
+      />
+    </ItemGroup>
+    <ItemGroup>
+      <_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
+      <_MonoDocInstalledItems
+          Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
+          Include="@(MonoDocCopyItemOptional->'$(_MandroidDir)\%(Identity)')"
+      />
+      <_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
+    </ItemGroup>
+  </Target>
   <Target Name="_InstallMonoDoc"
       Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
-      Outputs="@(_MonoDocInstalledItems)">
+      Outputs="@(_MonoDocInstalledItems)"
+      DependsOnTargets="_GetMonodocItems">
     <MakeDir Directories="$(_MandroidDir)" />
     <Copy
         SourceFiles="@(_MonoDocCopyItems)"
@@ -475,7 +486,7 @@
     />
   </Target>
   <Target Name="GetMonoBundleItems"
-      DependsOnTargets="_GetRuntimesOutputItems;_PrepareLlvmItems">
+      DependsOnTargets="_GetRuntimesOutputItems;_GetMonodocItems;_PrepareLlvmItems">
     <ItemGroup>
       <BundleItem Include="@(_BclInstalledItem)" />
       <BundleItem Include="@(_MonoDocInstalledItems)" />