From e864120d14c829df6f6d4c6cff6f3d23db19606c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Wed, 29 Nov 2017 19:16:18 +0100
Subject: [PATCH] Use ILAsm from buildtools (#15172)

* Use ILAsm from buildtools

On Windows: this stops using the ILASM that ships with Windows in favor
of CoreCLR ILASM
On Unix: this stops using the live built ILASM.

I image this fixes some issues in crossbuild on both platforms but I
can't find where the workarounds for that are.

Necessary prerequisite for being able to build tests for the default
interfaces feature.
---
 tests/dir.props       |  1 -
 tests/src/IL.targets  | 37 -------------------------------------
 tests/src/dir.targets |  5 ++---
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 tests/src/IL.targets

diff --git a/tests/dir.props b/tests/dir.props
index 0d00f65..f65af48 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -43,7 +43,6 @@
     <_TargetFrameworkDirectories Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories>
     <_FullFrameworkReferenceAssemblyPaths Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
     <ExcludeSigningImport>true</ExcludeSigningImport>
-    <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 
   <!-- Common properties -->
diff --git a/tests/src/IL.targets b/tests/src/IL.targets
deleted file mode 100644
index d1075e5..0000000
--- a/tests/src/IL.targets
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- Required by Microsoft.Common.targets -->
-  <Target Name="CreateManifestResourceNames" Condition="'@(EmbeddedResource)' != ''" />
-
-  <Target Name="CoreCompile"
-          Inputs="$(MSBuildAllProjects);
-                  @(Compile)"
-          Outputs="@(IntermediateAssembly);"
-          Returns=""
-          DependsOnTargets="$(CoreCompileDependsOn)">
-    <PropertyGroup>
-      <_ShellKeyMarker Condition="'$(RunningOnUnix)' == 'true'">-</_ShellKeyMarker>  <!-- Work around ilasm comandline parser bugs... -->
-      <_ShellKeyMarker Condition="'$(RunningOnUnix)' != 'true'">/</_ShellKeyMarker>
-      <_ilasm>ilasm</_ilasm>
-      <_ilasm Condition="'$(RunningOnUnix)' == 'true'">$(CoreCLRBinDir)ilasm</_ilasm>
-      <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">$(_ShellKeyMarker)DLL</_OutputTypeArgument>
-      <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">$(_ShellKeyMarker)EXE</_OutputTypeArgument>
-      <_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) -STACK=$(SizeOfStackReserve)</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
-      <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches>
-    </PropertyGroup>
-
-    <Exec Command="$(_ilasm) $(_OutputTypeArgument) $(_ShellKeyMarker)OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)">
-      <Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" />
-    </Exec>
-    <Error Text="ILAsm failed" Condition="'$(_ILAsmExitCode)' != '0'" />
-  </Target>
-
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
-
-</Project>
diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 4aa925f..e6845e0 100644
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -106,10 +106,9 @@
   <PropertyGroup Condition="'$(ProjectLanguage)' == ''">
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.ilproj' OR '$(Language)' == 'IL'">IL</ProjectLanguage>
     <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage>
-  </PropertyGroup>
-  
-  <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL' And '$(CLRTestPriority)' &lt;= '$(CLRTestPriorityToBuild)'" />
 
+    <SkipImportILTargets Condition="'$(CLRTestPriority)' &gt; '$(CLRTestPriorityToBuild)'">true</SkipImportILTargets>
+  </PropertyGroup>
 
   <Import Project="CLRTest.Execute.targets" />
   <Target Name="CreateExecuteScript" 
-- 
2.7.4