From 0276cf29a4f997e47d12faf156abc05a686f9675 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 31 Aug 2018 09:52:16 -0700
Subject: [PATCH] Adding ILDasm restore and resources switches in order to be
 able to produce resources for System.Runtime.CompilerServices.Unsafe.dll
 (#2127)

---
 src/Microsoft.DotNet.Build.Tasks/PackageFiles/IL.targets         | 1 +
 .../PackageFiles/ilasm/ilasm.depproj                             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/IL.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/IL.targets
index ed536452e0..335e625795 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/IL.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/IL.targets
@@ -43,6 +43,7 @@
       <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
       <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
       <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(IlasmResourceFile)' != ''">$(_IlasmSwitches) -RESOURCES=$(IlasmResourceFile)</_IlasmSwitches>
     </PropertyGroup>
 
     <Exec Command="$(IlasmToolPath) $(_IlasmSwitches) $(_OutputTypeArgument) $(IlasmFlags) -OUTPUT=@(IntermediateAssembly) $(_KeyFileArgument) @(Compile, ' ')">
diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ilasm/ilasm.depproj b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ilasm/ilasm.depproj
index 9ae9f68dc6..251f2929cd 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ilasm/ilasm.depproj
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ilasm/ilasm.depproj
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(ILAsmPackageVersion)" />
+    <PackageReference Include="Microsoft.NETCore.ILDAsm" Version="$(ILAsmPackageVersion)" />
 
     <!-- ILAsm has a very unfortunate runtime dependency on CoreCLR, so we need to grab that too -->
     <!-- https://github.com/dotnet/coreclr/issues/15059 -->