Skip to content

Commit 79587f8

Browse files
ASP.NET Push Botunknown
authored andcommitted
⬆️ dnvm.ps1, dnvm.cmd, dnvm.sh
Source: aspnet/dnvm@f5cc09a
1 parent 85c9db8 commit 79587f8

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

dnvm.ps1

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function _WriteOut {
6767

6868
### Constants
6969
$ProductVersion="1.0.0"
70-
$BuildVersion="beta6-10395"
70+
$BuildVersion="beta6-10396"
7171
$Authors="Microsoft Open Technologies, Inc."
7272

7373
# If the Version hasn't been replaced...
@@ -85,7 +85,9 @@ Set-Variable -Option Constant "DefaultUserDirectoryName" ".dnx"
8585
Set-Variable -Option Constant "OldUserDirectoryNames" @(".kre", ".k")
8686
Set-Variable -Option Constant "RuntimePackageName" "dnx"
8787
Set-Variable -Option Constant "DefaultFeed" "https://www.nuget.org/api/v2"
88+
Set-Variable -Option Constant "DefaultFeedKey" "DNX_FEED"
8889
Set-Variable -Option Constant "DefaultUnstableFeed" "https://www.myget.org/F/aspnetvnext/api/v2"
90+
Set-Variable -Option Constant "DefaultUnstableFeedKey" "DNX_UNSTABLE_FEED"
8991
Set-Variable -Option Constant "CrossGenCommand" "dnx-crossgen"
9092
Set-Variable -Option Constant "OldCrossGenCommand" "k-crossgen"
9193
Set-Variable -Option Constant "CommandPrefix" "dnvm-"
@@ -301,7 +303,13 @@ function Write-Feeds {
301303
} else {
302304
_WriteOut "<none>"
303305
}
304-
306+
_WriteOut
307+
_WriteOut -NoNewline " To use override feeds, set "
308+
_WriteOut -NoNewLine -ForegroundColor $ColorScheme.Help_Executable "$DefaultFeedKey"
309+
_WriteOut -NoNewline " and "
310+
_WriteOut -NoNewLine -ForegroundColor $ColorScheme.Help_Executable "$DefaultUnstableFeedKey"
311+
_WriteOut -NoNewline " environment keys respectively"
312+
_WriteOut
305313
}
306314

307315
function Get-RuntimeAlias {
@@ -1069,14 +1077,14 @@ function dnvm-install {
10691077
if(!$selectedFeed) {
10701078
$selectedFeed = $DefaultUnstableFeed
10711079
} else {
1072-
_WriteOut -ForegroundColor $ColorScheme.Warning "Default unstable feed ($DefaultUnstableFeed) is being overridden by the value of the DNX_UNSTABLE_FEED environment variable ($ActiveUnstableFeed)"
1080+
_WriteOut -ForegroundColor $ColorScheme.Warning "Default unstable feed ($DefaultUnstableFeed) is being overridden by the value of the $DefaultUnstableFeedKey environment variable ($ActiveUnstableFeed)"
10731081
}
10741082
} else {
10751083
$selectedFeed = $ActiveFeed
10761084
if(!$selectedFeed) {
10771085
$selectedFeed = $DefaultFeed
10781086
} else {
1079-
_WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the DNX_FEED environment variable ($ActiveFeed)"
1087+
_WriteOut -ForegroundColor $ColorScheme.Warning "Default stable feed ($DefaultFeed) is being overridden by the value of the $DefaultFeedKey environment variable ($ActiveFeed)"
10801088
}
10811089
}
10821090

dnvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Source this file from your .bash-profile or script to use
33

44
# "Constants"
5-
_DNVM_BUILDNUMBER="beta6-10395"
5+
_DNVM_BUILDNUMBER="beta6-10396"
66
_DNVM_AUTHORS="Microsoft Open Technologies, Inc."
77
_DNVM_RUNTIME_PACKAGE_NAME="dnx"
88
_DNVM_RUNTIME_FRIENDLY_NAME=".NET Execution Environment"

0 commit comments

Comments
 (0)