PowerShell - remove uneeded dotnet code for future compatibility (#81472)

pull/81579/head
Jordan Borean 2 years ago committed by GitHub
parent 116948cd14
commit f3976117fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- PowerShell - Remove some code which is no longer valid for dotnet 5+

@ -2,7 +2,6 @@ using Microsoft.Win32.SafeHandles;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
@ -123,7 +122,6 @@ namespace Ansible.AccessToken
base.SetHandle(handle); base.SetHandle(handle);
} }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
@ -247,7 +245,6 @@ namespace Ansible.AccessToken
public SafeNativeHandle() : base(true) { } public SafeNativeHandle() : base(true) { }
public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; } public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
return NativeMethods.CloseHandle(handle); return NativeMethods.CloseHandle(handle);

@ -4,7 +4,6 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.AccessControl; using System.Security.AccessControl;
using System.Security.Principal; using System.Security.Principal;
@ -175,7 +174,6 @@ namespace Ansible.Become
{ {
public SafeLsaHandle() : base(true) { } public SafeLsaHandle() : base(true) { }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
UInt32 res = NativeMethods.LsaDeregisterLogonProcess(handle); UInt32 res = NativeMethods.LsaDeregisterLogonProcess(handle);
@ -187,7 +185,6 @@ namespace Ansible.Become
{ {
public SafeLsaMemoryBuffer() : base(true) { } public SafeLsaMemoryBuffer() : base(true) { }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
UInt32 res = NativeMethods.LsaFreeReturnBuffer(handle); UInt32 res = NativeMethods.LsaFreeReturnBuffer(handle);
@ -200,7 +197,6 @@ namespace Ansible.Become
public NoopSafeHandle() : base(IntPtr.Zero, false) { } public NoopSafeHandle() : base(IntPtr.Zero, false) { }
public override bool IsInvalid { get { return false; } } public override bool IsInvalid { get { return false; } }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() { return true; } protected override bool ReleaseHandle() { return true; }
} }

@ -3,7 +3,6 @@ using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
@ -92,7 +91,6 @@ namespace Ansible.Privilege
{ {
base.SetHandle(handle); base.SetHandle(handle);
} }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
@ -104,7 +102,7 @@ namespace Ansible.Privilege
{ {
public SafeNativeHandle() : base(true) { } public SafeNativeHandle() : base(true) { }
public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; } public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
return NativeMethods.CloseHandle(handle); return NativeMethods.CloseHandle(handle);

@ -3,7 +3,6 @@ using System;
using System.Collections; using System.Collections;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
@ -176,7 +175,6 @@ namespace Ansible.Process
base.SetHandle(handle); base.SetHandle(handle);
} }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);

@ -48,7 +48,6 @@ $test_whoami = {
Add-Type -TypeDefinition @' Add-Type -TypeDefinition @'
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
using System; using System;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
@ -212,7 +211,6 @@ namespace Ansible
{ {
public SafeLsaMemoryBuffer() : base(true) { } public SafeLsaMemoryBuffer() : base(true) { }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
UInt32 res = NativeMethods.LsaFreeReturnBuffer(handle); UInt32 res = NativeMethods.LsaFreeReturnBuffer(handle);
@ -232,7 +230,6 @@ namespace Ansible
base.SetHandle(handle); base.SetHandle(handle);
} }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
@ -245,7 +242,6 @@ namespace Ansible
public SafeNativeHandle() : base(true) { } public SafeNativeHandle() : base(true) { }
public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; } public SafeNativeHandle(IntPtr handle) : base(true) { this.handle = handle; }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
return NativeMethods.CloseHandle(handle); return NativeMethods.CloseHandle(handle);

@ -2,7 +2,6 @@ using Microsoft.Win32.SafeHandles;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.ConstrainedExecution;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.Principal; using System.Security.Principal;
using System.Text; using System.Text;
@ -274,7 +273,6 @@ namespace Ansible.Service
base.SetHandle(handle); base.SetHandle(handle);
} }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
Marshal.FreeHGlobal(handle); Marshal.FreeHGlobal(handle);
@ -287,7 +285,6 @@ namespace Ansible.Service
public SafeServiceHandle() : base(true) { } public SafeServiceHandle() : base(true) { }
public SafeServiceHandle(IntPtr handle) : base(true) { this.handle = handle; } public SafeServiceHandle(IntPtr handle) : base(true) { this.handle = handle; }
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
protected override bool ReleaseHandle() protected override bool ReleaseHandle()
{ {
return NativeMethods.CloseServiceHandle(handle); return NativeMethods.CloseServiceHandle(handle);

Loading…
Cancel
Save