From 15f3da713096c61b8e4c2d3064300698785dd54c Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 17 May 2018 09:26:00 +0100
Subject: [PATCH 1/5] [Xamarin.Android.Build.Tasks] ILRepack the NuGet.* Tasks
 Dependencies.

`ResolveAssemblies` is throwing the following error on
a newer mono (2018-04).

	error : Could not load file or assembly 'NuGet.ProjectModel, Version=4.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' or one of its dependencies.

This is because we took a dependency on NuGet.ProjectModel 4.6 and
the newer mono has 4.7. This results in the error above.

Now we cannot always be sure which version of the NuGet assemblies
will be installed since users are able to upgrade mono independently.
So this PR will use the `ILRepack` NuGet to package up the dependencies
we need so that `Xamarin.Android.Build.Tasks` contains all the
correct assemblies it needs.
---
 .../ILRepack.targets                          | 31 +++++++++++++++++++
 .../Xamarin.Android.Build.Tasks.csproj        |  1 +
 .../packages.config                           |  3 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/Xamarin.Android.Build.Tasks/ILRepack.targets

diff --git a/src/Xamarin.Android.Build.Tasks/ILRepack.targets b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
new file mode 100644
index 00000000000..69b232fb0ab
--- /dev/null
+++ b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+
+    <ItemGroup>
+		<InputAssemblies Include="$(OutputPath)\$(AssemblyName).dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.ProjectModel.dll" />
+        <InputAssemblies Include="$(OutputPath)\Newtonsoft.Json.dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.Frameworks.dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.LibraryModel.dll" />
+        <InputAssemblies Include="$(OutputPath)\NuGet.Versioning.dll" />
+		<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.dll" />
+		<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.Core.dll" />
+		<InputAssemblies Include="$(OutputPath)\NuGet.DependencyResolver.Core.dll" />
+		<InputAssemblies Include="$(OutputPath)\NuGet.Configuration.dll" />
+    </ItemGroup>
+
+    <ILRepack
+        Parallel="true"
+        Internalize="true"
+		Verbose="true"
+        InternalizeExclude="@(DoNotInternalizeAssemblies)"
+        InputAssemblies="@(InputAssemblies)"
+        TargetKind="Dll"
+        OutputFile="$(OutputPath)\$(AssemblyName).dll"
+    />
+
+    </Target>
+</Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index fbcc47bac5b..8f765107328 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -585,6 +585,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Xamarin.Android.Build.Tasks.targets" />
+    <None Include="ILRepack.targets" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Xamarin.Android.Build.Tasks/packages.config b/src/Xamarin.Android.Build.Tasks/packages.config
index 78c0fa586fb..db51087c32e 100644
--- a/src/Xamarin.Android.Build.Tasks/packages.config
+++ b/src/Xamarin.Android.Build.Tasks/packages.config
@@ -16,4 +16,5 @@
   <package id="NuGet.Versioning" version="4.6.0" targetFramework="net462" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
-</packages>
\ No newline at end of file
+  <package id="ILRepack.Lib.MSBuild.Task" version="2.0.15.4" targetFramework="net462" />
+</packages>

From c521532eaba3481c9b1e1d615a366eeded63d499 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 17 May 2018 10:10:52 +0100
Subject: [PATCH 2/5] Imported ILRepack targets

---
 .../Xamarin.Android.Build.Tasks.csproj                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
index 8f765107328..be5413e57be 100644
--- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
+++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
@@ -734,4 +734,5 @@
     <Folder Include="Linker\Linker\" />
     <Folder Include="utils\" />
   </ItemGroup>
+  <Import Project="..\..\packages\ILRepack.Lib.MSBuild.Task.2.0.15.4\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('..\..\packages\ILRepack.Lib.MSBuild.Task.2.0.15.4\build\ILRepack.Lib.MSBuild.Task.targets')" />
 </Project>

From 3a6031fda579b6d70c739c3ccd552cdf9cd56641 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 17 May 2018 10:23:04 +0100
Subject: [PATCH 3/5] Fixed up ILRepack.targets

---
 .../ILRepack.targets                          | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/ILRepack.targets b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
