diff --git a/dnvm.ps1 b/dnvm.ps1 index ea3ac6d508..6d38e2236e 100644 --- a/dnvm.ps1 +++ b/dnvm.ps1 @@ -67,7 +67,7 @@ function _WriteOut { ### Constants $ProductVersion="1.0.0" -$BuildVersion="beta6-10395" +$BuildVersion="beta6-10396" $Authors="Microsoft Open Technologies, Inc." # If the Version hasn't been replaced... @@ -85,7 +85,9 @@ Set-Variable -Option Constant "DefaultUserDirectoryName" ".dnx" Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k") Set-Variable -Option Constant "RuntimePackageName" "dnx" Set-Variable -Option Constant "DefaultFeed" "https://www.nuget.org/api/v2" +Set-Variable -Option Constant "DefaultFeedKey" "DNX_FEED" Set-Variable -Option Constant "DefaultUnstableFeed" "https://www.myget.org/F/aspnetvnext/api/v2" +Set-Variable -Option Constant "DefaultUnstableFeedKey" "DNX_UNSTABLE_FEED" Set-Variable -Option Constant "CrossGenCommand" "dnx-crossgen" Set-Variable -Option Constant "OldCrossGenCommand" "k-crossgen" Set-Variable -Option Constant "CommandPrefix" "dnvm-" @@ -301,7 +303,13 @@ function Write-Feeds { } else { _WriteOut "" } - + _WriteOut + _WriteOut -NoNewline " To use override feeds, set " + _WriteOut -NoNewLine -ForegroundColor $ColorScheme.Help_Executable "$DefaultFeedKey" + _WriteOut -NoNewline " and " + _WriteOut -NoNewLine -ForegroundColor $ColorScheme.Help_Executable "$DefaultUnstableFeedKey" + _WriteOut -NoNewline " environment keys respectively" + _WriteOut } function Get-RuntimeAlias { @@ -1069,14 +1077,14 @@ function dnvm-install { if(!$selectedFeed) { $selectedFeed = $DefaultUnstableFeed } else { - _WriteOut -ForegroundColor $ColorScheme.Warning "Default unstable feed ($DefaultUnstableFeed) is being overridden by the value of the DNX_UNSTABLE_FEED environment variable ($ActiveUnstableFeed)" + _WriteOut -ForegroundColor $ColorScheme.Warning "Default unstable feed ($DefaultUnstableFeed) is being overridden by the value of the $DefaultUnstableFeedKey environment variable ($ActiveUnstableFeed)" } } else { $selectedFeed = $ActiveFeed if(!$selectedFeed) { $selectedFeed = $DefaultFeed } else { - _WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the DNX_FEED environment variable ($ActiveFeed)" + _WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the $DefaultFeedKey environment variable ($ActiveFeed)" } } diff --git a/dnvm.sh b/dnvm.sh index 6efb5ba7ed..9f541d6734 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="beta6-10395" +_DNVM_BUILDNUMBER="beta6-10396" _DNVM_AUTHORS="Microsoft Open Technologies, Inc." _DNVM_RUNTIME_PACKAGE_NAME="dnx" _DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"