diff options
| author | Michal Strehovský <MichalStrehovsky@users.noreply.github.com> | 2017-11-29 19:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 19:16:18 +0100 |
| commit | e864120d14c829df6f6d4c6cff6f3d23db19606c (patch) | |
| tree | dc1fc4c5f8d36391115a4f075be16d9345cf5b7a /tests/src/dir.targets | |
| parent | eb6430a72fa0fd6c5ee79b7b2209f7c51559f0c1 (diff) | |
| download | coreclr-e864120d14c829df6f6d4c6cff6f3d23db19606c.tar.gz coreclr-e864120d14c829df6f6d4c6cff6f3d23db19606c.tar.bz2 coreclr-e864120d14c829df6f6d4c6cff6f3d23db19606c.zip | |
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.
Diffstat (limited to 'tests/src/dir.targets')
| -rw-r--r-- | tests/src/dir.targets | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 4aa925fbda..e6845e0fd1 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)' <= '$(CLRTestPriorityToBuild)'" /> + <SkipImportILTargets Condition="'$(CLRTestPriority)' > '$(CLRTestPriorityToBuild)'">true</SkipImportILTargets> + </PropertyGroup> <Import Project="CLRTest.Execute.targets" /> <Target Name="CreateExecuteScript" |