index 69b232fb0ab..a46291b183f 100644
--- a/src/Xamarin.Android.Build.Tasks/ILRepack.targets
+++ b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
@@ -1,31 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
-
-    <ItemGroup>
-		<InputAssemblies Include="$(OutputPath)\$(AssemblyName).dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.ProjectModel.dll" />
-        <InputAssemblies Include="$(OutputPath)\Newtonsoft.Json.dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.Frameworks.dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.LibraryModel.dll" />
-        <InputAssemblies Include="$(OutputPath)\NuGet.Versioning.dll" />
-		<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.dll" />
-		<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.Core.dll" />
-		<InputAssemblies Include="$(OutputPath)\NuGet.DependencyResolver.Core.dll" />
-		<InputAssemblies Include="$(OutputPath)\NuGet.Configuration.dll" />
-    </ItemGroup>
-
-    <ILRepack
-        Parallel="true"
-        Internalize="true"
-		Verbose="true"
-        InternalizeExclude="@(DoNotInternalizeAssemblies)"
-        InputAssemblies="@(InputAssemblies)"
-        TargetKind="Dll"
-        OutputFile="$(OutputPath)\$(AssemblyName).dll"
-    />
-
-    </Target>
-</Project>
+	<Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+		<ItemGroup>
+			<InputAssemblies Include="$(OutputPath)\$(AssemblyName).dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.ProjectModel.dll" />
+			<InputAssemblies Include="$(OutputPath)\Newtonsoft.Json.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Frameworks.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.LibraryModel.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Versioning.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Packaging.Core.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.DependencyResolver.Core.dll" />
+			<InputAssemblies Include="$(OutputPath)\NuGet.Configuration.dll" />
+		</ItemGroup>
+		<ILRepack Parallel="true"
+			Internalize="true"
+			Verbose="true"
+			InternalizeExclude="@(DoNotInternalizeAssemblies)"
+			InputAssemblies="@(InputAssemblies)"
+			LibraryPath="$(OutputPath)"
+			TargetKind="Dll"
+			OutputFile="$(OutputPath)\$(AssemblyName).dll"
+		/>
+	</Target>
+</Project>
\ No newline at end of file

From c196dc4372f44c4c171d16cd3eda703c25852b79 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 17 May 2018 11:04:24 +0100
Subject: [PATCH 4/5] Clean up

---
 src/Xamarin.Android.Build.Tasks/ILRepack.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Xamarin.Android.Build.Tasks/ILRepack.targets b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
index a46291b183f..2f6f7d5e65f 100644
--- a/src/Xamarin.Android.Build.Tasks/ILRepack.targets
+++ b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+	<Target Name="ILRepacker" AfterTargets="Build">
 		<ItemGroup>
-			<InputAssemblies Include="$(OutputPath)\$(AssemblyName).dll" />
 			<InputAssemblies Include="$(OutputPath)\NuGet.ProjectModel.dll" />
 			<InputAssemblies Include="$(OutputPath)\Newtonsoft.Json.dll" />
 			<InputAssemblies Include="$(OutputPath)\NuGet.Common.dll" />
@@ -19,10 +18,11 @@
 			Internalize="true"
 			Verbose="true"
 			InternalizeExclude="@(DoNotInternalizeAssemblies)"
-			InputAssemblies="@(InputAssemblies)"
+			InputAssemblies="$(OutputPath)\$(AssemblyName).dll;@(InputAssemblies)"
 			LibraryPath="$(OutputPath)"
 			TargetKind="Dll"
 			OutputFile="$(OutputPath)\$(AssemblyName).dll"
 		/>
+		<Delete Files="@(InputAssemblies)" />
 	</Target>
 </Project>
\ No newline at end of file

From 258d6539b3ad064faacdaf388758c824065caa37 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Thu, 17 May 2018 11:49:18 +0100
Subject: [PATCH 5/5] Add DebugInfo

---
 src/Xamarin.Android.Build.Tasks/ILRepack.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Xamarin.Android.Build.Tasks/ILRepack.targets b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
index 2f6f7d5e65f..cd8186a00c9 100644
--- a/src/Xamarin.Android.Build.Tasks/ILRepack.targets
+++ b/src/Xamarin.Android.Build.Tasks/ILRepack.targets
@@ -17,6 +17,7 @@
 		<ILRepack Parallel="true"
 			Internalize="true"
 			Verbose="true"
+			DebugInfo="true"
 			InternalizeExclude="@(DoNotInternalizeAssemblies)"
 			InputAssemblies="$(OutputPath)\$(AssemblyName).dll;@(InputAssemblies)"
 			LibraryPath="$(OutputPath)"