From 82b517ae4c25441b54f8d37ef2d06d2929c31af7 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 1 Aug 2018 17:34:27 -0700
Subject: [PATCH] Fix update-dependencies script

---
 .../update-dependencies.ps1                   | 16 ++++-
 .../update-dependencies.sh                    | 58 -------------------
 2 files changed, 14 insertions(+), 60 deletions(-)
 delete mode 100755 build_projects/update-dependencies/update-dependencies.sh

diff --git a/build_projects/update-dependencies/update-dependencies.ps1 b/build_projects/update-dependencies/update-dependencies.ps1
index ed5411110..e255855a2 100644
--- a/build_projects/update-dependencies/update-dependencies.ps1
+++ b/build_projects/update-dependencies/update-dependencies.ps1
@@ -31,7 +31,12 @@ if ($Update)
 # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
 if (!$env:DOTNET_INSTALL_DIR)
 {
-    $env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_stage0\$Architecture"
+    $env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_stage0\update-dependencies"
+}
+
+if (!(Test-Path $env:DOTNET_INSTALL_DIR))
+{
+    mkdir $env:DOTNET_INSTALL_DIR | Out-Null
 }
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
@@ -39,9 +44,16 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Install a stage 0
  Write-Output "Installing .NET Core CLI Stage 0"
 
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$dotnetInstallPath = Join-Path $env:DOTNET_INSTALL_DIR "dotnet-install.ps1"
+
+Write-Output "dotnet-install path: $dotnetInstallPath"
+Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$dotnetInstallPath"
+
+
 if (!$env:DOTNET_TOOL_DIR)
 {
-    & "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel "master" -Architecture $Architecture
+    & "$dotnetInstallPath" -version "2.1.302" -Architecture $Architecture
     if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
 }
 else
diff --git a/build_projects/update-dependencies/update-dependencies.sh b/build_projects/update-dependencies/update-dependencies.sh
deleted file mode 100755
index 70a9105cb..000000000
--- a/build_projects/update-dependencies/update-dependencies.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) .NET Foundation and contributors. All rights reserved.
-# Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#
-
-set -e
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-REPO_ROOT="$DIR/../.."
-PROJECT_PATH="$DIR/update-dependencies.csproj"
-
-# Some things depend on HOME and it may not be set. We should fix those things, but until then, we just patch a value in
-if [ -z "${HOME:-}" ]; then
-    export HOME=$REPO_ROOT/artifacts/home
-
-    [ ! -d "$HOME" ] || rm -Rf "$HOME"
-    mkdir -p "$HOME"
-fi
-
-# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot)
-if [ -z "${DOTNET_INSTALL_DIR:-}" ]; then
-   export DOTNET_INSTALL_DIR=$REPO_ROOT/.dotnet_stage0/x64
-fi
-
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Install a stage 0
-echo "Installing .NET Core CLI Stage 0"
-
-if [ -z "$DOTNET_TOOL_DIR" ]; then
-    $REPO_ROOT/scripts/obtain/dotnet-install.sh -Channel master -Architecture x64
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to install stage 0"
-        exit 1
-    fi
-else
-    cp -r $DOTNET_TOOL_DIR/* $DOTNET_INSTALL_DIR/
-fi
-
-# Put the stage 0 on the path
-export PATH=$DOTNET_INSTALL_DIR:$PATH
-
-echo "Invoking App $PROJECT_PATH..."
-dotnet run -p "$PROJECT_PATH" $@
-
-if [ $? -ne 0 ]; then
-    echo "Build failed"
-    exit 1
-fi