[dnvm.ps1] react to removal of k and rename of kpm to dnu

Author: analogrelay

test/ps1/_Common.ps1

@@ -9,8 +9,7 @@ Set-Variable -Option Constant "CrossGenCommand" "k-crossgen"
 Set-Variable -Option Constant "HomeEnvVar" "DNX_HOME"
 Set-Variable -Option Constant "UserHomeEnvVar" "DNX_USER_HOME"
 Set-Variable -Option Constant "FeedEnvVar" "DNX_FEED"
-Set-Variable -Option Constant "PackageManagerName" "kpm.cmd"
-Set-Variable -Option Constant "RuntimeExecutableName" "k.cmd"
+Set-Variable -Option Constant "PackageManagerName" "dnu.cmd"
 Set-Variable -Option Constant "RuntimeHostName" "dnx.exe"
 
 function Write-Banner {

test/ps1/_Execute-Tests.ps1

@@ -35,10 +35,10 @@ if(!$TestAppsDir) { $TestAppsDir = Convert-Path (Join-Path $PSScriptRoot "../app
 # Configure the Runtimes we're going to use in testing. The actual runtime doesn't matter since we're only testing
 # that dnvm can find it, download it and unpack it successfully. We do run an app in the runtime to do that sanity
 # test, but all we care about in these tests is that the app executes.
-$env:DNX_FEED = "https://www.myget.org/F/aspnetvnext/api/v2"
-$TestRuntimeVersion = "1.0.0-beta4-11244"
+$env:DNX_FEED = "https://www.myget.org/F/aspnetrelease/api/v2"
+$TestRuntimeVersion = "1.0.0-beta4-11390"
 $specificNupkgUrl = "$($env:DNX_FEED)/package/dnx-coreclr-win-x64/$TestRuntimeVersion"
-$specificNupkgHash = "949DAF5DD88396594214FAF43ED3675F637340338CA54715A966A7960257A0CE"
+$specificNupkgHash = "FABCEDCAEAB8A000F9A1972D1DF6E8CF960D041E0B94E8473BFCCF618A9B5644"
 $specificNupkgName = "dnx-coreclr-win-x64.$TestRuntimeVersion.nupkg"
 $specificNuPkgFxName = "Asp.Net,Version=v5.0"
 

test/ps1/tests/Install.Tests.ps1

@@ -34,9 +34,9 @@ function DefineInstallTests($clr, $arch) {
         It "can run the TestApp sample" {
             pushd "$TestAppsDir\TestApp"
             try {
-                "$runtimeRoot\bin\$RuntimeExecutableName" | Should Exist
+                "$runtimeRoot\bin\$RuntimeHostName" | Should Exist
 
-                $output = & "$runtimeRoot\bin\$RuntimeExecutableName" run
+                $output = & "$runtimeRoot\bin\$RuntimeHostName" . run
                 $LASTEXITCODE | Should Be 0
                 $fullOutput = [String]::Join("`r`n", $output)
                 $output | ForEach-Object { Write-Verbose $_ }

test/ps1/tests/Use.Tests.ps1

@@ -29,12 +29,6 @@ Describe "use" -Tag "use" {
         __dnvmtest_run use $TestRuntimeVersion | Out-Null
         $runtimeName = GetRuntimeName -clr CLR -arch x86
 
-        It "puts $RuntimeExecutableName on the PATH" {
-            $cmd = Get-Command $RuntimeExecutableName -ErrorAction SilentlyContinue
-            $cmd | Should Not BeNullOrEmpty
-            $cmd.Definition | Should Be (Convert-Path "$UserPath\runtimes\$runtimeName\bin\$RuntimeExecutableName")
-        }
-
         It "puts $PackageManagerName on the PATH" {
             $cmd = Get-Command $PackageManagerName -ErrorAction SilentlyContinue
             $cmd | Should Not BeNullOrEmpty
@@ -53,13 +47,6 @@ Describe "use" -Tag "use" {
     Context "When use-ing an alias" {
         __dnvmtest_run use $testAlias | Out-Null
 
-        # 'k.cmd' still exists, for now.
-        It "puts $RuntimeExecutableName on the PATH" {
-            $cmd = Get-Command $RuntimeExecutableName -ErrorAction SilentlyContinue
-            $cmd | Should Not BeNullOrEmpty
-            $cmd.Definition | Should Be (Convert-Path "$UserPath\runtimes\$runtimeName\bin\$RuntimeExecutableName")
-        }
-
         It "puts $PackageManagerName on the PATH" {
             $cmd = Get-Command $PackageManagerName -ErrorAction SilentlyContinue
             $cmd | Should Not BeNullOrEmpty
@@ -82,10 +69,6 @@ Describe "use" -Tag "use" {
             GetRuntimesOnPath | Should BeNullOrEmpty
         }
 
-        It "removes $RuntimeExecutableName from the PATH" {
-            $cmd = (Get-Command $RuntimeExecutableName -ErrorAction SilentlyContinue)
-        }
-
         It "removes $PackageManagerName from the PATH" {
             (Get-Command $PackageManagerName -ErrorAction SilentlyContinue) | Should BeNullOrEmpty
         }