From 73b5e2fd701ce7d25fb64838c2284b173c9d31e9 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 6 Jul 2017 15:03:38 -0700
Subject: [PATCH] Don't invoke GetDotNetHost task from desktop msbuild. (#163)

* Don't invoke GetDotNetHost task from desktop msbuild.

Fixes https://github.com/aspnet/MvcPrecompilation/issues/161
---
 .../Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
index 4638085d26..e03a9428b7 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
@@ -38,11 +38,16 @@
     DependsOnTargets="_CreateResponseFileForMvcRazorPrecompile"
     Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp'">
 
-    <GetDotNetHost Condition="'$(MvcRazorRunCommand)'==''">
+    <!--
+    GetDotNetHost attempts to locate the muxer path if the executing process is a .NET Core application i.e. dotnet msbuild.
+    If we know we're being launched from desktop MSBuild, avoid running the task. We'll use the dotnet that appears in the path.
+    -->
+    <GetDotNetHost Condition="'$(MSBuildRuntimeType)'=='Core' AND '$(MvcRazorRunCommand)'==''">
       <Output TaskParameter="MuxerPath" PropertyName="MvcRazorRunCommand" />
     </GetDotNetHost>
 
     <PropertyGroup>
+      <MvcRazorRunCommand Condition="'$(MvcRazorRunCommand)'==''">dotnet</MvcRazorRunCommand>
       <_MvcViewCompilationBinaryPath Condition="'$(_MvcViewCompilationBinaryPath)'==''">$(MSBuildThisFileDirectory)$(MSBuildThisFileName).dll</_MvcViewCompilationBinaryPath>
 
       <ExecArgs>&quot;$(MvcRazorRunCommand)&quot; exec</ExecArgs>