From 42bc2de2c63fe0c95a582e642ff97b2fe0d4bb7e Mon Sep 17 00:00:00 2001
From: Steve MacLean <stmaclea@microsoft.com>
Date: Fri, 1 Mar 2019 23:07:35 -0500
Subject: Use arcade's version of dotnet to build (#22755)

* Use arcade dotnet

* Add cmake_msbuild.cmd

Move msbuild.cmd to cmake_msbuild.bat
Document intent that this file is only used to resolve
Windows cmake dependency on desktop msbuild.exe

Remove one instance of msbuild.cmd

* Fix inittools.cmd

* Remove spurious setup_vs_tools.cmd calls
---
 dir.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dir.props')

diff --git a/dir.props b/dir.props
index 03f13974e6..7737e6b317 100644
--- a/dir.props
+++ b/dir.props
@@ -73,7 +73,7 @@
     <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
 
     <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools\</ToolsDir>
-    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli\</DotnetCliPath>
+    <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ProjectDir).dotnet\</DotnetCliPath>
     <OverrideToolHost>$(DotnetCliPath)dotnet</OverrideToolHost>
     <BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore>
 
-- 
cgit v1.2.3