Skip to content

Remove obsolete CA2006 rule suppression #25939

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 1 commit into from
Feb 23, 2026
Merged

Remove obsolete CA2006 rule suppression #25939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3424,7 +3424,6 @@ internal static IntPtr GetOwnerWindow(PSHost host)
return IntPtr.Zero;
}
#else
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private static IntPtr hWnd = IntPtr.Zero;
private static bool firstRun = true;

Expand Down
9 changes: 0 additions & 9 deletions src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ internal struct WSManUserNameCredentialStruct
/// <summary>
/// Making password secure.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr password;
}

Expand Down Expand Up @@ -626,7 +625,6 @@ internal class WSManBinaryOrTextDataStruct
{
internal int bufferLength;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr data;
}

Expand All @@ -637,10 +635,8 @@ internal class WSManData_ManToUn : IDisposable
{
private readonly WSManDataStruct _internalData;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _marshalledObject = IntPtr.Zero;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _marshalledBuffer = IntPtr.Zero;

/// <summary>
Expand Down Expand Up @@ -933,7 +929,6 @@ internal struct WSManStreamIDSetStruct
{
internal int streamIDsCount;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr streamIDs;
}

Expand Down Expand Up @@ -1085,7 +1080,6 @@ internal struct WSManOptionSetStruct
/// <summary>
/// Pointer to an array of WSManOption objects.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr options;

internal bool optionsMustUnderstand;
Expand Down Expand Up @@ -1223,13 +1217,11 @@ internal struct WSManCommandArgSetInternal
{
internal int argsCount;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr args;
}

private WSManCommandArgSetInternal _internalData;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private MarshalledObject _data;

#region Managed to Unmanaged
Expand Down Expand Up @@ -1733,7 +1725,6 @@ internal struct WSManShellAsyncCallback
// GC handle which prevents garbage collector from collecting this delegate.
private GCHandle _gcHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private readonly IntPtr _asyncCallback;

internal WSManShellAsyncCallback(WSManShellCompletionFunction callback)
Expand Down
10 changes: 0 additions & 10 deletions src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,61 +343,51 @@ internal class WSManPluginEntryDelegatesInternal
/// <summary>
/// WsManPluginShutdownPluginCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginShutdownPluginCallbackNative;

/// <summary>
/// WSManPluginShellCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginShellCallbackNative;

/// <summary>
/// WSManPluginReleaseShellContextCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginReleaseShellContextCallbackNative;

/// <summary>
/// WSManPluginCommandCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginCommandCallbackNative;

/// <summary>
/// WSManPluginReleaseCommandContextCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginReleaseCommandContextCallbackNative;

/// <summary>
/// WSManPluginSendCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginSendCallbackNative;

/// <summary>
/// WSManPluginReceiveCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginReceiveCallbackNative;

/// <summary>
/// WSManPluginSignalCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginSignalCallbackNative;

/// <summary>
/// WSManPluginConnectCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginConnectCallbackNative;

/// <summary>
/// WSManPluginCommandCallbackNative.
/// </summary>
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
internal IntPtr wsManPluginShutdownCallbackNative;
}
}
Expand Down
19 changes: 3 additions & 16 deletions src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,13 @@ internal CompletionEventArgs(CompletionNotification notification)
#endregion

#region Private Data

// operation handles are owned by WSMan
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManSessionHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManShellOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManReceiveOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManSendOperationHandle;

// this is used with WSMan callbacks to represent a session transport manager.
private long _sessionContextID;

Expand Down Expand Up @@ -2643,7 +2638,6 @@ private void DisposeWSManAPIDataAsync()
/// </summary>
internal class WSManAPIDataCommon : IDisposable
{
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _handle;
// if any
private WSManNativeApi.WSManStreamIDSet_ManToUn _inputStreamSet;
Expand Down Expand Up @@ -2791,18 +2785,11 @@ internal sealed class WSManClientCommandTransportManager : BaseClientCommandTran

// operation handles
private readonly IntPtr _wsManShellOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManCmdOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _cmdSignalOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManReceiveOperationHandle;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private IntPtr _wsManSendOperationHandle;

// this is used with WSMan callbacks to represent a command transport manager.
private long _cmdContextId;

Expand Down
2 changes: 0 additions & 2 deletions src/System.Management.Automation/security/SecuritySupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,10 +1607,8 @@ internal static void CurrentDomain_ProcessExit(object sender, EventArgs e)
}
}

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private static IntPtr s_amsiContext = IntPtr.Zero;

[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
private static IntPtr s_amsiSession = IntPtr.Zero;

private static readonly bool s_amsiInitFailed = false;
Expand Down
Loading