Run tests on PSv2.0. Fix some behaviour that was discovered from test runs. Change temp path to include runtime name.

Author: glennc

src/dnvm.ps1

@@ -85,8 +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 "DefaultUnstableFeed" "https://www.myget.org/F/aspnetrelease/api/v2"
+Set-Variable -Option Constant "DefaultUnstableFeed" "https://www.myget.org/F/aspnetvnext/api/v2"
 Set-Variable -Option Constant "CrossGenCommand" "dnx-crossgen"
+Set-Variable -Option Constant "OldCrossGenCommand" "k-crossgen"
 Set-Variable -Option Constant "CommandPrefix" "dnvm-"
 Set-Variable -Option Constant "DefaultArchitecture" "x86"
 Set-Variable -Option Constant "DefaultRuntime" "clr"
@@ -896,31 +897,26 @@ function dnvm-list {
 function dnvm-alias {
     param(
         [Alias("d")]
-        [Parameter(ParameterSetName="Delete",Mandatory=$true)]
         [switch]$Delete,
 
-        [Parameter(ParameterSetName="Read",Mandatory=$false,Position=0)]
-        [Parameter(ParameterSetName="Write",Mandatory=$true,Position=0)]
-        [Parameter(ParameterSetName="Delete",Mandatory=$true,Position=0)]
         [string]$Name,
-        
-        [Parameter(ParameterSetName="Write",Mandatory=$true,Position=1)]
+
         [string]$Version,
 
         [Alias("arch")]
         [ValidateSet("", "x86","x64")]
-        [Parameter(ParameterSetName="Write", Mandatory=$false)]
         [string]$Architecture = "",
 
         [Alias("r")]
         [ValidateSet("", "clr","coreclr")]
-        [Parameter(ParameterSetName="Write")]
         [string]$Runtime = "")
 
-    switch($PSCmdlet.ParameterSetName) {
-        "Read" { Read-Alias $Name }
-        "Write" { Write-Alias $Name $Version -Architecture $Architecture -Runtime $Runtime }
-        "Delete" { Delete-Alias $Name }
+    if($Version) {
+        Write-Alias $Name $Version -Architecture $Architecture -Runtime $Runtime
+    } elseif ($Delete) {
+        Delete-Alias $Name
+    } else {
+        Read-Alias $Name
     }
 }
 
@@ -1124,7 +1120,8 @@ function dnvm-install {
     else {
         $Architecture = GetArch $Architecture
         $Runtime = GetRuntime $Runtime
-        $UnpackFolder = Join-Path $RuntimesDir "temp"
+        $TempFolder = Join-Path $RuntimesDir "temp" 
+        $UnpackFolder = Join-Path $TempFolder $runtimeFullName
         $DownloadFile = Join-Path $UnpackFolder "$runtimeFullName.nupkg"
 
         if(Test-Path $UnpackFolder) {
@@ -1155,7 +1152,19 @@ function dnvm-install {
         else {
             _WriteOut "Installing to $RuntimeFolder"
             _WriteDebug "Moving package contents to $RuntimeFolder"
-            Move-Item $UnpackFolder $RuntimeFolder
+            try {
+                Move-Item $UnpackFolder $RuntimeFolder
+            } catch {
+                if(Test-Path $RuntimeFolder) {
+                    #Attempt to cleanup the runtime folder if it is there after a fail.
+                    Remove-Item $RuntimeFolder -Recurse -Force
+                    throw
+                }
+            }
+            #If there is nothing left in the temp folder remove it. There could be other installs happening at the same time as this.
+            if(-Not(Test-Path $(Join-Path $TempFolder "*"))) {
+                Remove-Item $TempFolder -Recurse
+            }
         }
 
         dnvm-use $PackageVersion -Architecture:$Architecture -Runtime:$Runtime -Persistent:$Persistent
@@ -1179,11 +1188,18 @@ function dnvm-install {
             else {
                 _WriteOut "Compiling native images for $runtimeFullName to improve startup performance..."
                 Write-Progress -Activity "Installing runtime" -Status "Generating runtime native images" -Id 1
+ 
+                if(Get-Command $CrossGenCommand -ErrorAction SilentlyContinue) {
+                    $crossGenCommand = $CrossGenCommand
+                } else {
+                    $crossGenCommand = $OldCrossGenCommand
+                }
+
                 if ($DebugPreference -eq 'SilentlyContinue') {
-                    Start-Process $CrossGenCommand -Wait -WindowStyle Hidden
+                    Start-Process $crossGenCommand -Wait -WindowStyle Hidden
                 }
                 else {
-                    Start-Process $CrossGenCommand -Wait -NoNewWindow
+                    Start-Process $crossGenCommand -Wait -NoNewWindow
                 }
                 _WriteOut "Finished native image compilation."
             }

test/ps1/Run-Tests.ps1

@@ -91,6 +91,6 @@ $PSBoundParameters.Keys | ForEach-Object {
 }
 
 # Launch the script that will actually run the tests in a new shell
+& powershell -Version 2 -NoProfile -NoLogo -Command "& `"$PSScriptRoot\_Execute-Tests.ps1`" $childArgs -RunningInNewPowershell"
 & powershell -NoProfile -NoLogo -Command "& `"$PSScriptRoot\_Execute-Tests.ps1`" $childArgs -RunningInNewPowershell"
-
 exit $LASTEXITCODE

test/ps1/_Common.ps1

@@ -88,3 +88,34 @@ param(
     $wc.Proxy = $wp
   }
 }
+
+function Get-FileHash
+{
+    param ([string] $Path)
+
+    if (-not (Test-Path -LiteralPath $Path -PathType Leaf))
+    {
+        return $null
+    }
+
+    $item = Get-Item -LiteralPath $Path
+    if ($item -isnot [System.IO.FileSystemInfo])
+    {
+        return $null
+    }
+
+    $stream = $null
+
+    try
+    {
+        $sha = New-Object System.Security.Cryptography.SHA256CryptoServiceProvider
+        $stream = $item.OpenRead()
+        $bytes = $sha.ComputeHash($stream)
+        return [convert]::ToBase64String($bytes)
+    }
+    finally
+    {
+        if ($null -ne $stream) { $stream.Close() }
+        if ($null -ne $sha)    { $sha.Clear() }
+    }
+}

test/ps1/_Execute-Tests.ps1

@@ -1,4 +1,4 @@
-#Requires -Version 3
+#Requires -Version 2
 param(
     [string]$PesterPath = $null,
     [string]$PesterRef = "anurse/teamcity",
@@ -23,22 +23,32 @@ if(!$RunningInNewPowershell) {
     throw "Don't use this script to run the tests! Use Run-Tests.ps1, it sets up a new powershell instance in which to run the tests!"
 }
 
-. "$PSScriptRoot\_Common.ps1"
+$scriptDir = $PSScriptRoot
+if (!$scriptDir) {
+    if ($MyInvocation.MyCommand.Path) {
+        $scriptDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+    }
+}
+
+Write-Host "Script Dir: $scriptDir"
+
+. "$scriptDir\_Common.ps1"
 
 # Set defaults
-if(!$PesterPath) { $PesterPath = Join-Path $PSScriptRoot ".pester" }
-if(!$TestsPath) { $TestsPath = Join-Path $PSScriptRoot "tests" }
-if(!$TargetPath) { $TargetPath = Convert-Path (Join-Path $PSScriptRoot "../../src/dnvm.ps1") }
-if(!$TestWorkingDir) { $TestWorkingDir = Join-Path $PSScriptRoot "testwork" }
-if(!$TestAppsDir) { $TestAppsDir = Convert-Path (Join-Path $PSScriptRoot "../apps") }
+if(!$PesterPath) { $PesterPath = Join-Path $scriptDir ".pester" }
+if(!$TestsPath) { $TestsPath = Join-Path $scriptDir "tests" }
+if(!$TargetPath) { $TargetPath = Convert-Path (Join-Path $scriptDir "../../src/dnvm.ps1") }
+if(!$TestWorkingDir) { $TestWorkingDir = Join-Path $scriptDir "testwork" }
+if(!$TestAppsDir) { $TestAppsDir = Convert-Path (Join-Path $scriptDir "../apps") }
+
 
 # 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/aspnetrelease/api/v2"
 $TestRuntimeVersion = "1.0.0-beta4-11566"
 $specificNupkgUrl = "$($env:DNX_FEED)/package/dnx-coreclr-win-x64/$TestRuntimeVersion"
-$specificNupkgHash = "0081E0E5F98D9DE3BD078932AED162DA8611B4A904137C74F489E1BBC379C6DE"
+$specificNupkgHash = "AIHg5fmNneO9B4kyrtFi2oYRtKkEE3x09Inhu8N5xt4="
 $specificNupkgName = "dnx-coreclr-win-x64.$TestRuntimeVersion.nupkg"
 $specificNuPkgFxName = "Asp.Net,Version=v5.0"
 
@@ -109,7 +119,7 @@ $specificNupkgPath = Join-Path $downloadDir $specificNupkgName
 # If the test package exists
 if(Test-Path $specificNupkgPath) {
     # Test it against the expected hash
-    if((Get-FileHash -Algorithm SHA256 $specificNupkgPath).Hash -ne $specificNupkgHash) {
+    if((Get-FileHash $specificNupkgPath) -ne $specificNupkgHash) {
         # Failed to match, kill it with fire!
         Write-Host "Test prerequisites are corrupt, redownloading."
         rm -for $specificNupkgPath
@@ -123,7 +133,7 @@ if(!(Test-Path $specificNupkgPath)) {
     $wc.DownloadFile($specificNupkgUrl, $specificNupkgPath)
 
     # Test it against the expected hash
-    $actualHash = (Get-FileHash -Algorithm SHA256 $specificNupkgPath).Hash
+    $actualHash = (Get-FileHash $specificNupkgPath)
     if($actualHash -ne $specificNupkgHash) {
         # Failed to match, we downloaded a corrupt package??
         throw "Test prerequisite $specificNupkgUrl failed to download. The hash '$actualHash' does not match the expected value."
@@ -161,7 +171,7 @@ function TeamCityEscape($str) {
 
 # Generate TeamCity Output
 if($TeamCity) {
-    Write-Host "##teamcity[testSuiteStarted name='$CommandName.ps1']"
+    Write-Host "##teamcity[testSuiteStarted name='$CommandName.ps1 on PSv$($Host.Version.Major)']"
     $result.TestResult | Group-Object Describe | ForEach-Object {
         $describe = TeamCityEscape $_.Name
         Write-Host "##teamcity[testSuiteStarted name='$describe']"
@@ -196,5 +206,4 @@ if($TeamCity) {
 }
 
 # Set the exit code!
-
 $host.SetShouldExit($result.FailedCount)