Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:aspnet/Home into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
glennc committed Nov 18, 2015
2 parents 2337043 + c4252f6 commit 43076b8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dnvm.cmd
@@ -1,6 +1,6 @@
@Echo off

for /f "delims=" %%i in ('PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.IO.Path]::GetTempFileName()"') do set DNVM_CMD_PATH_FILE=%%i.cmd
for /f "delims=" %%i in ('PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.IO.Path]::GetTempFileName()"') do set DNVM_CMD_PATH_FILE="%%i.cmd"

PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';$CmdPathFile='%DNVM_CMD_PATH_FILE%';& '%~dp0dnvm.ps1' %*"

Expand Down
2 changes: 1 addition & 1 deletion dnvm.ps1
Expand Up @@ -67,7 +67,7 @@ function _WriteOut {

### Constants
$ProductVersion="1.0.0"
$BuildVersion="rc2-15543"
$BuildVersion="rc2-15545"
$Authors="Microsoft Open Technologies, Inc."

# If the Version hasn't been replaced...
Expand Down
2 changes: 1 addition & 1 deletion dnvm.sh
Expand Up @@ -2,7 +2,7 @@
# Source this file from your .bash-profile or script to use

# "Constants"
_DNVM_BUILDNUMBER="rc2-15543"
_DNVM_BUILDNUMBER="rc2-15545"
_DNVM_AUTHORS="Microsoft Open Technologies, Inc."
_DNVM_RUNTIME_PACKAGE_NAME="dnx"
_DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"
Expand Down

0 comments on commit 43076b8

Please sign in to comment.