Point DOTNET_ROOT to correct path on Windows

Nate McMaster · Nate McMaster · commit a0abc7041d08 · 2018-04-30T10:44:50.000-07:00
diff --git a/files/KoreBuild/scripts/KoreBuild.psm1 b/files/KoreBuild/scripts/KoreBuild.psm1
@@ -322,7 +322,8 @@ function Set-KoreBuildSettings(
         $env:MSBUILDDEBUGPATH = Join-Paths $RepoPath ('artifacts', 'logs')
     }
 
-    $env:DOTNET_ROOT = $DotNetHome
+    $arch = __get_dotnet_arch
+    $env:DOTNET_ROOT = if ($IS_WINDOWS) { Join-Path $DotNetHome $arch } else { $DotNetHome }
 
     $global:KoreBuildSettings = @{
         ToolsSource = $ToolsSource

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,8 @@ function Set-KoreBuildSettings(`
`322`	`322`	`$env:MSBUILDDEBUGPATH = Join-Paths $RepoPath ('artifacts', 'logs')`
`323`	`323`	`}`
`324`	`324`
`325`		`- $env:DOTNET_ROOT = $DotNetHome`
	`325`	`+ $arch = __get_dotnet_arch`
	`326`	`+ $env:DOTNET_ROOT = if ($IS_WINDOWS) { Join-Path $DotNetHome $arch } else { $DotNetHome }`
`326`	`327`
`327`	`328`	`$global:KoreBuildSettings = @{`
`328`	`329`	`ToolsSource = $ToolsSource`