From 5ad1d62367295cf80567599fae00301958dd551c Mon Sep 17 00:00:00 2001
From: Steve Pfister <steveisok@users.noreply.github.com>
Date: Wed, 11 Sep 2019 09:14:05 -0400
Subject: [PATCH] Use an init-tools script to install a local dotnet for wasm.
 (#16688)

Similar to what we use in netcore
---
 sdks/wasm/Makefile       | 12 ++++++++++--
 sdks/wasm/init-tools.ps1 |  5 +++++
 sdks/wasm/init-tools.sh  | 10 ++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 sdks/wasm/init-tools.ps1
 create mode 100755 sdks/wasm/init-tools.sh

diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile
index dcbf7eb92d2..de76bf0107b 100644
--- a/sdks/wasm/Makefile
+++ b/sdks/wasm/Makefile
@@ -25,8 +25,16 @@ CSC?= MONO_PATH=$(TOP)/mcs/class/lib/build $(TOP)/sdks/builds/bcl/runtime/mono-w
 CSC_FLAGS := /debug:portable /noconfig /nostdlib /nologo /langversion:latest
 API_REFS=$(TOP)/external/binary-reference-assemblies/v4.6
 MONO_SUPPORT=$(WASM_RUNTIME_DIR)/include/support
-DOTNET_BUILD?=dotnet build
-DOTNET_PACK?=dotnet pack
+
+ifeq ($(HOST_PLATFORM),win32)
+DOTNET_CMD := $(shell powershell -ExecutionPolicy Bypass -Command "./init-tools.ps1")/dotnet.exe
+DOTNET_CMD := "$(subst \,/,$(DOTNET))"
+else
+DOTNET_CMD := $(shell ./init-tools.sh | tail -1)
+endif
+
+DOTNET_PACK=$(DOTNET_CMD) pack
+DOTNET_BUILD=$(DOTNET_CMD) build
 
 ZLIB_HEADERS = \
 	$(MONO_SUPPORT)/crc32.h		\
diff --git a/sdks/wasm/init-tools.ps1 b/sdks/wasm/init-tools.ps1
new file mode 100644
index 00000000000..1ef0c7f5809
--- /dev/null
+++ b/sdks/wasm/init-tools.ps1
@@ -0,0 +1,5 @@
+function Write-Host {}
+
+. "..\..\eng\common\tools.ps1"
+
+InitializeDotNetCli $true
\ No newline at end of file
diff --git a/sdks/wasm/init-tools.sh b/sdks/wasm/init-tools.sh
new file mode 100755
index 00000000000..90246f469a7
--- /dev/null
+++ b/sdks/wasm/init-tools.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# always ignore system dotnet
+export use_installed_dotnet_cli=false
+
+. "../../eng/common/tools.sh"
+
+InitializeDotNetCli true
+
+which dotnet
\ No newline at end of file
-- 
2.11.4.GIT