diff --git a/dnvm.ps1 b/dnvm.ps1 index 5bf23015d7..bbe40aa628 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta8-15514" +$BuildVersion="beta8-15515" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -1598,7 +1598,7 @@ function dnvm-run { [Parameter(Mandatory=$false, Position=1, ValueFromRemainingArguments=$true)] [object[]]$DnxArguments) - $runtimeInfo = Get-RuntimeAliasOrRuntimeInfo -Version:$VersionOrAlias + $runtimeInfo = Get-RuntimeAliasOrRuntimeInfo -Version:$VersionOrAlias -Runtime:$Runtime -Architecture:$Architecture $runtimeBin = Get-RuntimePath $runtimeInfo.RuntimeName if ($runtimeBin -eq $null) { @@ -1639,7 +1639,7 @@ function dnvm-exec { [Parameter(Mandatory=$false, Position=2, ValueFromRemainingArguments=$true)] [object[]]$Arguments) - $runtimeInfo = Get-RuntimeAliasOrRuntimeInfo -Version:$VersionOrAlias + $runtimeInfo = Get-RuntimeAliasOrRuntimeInfo -Version:$VersionOrAlias -Runtime:$Runtime -Architecture:$Architecture $runtimeBin = Get-RuntimePath $runtimeInfo.RuntimeName if ($runtimeBin -eq $null) { diff --git a/dnvm.sh b/dnvm.sh index dfdfd131e2..6cb8631a58 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="beta8-15514" +_DNVM_BUILDNUMBER="beta8-15515" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" @@ -684,9 +684,9 @@ dnvm() local arch= local runtime= + local versionOrAlias= shift if [ $cmd == "use" ]; then - local versionOrAlias= while [ $# -ne 0 ] do if [[ $1 == "-p" || $1 == "-persistent" ]]; then @@ -706,8 +706,20 @@ dnvm() shift done else - local versionOrAlias=$1 - shift + while [ $# -ne 0 ] + do + if [[ $1 == "-a" || $1 == "-arch" ]]; then + local arch=$2 + shift + elif [[ $1 == "-r" || $1 == "-runtime" ]]; then + local runtime=$2 + shift + elif [[ -n $1 ]]; then + [[ -n $versionOrAlias ]] && break + local versionOrAlias=$1 + fi + shift + done fi if [[ $cmd == "use" && $versionOrAlias == "none" ]]; then