Skip to content

Exclude -Comobject parameter of New-Object cmdlet on unsupported platforms #4922

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

Merged
daxian-dbw merged 5 commits into from
Sep 29, 2017
Merged

Exclude -Comobject parameter of New-Object cmdlet on unsupported platforms #4922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8895ea0
Convert indentations to spaces in tests
iSazonov Sep 26, 2017
9fa0274
Exclude on Unix ComObject parameter in New-Object cmdlet
iSazonov Sep 26, 2017
baf780f
Add tests
iSazonov Sep 26, 2017
2af645b
Exclude Comobject only on Unix
iSazonov Sep 27, 2017
24b9545
Correct test to support NamoServer and IoT
iSazonov Sep 28, 2017
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
8 changes: 6 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ public sealed class NewObjectCommand : PSCmdlet
[Parameter(ParameterSetName = netSetName, Mandatory = true, Position = 0)]
public string TypeName { get; set; } = null;


#if !UNIX
private Guid _comObjectClsId = Guid.Empty;
/// <summary> the ProgID of the Com object</summary>
[Parameter(ParameterSetName = "Com", Mandatory = true, Position = 0)]
public string ComObject { get; set; } = null;

#endif

/// <summary>
/// The parameters for the constructor
Expand Down Expand Up @@ -245,6 +245,7 @@ protected override void BeginProcessing()
"CannotFindAppropriateCtor",
ErrorCategory.ObjectNotFound, null));
}
#if !UNIX
else // Parameterset -Com
{
int result = NewObjectNativeMethods.CLSIDFromProgID(ComObject, out _comObjectClsId);
Expand Down Expand Up @@ -295,10 +296,12 @@ protected override void BeginProcessing()
}
WriteObject(comObject);
}
#endif
}//protected override void BeginProcessing()

#endregion Overrides

#if !UNIX
#region Com

private object SafeCreateInstance(Type t, object[] args)
Expand Down Expand Up @@ -467,6 +470,7 @@ private object CreateComObject()
}

#endregion Com
#endif

// HResult code '-2147417850' - Cannot change thread mode after it is set.
private const int RPC_E_CHANGED_MODE = unchecked((int)0x80010106);
Expand Down
Loading