From 23c353c7ac338026161244f76cd24f10441c044f Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Fri, 2 Sep 2016 18:05:40 -0500
Subject: [PATCH] Upgrade CLI, buildtools for RTM shared framework.

---
 pkg/BuildToolsVersion.txt | 2 +-
 pkg/DotnetCLIVersion.txt  | 2 +-
 pkg/init-tools.cmd        | 2 +-
 pkg/init-tools.sh         | 2 +-
 pkg/pack.cmd              | 6 ++++--
 pkg/pack.sh               | 5 ++---
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkg/BuildToolsVersion.txt b/pkg/BuildToolsVersion.txt
index 475d57dc12..1cde78cb24 100644
--- a/pkg/BuildToolsVersion.txt
+++ b/pkg/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.25-prerelease-00511-02
+1.0.26-prerelease-00802-07
diff --git a/pkg/DotnetCLIVersion.txt b/pkg/DotnetCLIVersion.txt
index dd7bc318fa..b0f8213885 100644
--- a/pkg/DotnetCLIVersion.txt
+++ b/pkg/DotnetCLIVersion.txt
@@ -1 +1 @@
-1.0.0-preview2-002733
\ No newline at end of file
+1.0.0-preview3-003223
\ No newline at end of file
diff --git a/pkg/init-tools.cmd b/pkg/init-tools.cmd
index 13d61e8ea4..f31dc4b75f 100644
--- a/pkg/init-tools.cmd
+++ b/pkg/init-tools.cmd
@@ -38,7 +38,7 @@ echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
 set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt"
 set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
-set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
+set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
 echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"
 powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%"
diff --git a/pkg/init-tools.sh b/pkg/init-tools.sh
index 57564e7827..6227dc6e03 100755
--- a/pkg/init-tools.sh
+++ b/pkg/init-tools.sh
@@ -45,7 +45,7 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then
     echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log
     if [ ! -e $__DOTNET_PATH ]; then
         echo "Installing dotnet cli..."
-        __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
+        __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz"
         # curl has HTTPS CA trust-issues less often than wget, so lets try that first.
         echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log
         which curl > /dev/null 2> /dev/null
diff --git a/pkg/pack.cmd b/pkg/pack.cmd
index 1649cc7ba1..18842d4c3a 100644
--- a/pkg/pack.cmd
+++ b/pkg/pack.cmd
@@ -2,13 +2,15 @@
 setlocal EnableDelayedExpansion
 
 set __ProjectDir=%~dp0
+set __DotNet=%__ProjectDir%\Tools\dotnetcli\dotnet.exe
+set __MSBuild=%__ProjectDir%\Tools\MSBuild.exe
 
 :: Initialize the MSBuild Tools
 call "%__ProjectDir%\init-tools.cmd"
 
 :: Restore dependencies mainly to obtain runtime.json
 pushd "%__ProjectDir%\deps"
-"%__ProjectDir%\Tools\dotnetcli\dotnet.exe" restore --source "https://dotnet.myget.org/F/dotnet-core" --packages "%__ProjectDir%\packages"
+"%__DotNet%" restore --source "https://dotnet.myget.org/F/dotnet-core" --packages "%__ProjectDir%\packages"
 popd
 
 :: Clean up existing nupkgs
@@ -16,7 +18,7 @@ if exist "%__ProjectDir%\bin" (rmdir /s /q "%__ProjectDir%\bin")
 
 :: Package the assets using Tools
 
-"%__ProjectDir%\Tools\corerun" "%__ProjectDir%\Tools\MSBuild.exe" "%__ProjectDir%\projects\packages.builds" /p:TargetsWindows=true /verbosity:minimal
+"%__DotNet%" "%__MSBuild%" "%__ProjectDir%\projects\packages.builds" /p:TargetsWindows=true /verbosity:minimal
 
 if not ERRORLEVEL 0 goto :Error
 exit /b 0
diff --git a/pkg/pack.sh b/pkg/pack.sh
index 9da36085a3..f713d75dcf 100755
--- a/pkg/pack.sh
+++ b/pkg/pack.sh
@@ -37,8 +37,7 @@ popd
 rm -rf $__project_dir/bin
 
 # build to produce nupkgs
-__corerun="$__project_dir/Tools/corerun"
-__msbuild="$__project_dir/Tools/MSBuild.exe"
+__msbuild="$__project_dir/Tools/msbuild.sh"
 
 __targets_param=
 if [ "$(uname -s)" == "Darwin" ]; then
@@ -50,6 +49,6 @@ fi
 
 __common_parameters="/p:$__targets_param /p:DistroRid=$__distro_rid /verbosity:minimal"
 
-$__corerun $__msbuild $__project_dir/projects/packages.builds $__common_parameters || exit 1
+$__msbuild $__project_dir/projects/packages.builds $__common_parameters || exit 1
 
 exit 0
\ No newline at end of file