huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating dnvm

This commit is contained in:
Pranav K 2015-06-24 13:58:01 -07:00
parent 6471ef34a7
commit d65251055e
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build/dnvm.ps1
View File

@ -67,7 +67,7 @@ function _WriteOut {
### Constants ### Constants
$ProductVersion="1.0.0" $ProductVersion="1.0.0"
$BuildVersion="beta6-10390" $BuildVersion="beta6-10394"
$Authors="Microsoft Open Technologies, Inc." $Authors="Microsoft Open Technologies, Inc."
# If the Version hasn't been replaced... # If the Version hasn't been replaced...
@ -1299,6 +1299,17 @@ function dnvm-run {
param( param(
[Parameter(Mandatory=$true, Position=0)] [Parameter(Mandatory=$true, Position=0)]
[string]$VersionOrAlias, [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)] [Parameter(Mandatory=$false, Position=1, ValueFromRemainingArguments=$true)]
[object[]]$DnxArguments) [object[]]$DnxArguments)
@ -1329,6 +1340,16 @@ function dnvm-exec {
[string]$VersionOrAlias, [string]$VersionOrAlias,
[Parameter(Mandatory=$false, Position=1)] [Parameter(Mandatory=$false, Position=1)]
[string]$Command, [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)] [Parameter(Mandatory=$false, Position=2, ValueFromRemainingArguments=$true)]
[object[]]$Arguments) [object[]]$Arguments)
@ -1455,11 +1476,7 @@ if(!$cmd) {
try { try {
if(Get-Command -Name "$CommandPrefix$cmd" -ErrorAction SilentlyContinue) { if(Get-Command -Name "$CommandPrefix$cmd" -ErrorAction SilentlyContinue) {
_WriteDebug "& dnvm-$cmd $cmdargs" _WriteDebug "& dnvm-$cmd $cmdargs"
if($host.Version.Major -lt 3) { Invoke-Command ([ScriptBlock]::Create("dnvm-$cmd $cmdargs"))
Invoke-Command ([ScriptBlock]::Create("dnvm-$cmd $cmdargs"))
} else {
& "dnvm-$cmd" @cmdargs
}
} }
else { else {
_WriteOut "Unknown command: '$cmd'" _WriteOut "Unknown command: '$cmd'"

4
build/dnvm.sh
View File

@ -2,7 +2,7 @@
# Source this file from your .bash-profile or script to use # Source this file from your .bash-profile or script to use
# "Constants" # "Constants"
_DNVM_BUILDNUMBER="beta6-10390" _DNVM_BUILDNUMBER="beta6-10394"
_DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_AUTHORS="Microsoft Open Technologies, Inc."
_DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_PACKAGE_NAME="dnx"
_DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"
@ -413,7 +413,7 @@ dnvm()
fi fi
if [[ $arch == "x86" && $runtime == "coreclr" ]]; then 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 return 1
fi fi