From d65251055e466ceaa3ac6ef40f20ff19a7bac0f0 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 24 Jun 2015 13:58:01 -0700
Subject: [PATCH] Updating dnvm

---
 build/dnvm.ps1 | 29 +++++++++++++++++++++++------
 build/dnvm.sh  |  4 ++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/build/dnvm.ps1 b/build/dnvm.ps1
index b5743685a6..9d6bc1b931 100644
--- a/build/dnvm.ps1
+++ b/build/dnvm.ps1
@@ -67,7 +67,7 @@ function _WriteOut {
 
 ### Constants
 $ProductVersion="1.0.0"
-$BuildVersion="beta6-10390"
+$BuildVersion="beta6-10394"
 $Authors="Microsoft Open Technologies, Inc."
 
 # If the Version hasn't been replaced...
@@ -1299,6 +1299,17 @@ function dnvm-run {
     param(
         [Parameter(Mandatory=$true, Position=0)]
         [string]$VersionOrAlias,
+
+        [Alias("arch")]
+        [ValidateSet("", "x86", "x64", "arm")]
+        [Parameter(Mandatory=$false)]
+        [string]$Architecture = "",
+
+        [Alias("r")]
+        [ValidateSet("", "clr", "coreclr")]
+        [Parameter(Mandatory=$false)]
+        [string]$Runtime = "",
+
         [Parameter(Mandatory=$false, Position=1, ValueFromRemainingArguments=$true)]
         [object[]]$DnxArguments)
 
@@ -1329,6 +1340,16 @@ function dnvm-exec {
         [string]$VersionOrAlias,
         [Parameter(Mandatory=$false, Position=1)]
         [string]$Command,
+
+        [Alias("arch")]
+        [ValidateSet("", "x86", "x64", "arm")]
+        [Parameter(Mandatory=$false)]
+        [string]$Architecture = "",
+
+        [Alias("r")]
+        [ValidateSet("", "clr", "coreclr")]
+        [Parameter(Mandatory=$false)]
+        [string]$Runtime = "",
         [Parameter(Mandatory=$false, Position=2, ValueFromRemainingArguments=$true)]
         [object[]]$Arguments)
 
@@ -1455,11 +1476,7 @@ if(!$cmd) {
 try {
     if(Get-Command -Name "$CommandPrefix$cmd" -ErrorAction SilentlyContinue) {
         _WriteDebug "& dnvm-$cmd $cmdargs"
-        if($host.Version.Major -lt 3) {
-            Invoke-Command ([ScriptBlock]::Create("dnvm-$cmd $cmdargs"))
-        } else {
-            & "dnvm-$cmd" @cmdargs
-        }
+        Invoke-Command ([ScriptBlock]::Create("dnvm-$cmd $cmdargs"))
     }
     else {
         _WriteOut "Unknown command: '$cmd'"
diff --git a/build/dnvm.sh b/build/dnvm.sh
index 5b45ebe05b..1eaa13063b 100644
--- a/build/dnvm.sh
+++ b/build/dnvm.sh
@@ -2,7 +2,7 @@
 # Source this file from your .bash-profile or script to use
 
 # "Constants"
-_DNVM_BUILDNUMBER="beta6-10390"
+_DNVM_BUILDNUMBER="beta6-10394"
 _DNVM_AUTHORS="Microsoft Open Technologies, Inc."
 _DNVM_RUNTIME_PACKAGE_NAME="dnx"
 _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"
@@ -413,7 +413,7 @@ dnvm()
                     fi
                     
                     if [[ $arch == "x86" && $runtime == "coreclr" ]]; then
-                        printf "%b\n" "${Red}Core CLR doesn't currently have a 32 bit build. You must use x64."
+                        printf "%b\n" "${Red}Core CLR doesn't currently have a 32 bit build. You must use x64.${RCol}"
                         return 1
                     fi