Address additional feedback from #40172 (#40505)

dotnet · Aug 7, 2020 · ebc57b9 · ebc57b9
1 parent fb6043a
commit ebc57b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/eng/illink.targets b/eng/illink.targets
@@ -276,9 +276,8 @@
     <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
          In this case, explicitly specify the path to the dotnet host. -->
     <PropertyGroup Condition=" '$(DOTNET_HOST_PATH)' == '' ">
-      <_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
-      <_DotNetHostFileName>dotnet</_DotNetHostFileName>
-      <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe</_DotNetHostFileName>
+      <_DotNetHostDirectory>$(DotNetRoot)</_DotNetHostDirectory>
+      <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetHostFileName>
     </PropertyGroup>
 
     <ILLink AssemblyPaths="$(ILLinkTrimInputAssembly)"

diff --git a/src/libraries/illink-sharedframework.targets b/src/libraries/illink-sharedframework.targets
@@ -69,9 +69,8 @@
     <!-- When running from Desktop MSBuild, DOTNET_HOST_PATH is not set.
       In this case, explicitly specify the path to the dotnet host. -->
     <PropertyGroup Condition=" '$(DOTNET_HOST_PATH)' == '' ">
-      <_DotNetHostDirectory>$(RepoRoot).dotnet</_DotNetHostDirectory>
-      <_DotNetHostFileName>dotnet</_DotNetHostFileName>
-      <_DotNetHostFileName Condition=" '$(OS)' == 'Windows_NT' ">dotnet.exe</_DotNetHostFileName>
+      <_DotNetHostDirectory>$(DotNetRoot)</_DotNetHostDirectory>
+      <_DotNetHostFileName>$([System.IO.Path]::GetFileName('$(DotNetTool)'))</_DotNetHostFileName>
     </PropertyGroup>
 
     <ILLink AssemblyPaths="$(_AssemblyPaths)"
@@ -82,5 +81,5 @@
         ToolPath="$(_DotNetHostDirectory)" />
   </Target>
 
-  <Import Project="$([MSBuild]::NormalizePath('$(RepositoryEngineeringDir)', 'illink.targets'))" />
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
 </Project>