From 39c901ee4e45c598e26dac3b9ff542e3d3b7101c Mon Sep 17 00:00:00 2001 From: "ASP.NET Push Bot" Date: Wed, 14 Oct 2015 15:44:50 -0700 Subject: [PATCH] :arrow_up: dnvm.ps1, dnvm.cmd, dnvm.sh Source: aspnet/dnvm@66364c7eb46a52b466249dd75f5cd5f1211e41ca --- dnvm.ps1 | 17 +++++++++++++---- dnvm.sh | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dnvm.ps1 b/dnvm.ps1 index 153ca7ce66..e42f5ea52f 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="rc1-15526" +$BuildVersion="rc1-15527" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -846,6 +846,14 @@ function Is-Elevated() { return $user.IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator") } +function Get-ScriptRoot() { + if ($PSVersionTable.PSVersion.Major -ge 3) { + return $PSScriptRoot + } + + return Split-Path $script:MyInvocation.MyCommand.Path -Parent +} + ### Commands <# @@ -863,9 +871,10 @@ function dnvm-update-self { $wc = New-Object System.Net.WebClient Apply-Proxy $wc -Proxy:$Proxy - $dnvmFile = Join-Path $PSScriptRoot "dnvm.ps1" - $tempDnvmFile = Join-Path $PSScriptRoot "temp" - $backupFilePath = Join-Path $PSSCriptRoot "dnvm.ps1.bak" + $CurrentScriptRoot = Get-ScriptRoot + $dnvmFile = Join-Path $CurrentScriptRoot "dnvm.ps1" + $tempDnvmFile = Join-Path $CurrentScriptRoot "temp" + $backupFilePath = Join-Path $CurrentScriptRoot "dnvm.ps1.bak" $wc.DownloadFile($DNVMUpgradeUrl, $tempDnvmFile) diff --git a/dnvm.sh b/dnvm.sh index f874a4e53a..d67036a417 100644 --- a/dnvm.sh +++ b/dnvm.sh @@ -2,7 +2,7 @@ # Source this file from your .bash-profile or script to use # "Constants" -_DNVM_BUILDNUMBER="rc1-15526" +_DNVM_BUILDNUMBER="rc1-15527" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"