From 4f03b3ac927d9e2de48efac95aeb12fe985700b9 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 18 Apr 2019 15:34:33 -0700
Subject: [PATCH] Various fixes when calling dotnet-install

---
 test/SdkTests/SdkTests.csproj | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj
index cf53b9b7b..eb74ff0ea 100644
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@@ -66,15 +66,16 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
       <InstallRuntimeCommand>powershell -NoLogo -NoProfile -ExecutionPolicy ByPass</InstallRuntimeCommand>
-      <InstallRuntimeCommand>$(InstallRuntimeCommand) $(_DotNetRoot)dotnet-install.ps1</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.ps1"</InstallRuntimeCommand>
       <InstallRuntimeCommand>$(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall)</InstallRuntimeCommand>
       <InstallRuntimeCommand>$(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath)</InstallRuntimeCommand>
       <InstallRuntimeCommand>$(InstallRuntimeCommand) -Runtime "dotnet"</InstallRuntimeCommand>
     </PropertyGroup>
     <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
-      <InstallRuntimeCommand>$(_DotNetRoot)dotnet-install.sh</InstallRuntimeCommand>
+      <InstallRuntimeCommand>/bin/bash</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.sh"</InstallRuntimeCommand>
       <InstallRuntimeCommand>$(InstallRuntimeCommand) --version $(RuntimeVersionToInstall)</InstallRuntimeCommand>
-      <InstallRuntimeCommand>$(InstallRuntimeCommand) --install_dir $(DotnetToTestPath)</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) --install-dir "$(DotnetToTestPath)"</InstallRuntimeCommand>
       <InstallRuntimeCommand>$(InstallRuntimeCommand) --runtime "dotnet"</InstallRuntimeCommand>
     </PropertyGroup>