From: Eric StJohn <ericstj@microsoft.com>
Date: Tue, 26 Feb 2019 22:16:55 +0000 (-0800)
Subject: Fix _IlasmDir definition (dotnet/coreclr#22856)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~2378
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60f75fe26d92bc1309960b739363368d51008bba;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix _IlasmDir definition (dotnet/coreclr#22856)



Commit migrated from https://github.com/dotnet/coreclr/commit/79341dcfaeb454d684e039e648f2a555f7da4bd0
---

diff --git a/src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets b/src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
index 2b2196f..035db37 100644
--- a/src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
+++ b/src/coreclr/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>