Skip to content

Commit

Permalink
Use PowerShell Core RTM version for testing instead of old alpha/beta…
Browse files Browse the repository at this point in the history
… versions (#416)
  • Loading branch information
bergmeister authored and alerickson committed Jan 11, 2019
1 parent 8436d50 commit b659d76
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 299 deletions.
5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,3 @@
path = src/Microsoft.PackageManagement.NuGetProvider
url = https://github.com/OneGet/NuGetProvider.git

[submodule "src/Modules/PowerShellGet"]

path = src/Modules/PowerShellGet

url = https://github.com/PowerShell/PowerShellGet.git
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/find-packageprovider.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
$WindowsPowerShell = $true
}
Expand Down
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/get-package.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
}
catch { }
Expand Down
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/get-packageprovider.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
}
catch { }
Expand Down
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/import-packageprovider.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
}
catch { }
Expand Down
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/install-packageprovider.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
$WindowsPowerShell = $true
}
Expand Down
8 changes: 0 additions & 8 deletions Test/ModuleTests/tests/legacy.tests.ps1

This file was deleted.

4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/nuget.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
$WindowsPowerShell = $true
}
Expand Down
4 changes: 2 additions & 2 deletions Test/ModuleTests/tests/psget.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ try {

$IsCoreCLR = $true
$IsLinux = $Runtime::IsOSPlatform($OSPlatform::Linux)
$IsOSX = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsMacOS = $Runtime::IsOSPlatform($OSPlatform::OSX)
$IsWindows = $Runtime::IsOSPlatform($OSPlatform::Windows)
} catch {
# If these are already set, then they're read-only and we're done
try {
$IsCoreCLR = $false
$IsLinux = $false
$IsOSX = $false
$IsMacOS = $false
$IsWindows = $true
}
catch { }
Expand Down
8 changes: 4 additions & 4 deletions Test/PSL/win10/PSL.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"PowerShell": {
"displayName": "PowerShell_6.0.0-beta.5",
"source": "https://github.com/PowerShell/PowerShell/releases/download/v6.0.0-beta.5/PowerShell-6.0.0-beta.5-win10-win2016-x64.msi",
"displayName": "PowerShell_6.1.1",
"source": "https://github.com/PowerShell/PowerShell/releases/download/v6.1.1/PowerShell-6.1.1-win-x64.msi",
"hash": {
"algorithm": "sha512",
"hashCode": "A517AF70C759D8F41FAAB35B2DAD2BD9B27A12D8144F911E0463841850D1AB686318D1C7D70116459DB04C6B7B6E0D8AFBAEE28BABE19F0353FFE2CEC5C0C2A0"
"hashCode": "A3C01E75623E40EE03F097B7EBFDD8263D8DF55BFA33EE294FEA372178C5C4E3248A888FA1BD67DBEA3521362CC8A335F520A184D858835506B5456FFBCC7299"
},
"summary": "Powershell",
"type": "msi",
"version": "6.0.0-beta.5"
"version": "6.1.1"
}
}
13 changes: 0 additions & 13 deletions Test/PSL/win10/PSL_6.0.0.14.json

This file was deleted.

Binary file modified Test/PSL/win81/PSL.json
Binary file not shown.
13 changes: 0 additions & 13 deletions Test/PSL/win81/PSL_6.0.0.14.json

This file was deleted.

Loading

0 comments on commit b659d76

Please sign in to comment.