diff options
| author | Eric StJohn <ericstj@microsoft.com> | 2019-02-26 14:16:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 14:16:55 -0800 |
| commit | 79341dcfaeb454d684e039e648f2a555f7da4bd0 (patch) | |
| tree | 77dce34b5ec0bb1d0ba3b8d94b481cb1a17bc842 /src/.nuget | |
| parent | 56697257c4e24aa24a64b70eb4ce07d91882005b (diff) | |
| download | coreclr-79341dcfaeb454d684e039e648f2a555f7da4bd0.tar.gz coreclr-79341dcfaeb454d684e039e648f2a555f7da4bd0.tar.bz2 coreclr-79341dcfaeb454d684e039e648f2a555f7da4bd0.zip | |
Fix _IlasmDir definition (#22856)
Diffstat (limited to 'src/.nuget')
| -rw-r--r-- | src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets index 2b2196fa5f..035db37526 100644 --- a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets +++ b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets @@ -35,9 +35,9 @@ Copyright (c) .NET Foundation. All rights reserved. <!-- If ILAsmToolPath is specified, it will be used and no packages will be restored Otherwise packages will be restored and copied to $(ToolsDir)\ilasm If ToolsDir is not defined a directory will be created under obj ($(BaseIntermediateOutputPath)). --> - <_IlasmDir>$([MSBuild]::NormalizeDirectory($(ILAsmToolPath)))</_IlasmDir> - <_IlasmDir Condition="'$(_IlasmDir)' == '' AND '$(ToolsDir)' != ''">$([MSBuild]::NormalizeDirectory($(ToolsDir), 'ilasm'))</ILAsmDir> - <_IlasmDir Condition="'$(_IlasmDir)' == ''">$([MSBuild]::NormalizeDirectory($(BaseIntermediateOutputPath), 'ilasm'))</ToolsDir> + <_IlasmDir Condition="'$(ILAsmToolPath)' != ''">$([MSBuild]::NormalizeDirectory($(ILAsmToolPath)))</_IlasmDir> + <_IlasmDir Condition="'$(_IlasmDir)' == '' AND '$(ToolsDir)' != ''">$([MSBuild]::NormalizeDirectory($(ToolsDir), 'ilasm'))</_IlasmDir> + <_IlasmDir Condition="'$(_IlasmDir)' == ''">$([MSBuild]::NormalizeDirectory($(BaseIntermediateOutputPath), 'ilasm'))</_IlasmDir> <CoreCompileDependsOn Condition="'$(ILAsmToolPath)' == ''">$(CoreCompileDependsOn);CopyILAsmTool</CoreCompileDependsOn> </PropertyGroup> |