Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix switch for Win10 and it's test-value for future #36

Open
wants to merge 2 commits into
base: developer
Choose a base branch
from
Open

Fix switch for Win10 and it's test-value for future #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32db09b
Fix Windows 10 checks
lmf-mx Feb 16, 2018
b242ccb
Move to get-ciminstance from get-wmiobject
lmf-mx Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DockerMsftProvider.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ function InstallContainer
}
else
{
switch(Get-wmiobject -class win32_operatingsystem | select-object -ExpandProperty Caption ){
switch -regex (Get-CimInstance -ClassName Win32_OperatingSystem | select-object -ExpandProperty Caption ){
'Microsoft Windows 10' {
$containerExists = Get-WindowsOptionalFeature -Online -FeatureName Containers |
Select-object -Property *,@{name='Installed';expression={$_.State -eq 'Enabled'}}
Expand All @@ -599,7 +599,7 @@ function InstallContainer
else
{
Write-Verbose "Installing Containers..."
switch(Get-wmiobject -class win32_operatingsystem | select-object -ExpandProperty Caption ){
switch -regex (Get-CimInstance -ClassName Win32_OperatingSystem | select-object -ExpandProperty Caption ){
'Microsoft Windows 10' {$null = Enable-WindowsOptionalFeature -FeatureName Containers}
Default {$null = Install-WindowsFeature containers}
}
Expand All @@ -618,7 +618,7 @@ function UninstallContainer
}
else
{
switch(Get-wmiobject -class win32_operatingsystem | select-object -ExpandProperty Caption ){
switch -regex (Get-CimInstance -ClassName Win32_OperatingSystem | select-object -ExpandProperty Caption ){
'Microsoft Windows 10' {$null = Disable-WindowsOptionalFeature -FeatureName Containers}
Default {$null = Uninstall-WindowsFeature containers }
}
Expand Down