Fix up KoreBuild 2.0 to latest MSBuild.

src/Microsoft.AspNetCore.Build/project.json

@@ -18,9 +18,9 @@
     "NuGet.Packaging": "3.5.0-beta2-1484",
     "NuGet.Commands": "3.5.0-beta2-1484",
     "Newtonsoft.Json": "9.0.1",
-    "Microsoft.Build": "0.1.0-preview-00028-160627",
-    "Microsoft.Build.Framework": "0.1.0-preview-00028-160627",
-    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627"
+    "Microsoft.Build": "14.3.0",
+    "Microsoft.Build.Framework": "14.3.0",
+    "Microsoft.Build.Utilities.Core": "14.3.0"
   },
 
   "frameworks": {

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

@@ -165,7 +165,7 @@ try {
     Write-Host -ForegroundColor Green "Starting build ..."
     Write-Host -ForegroundColor DarkGray "> msbuild $Proj $args"
 
-    & "$MSBuildDir\bin\pub\CoreRun.exe" "$MSBuildDir\bin\pub\MSBuild.exe" `@"$MSBuildResponseFile"
+    & "$MSBuildDir\bin\pub\CoreRun.exe" "$MSBuildDir\bin\pub\MSBuild.dll" `@"$MSBuildResponseFile"
 } finally {
     # Copy logs to artifacts
     if(!(Test-Path $ArtifactsDir)) {

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

@@ -74,12 +74,7 @@ __exec() {
 }
 
 ensure_dotnet() {
-    if test `uname` = Darwin; then
-        versionFileName="cli.version.darwin"
-    else
-        versionFileName="cli.version.unix"
-    fi
-    versionFile="$DOTNET_VERSION_DIR/$versionFileName"
+    versionFile="$DOTNET_VERSION_DIR/cli.version"
     version=$(<$versionFile)
 
     [ -z "$KOREBUILD_DOTNET_CHANNEL" ] && KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
@@ -177,5 +172,5 @@ echo -e "${GREEN}Starting build...${RESET}"
 echo -e "${CYAN}> msbuild $PROJ $@${RESET}"
 
 # Enable "on error result next" ;P
-"$MSBUILD_DIR/bin/pub/corerun" "$MSBUILD_DIR/bin/pub/MSBuild.exe" @"$MSBUILD_RSP"
+"$MSBUILD_DIR/bin/pub/corerun" "$MSBUILD_DIR/bin/pub/MSBuild.dll" @"$MSBUILD_RSP"
 __end $?

src/Microsoft.AspNetCore.Build/scripts/msbuild.project.template.json

@@ -10,12 +10,7 @@
         "Microsoft.NETCore.Runtime.CoreCLR": "1.0.3",
         "System.Dynamic.Runtime": "4.0.11",
         "NuGet.CommandLine.Xplat": "3.5.0-beta-final",
-        "MSBuild": "0.1.0-preview-00028-160627",
-        "Microsoft.Build": "0.1.0-preview-00028-160627",
-        "Microsoft.Build.Targets": "0.1.0-preview-00028-160627",
-        "Microsoft.Build.Framework": "0.1.0-preview-00028-160627",
-        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00028-160627",
-        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00028-160627"
+        "Microsoft.Build.Runtime": "15.1.0-preview-000370-00"
     },
     "runtimes": {
         "RUNTIME": {}