From d5135cce25e60419b70093b825d292765cc2a842 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 16 Dec 2019 19:06:25 +0100
Subject: [PATCH] [msbuild] Update to latest ILRepack. (#7594)

The latest ILRepack has fixes for netstandard we'll need.

Also use package references.
---
 msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj | 3 +--
 msbuild/Xamarin.Mac.Tasks/packages.config          | 4 ----
 msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj | 5 +----
 msbuild/Xamarin.iOS.Tasks/packages.config          | 4 ----
 4 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 msbuild/Xamarin.Mac.Tasks/packages.config
 delete mode 100644 msbuild/Xamarin.iOS.Tasks/packages.config

diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
index 09e812522b..31a526ad80 100644
--- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
+++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Tasks.csproj
@@ -69,6 +69,7 @@
       <Project>{7B095849-6FDB-4BD2-9B59-569D81A1A809}</Project>
       <Name>Xamarin.MacDev.Tasks.Core</Name>
     </ProjectReference>
+    <PackageReference Include="ILRepack" Version="2.0.18" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Xamarin.Mac.Common.ImplicitFacade.msbuild.targets">
@@ -116,10 +117,8 @@
     <None Include="../Xamarin.Shared/Xamarin.Shared.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\ILRepack.2.0.13\build\ILRepack.props" Condition="Exists('..\..\packages\ILRepack.2.0.13\build\ILRepack.props')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/msbuild/Xamarin.Mac.Tasks/packages.config b/msbuild/Xamarin.Mac.Tasks/packages.config
deleted file mode 100644
index 049ad7d76e..0000000000
--- a/msbuild/Xamarin.Mac.Tasks/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ILRepack" version="2.0.13" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj b/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
index 54fc7d7f0c..01959326a3 100644
--- a/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
+++ b/msbuild/Xamarin.iOS.Tasks/Xamarin.iOS.Tasks.csproj
@@ -96,17 +96,14 @@
       <Project>{CC3D9353-20C4-467A-8522-A9DED6F0C753}</Project>
       <Name>Xamarin.MacDev</Name>
     </ProjectReference>
+    <PackageReference Include="ILRepack" Version="2.0.18" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" HintPath="$(MSBuildBinPath)\Microsoft.Build.Framework.dll" />
     <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Utilities.Core.dll" />
     <Reference Include="Microsoft.Build.Tasks.Core" HintPath="$(MSBuildBinPath)\Microsoft.Build.Tasks.Core.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\ILRepack.2.0.13\build\ILRepack.props" Condition="Exists('..\..\packages\ILRepack.2.0.13\build\ILRepack.props')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/msbuild/Xamarin.iOS.Tasks/packages.config b/msbuild/Xamarin.iOS.Tasks/packages.config
deleted file mode 100644
index 049ad7d76e..0000000000
--- a/msbuild/Xamarin.iOS.Tasks/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ILRepack" version="2.0.13" targetFramework="net45" />
-</packages>
\ No newline at end of file