Skip to content

Commit 19fa6a9

Browse files
xtqqczzextqqczze
authored
Remove obsolete CA2006 rule suppression (PowerShell#25939)
1 parent c19a440 commit 19fa6a9

5 files changed

Lines changed: 3 additions & 38 deletions

File tree

‎src/Microsoft.PowerShell.Security/security/CertificateProvider.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3424,7 +3424,6 @@ internal static IntPtr GetOwnerWindow(PSHost host)
34243424
return IntPtr.Zero;
34253425
}
34263426
#else
3427-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
34283427
private static IntPtr hWnd = IntPtr.Zero;
34293428
private static bool firstRun = true;
34303429

‎src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ internal struct WSManUserNameCredentialStruct
304304
/// <summary>
305305
/// Making password secure.
306306
/// </summary>
307-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
308307
internal IntPtr password;
309308
}
310309

@@ -626,7 +625,6 @@ internal class WSManBinaryOrTextDataStruct
626625
{
627626
internal int bufferLength;
628627

629-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
630628
internal IntPtr data;
631629
}
632630

@@ -637,10 +635,8 @@ internal class WSManData_ManToUn : IDisposable
637635
{
638636
private readonly WSManDataStruct _internalData;
639637

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

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

646642
/// <summary>
@@ -933,7 +929,6 @@ internal struct WSManStreamIDSetStruct
933929
{
934930
internal int streamIDsCount;
935931

936-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
937932
internal IntPtr streamIDs;
938933
}
939934

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

10911085
internal bool optionsMustUnderstand;
@@ -1223,13 +1217,11 @@ internal struct WSManCommandArgSetInternal
12231217
{
12241218
internal int argsCount;
12251219

1226-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
12271220
internal IntPtr args;
12281221
}
12291222

12301223
private WSManCommandArgSetInternal _internalData;
12311224

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

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

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

17391730
internal WSManShellAsyncCallback(WSManShellCompletionFunction callback)

‎src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,61 +343,51 @@ internal class WSManPluginEntryDelegatesInternal
343343
/// <summary>
344344
/// WsManPluginShutdownPluginCallbackNative.
345345
/// </summary>
346-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
347346
internal IntPtr wsManPluginShutdownPluginCallbackNative;
348347

349348
/// <summary>
350349
/// WSManPluginShellCallbackNative.
351350
/// </summary>
352-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
353351
internal IntPtr wsManPluginShellCallbackNative;
354352

355353
/// <summary>
356354
/// WSManPluginReleaseShellContextCallbackNative.
357355
/// </summary>
358-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
359356
internal IntPtr wsManPluginReleaseShellContextCallbackNative;
360357

361358
/// <summary>
362359
/// WSManPluginCommandCallbackNative.
363360
/// </summary>
364-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
365361
internal IntPtr wsManPluginCommandCallbackNative;
366362

367363
/// <summary>
368364
/// WSManPluginReleaseCommandContextCallbackNative.
369365
/// </summary>
370-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
371366
internal IntPtr wsManPluginReleaseCommandContextCallbackNative;
372367

373368
/// <summary>
374369
/// WSManPluginSendCallbackNative.
375370
/// </summary>
376-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
377371
internal IntPtr wsManPluginSendCallbackNative;
378372

379373
/// <summary>
380374
/// WSManPluginReceiveCallbackNative.
381375
/// </summary>
382-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
383376
internal IntPtr wsManPluginReceiveCallbackNative;
384377

385378
/// <summary>
386379
/// WSManPluginSignalCallbackNative.
387380
/// </summary>
388-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
389381
internal IntPtr wsManPluginSignalCallbackNative;
390382

391383
/// <summary>
392384
/// WSManPluginConnectCallbackNative.
393385
/// </summary>
394-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
395386
internal IntPtr wsManPluginConnectCallbackNative;
396387

397388
/// <summary>
398389
/// WSManPluginCommandCallbackNative.
399390
/// </summary>
400-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
401391
internal IntPtr wsManPluginShutdownCallbackNative;
402392
}
403393
}

‎src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -317,18 +317,13 @@ internal CompletionEventArgs(CompletionNotification notification)
317317
#endregion
318318

319319
#region Private Data
320+
320321
// operation handles are owned by WSMan
321-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
322322
private IntPtr _wsManSessionHandle;
323-
324-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
325323
private IntPtr _wsManShellOperationHandle;
326-
327-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
328324
private IntPtr _wsManReceiveOperationHandle;
329-
330-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
331325
private IntPtr _wsManSendOperationHandle;
326+
332327
// this is used with WSMan callbacks to represent a session transport manager.
333328
private long _sessionContextID;
334329

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

27922786
// operation handles
27932787
private readonly IntPtr _wsManShellOperationHandle;
2794-
2795-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
27962788
private IntPtr _wsManCmdOperationHandle;
2797-
2798-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
27992789
private IntPtr _cmdSignalOperationHandle;
2800-
2801-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
28022790
private IntPtr _wsManReceiveOperationHandle;
2803-
2804-
[SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
28052791
private IntPtr _wsManSendOperationHandle;
2792+
28062793
// this is used with WSMan callbacks to represent a command transport manager.
28072794
private long _cmdContextId;
28082795

‎src/System.Management.Automation/security/SecuritySupport.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,10 +1607,8 @@ internal static void CurrentDomain_ProcessExit(object sender, EventArgs e)
16071607
}
16081608
}
16091609

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

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

16161614
private static readonly bool s_amsiInitFailed = false;

0 commit comments

Comments
 (0)