Merge pull request #1231 from PowerShell/vors/start
Exclude Microsoft.WSMan.Management from the list of default snapins
This commit is contained in:
commit
1b130b20e1
3 changed files with 9 additions and 2 deletions
|
@ -156,7 +156,7 @@ function Start-PSBuild {
|
||||||
|
|
||||||
# handle xaml files
|
# handle xaml files
|
||||||
# Heuristic to resolve xaml on the fresh machine
|
# Heuristic to resolve xaml on the fresh machine
|
||||||
if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.resources")))
|
if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.cs")))
|
||||||
{
|
{
|
||||||
log "Run XamlGen (generating .g.cs and .resources for .xaml files)"
|
log "Run XamlGen (generating .g.cs and .resources for .xaml files)"
|
||||||
Start-XamlGen -MSBuildConfiguration $msbuildConfiguration
|
Start-XamlGen -MSBuildConfiguration $msbuildConfiguration
|
||||||
|
|
|
@ -1409,7 +1409,7 @@ namespace System.Management.Automation
|
||||||
"SecurityMshSnapInResources,Description","SecurityMshSnapInResources,Vendor")
|
"SecurityMshSnapInResources,Description","SecurityMshSnapInResources,Vendor")
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !LINUX
|
#if !PORTABLE
|
||||||
if (!Utils.IsWinPEHost())
|
if (!Utils.IsWinPEHost())
|
||||||
{
|
{
|
||||||
defaultMshSnapins.Add(new DefaultPSSnapInInformation("Microsoft.WSMan.Management", "Microsoft.WSMan.Management", null,
|
defaultMshSnapins.Add(new DefaultPSSnapInInformation("Microsoft.WSMan.Management", "Microsoft.WSMan.Management", null,
|
||||||
|
|
7
test/powershell/engine/BasicEngine.Tests.ps1
Normal file
7
test/powershell/engine/BasicEngine.Tests.ps1
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
Describe 'Basic engine APIs' {
|
||||||
|
Context 'powershell::Create' {
|
||||||
|
It 'can create default instance' {
|
||||||
|
[powershell]::Create() | Should Not Be $null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue