Merge branch 'rel/1.1.0' into dev

build/project.json

@@ -7,4 +7,4 @@
       "NuGetPackageVerifier": "1.0.1-*",
       "Microsoft.AspNetCore.BuildTools.ApiCheck": "1.0.1-*"
   }
-}
+}

src/Microsoft.AspNetCore.Build/scripts/KoreBuild.ps1

@@ -46,9 +46,10 @@ function exec($cmd) {
 }
 
 function EnsureDotNet() {
-    $dotnetVersionFile = "$KoreBuildRoot\build\cli.version.win"
-    $dotnetChannel = "rel-1.0.0"
+    $dotnetVersionFile = "$KoreBuildRoot\build\cli.version"
+    $dotnetChannel = "preview"
     $dotnetVersion = Get-Content $dotnetVersionFile
+    $dotnetLocalInstallFolder = "$env:LOCALAPPDATA\Microsoft\dotnet\"
 
     if ($env:KOREBUILD_DOTNET_CHANNEL)
     {
@@ -59,7 +60,11 @@ function EnsureDotNet() {
         $dotnetVersion = $env:KOREBUILD_DOTNET_VERSION
     }
 
-    $dotnetLocalInstallFolder = "$env:LOCALAPPDATA\Microsoft\dotnet\"
+    if ($env:DOTNET_INSTALL_DIR)
+    {
+        $dotnetLocalInstallFolder = $env:DOTNET_INSTALL_DIR
+    }
+
     $newPath = "$dotnetLocalInstallFolder;$env:PATH"
     if ($env:KOREBUILD_SKIP_RUNTIME_INSTALL -eq "1")
     {