Remove some code that is incompatible with dotnet 5+ (#539)

ansible-collections · Aug 9, 2023 · b31fb08 · b31fb08
1 parent c535509
commit b31fb08
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 15 deletions.
diff --git a/changelogs/fragments/dotnet-preparation.yml b/changelogs/fragments/dotnet-preparation.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- Remove some code which is no longer valid for dotnet 5+
diff --git a/plugins/module_utils/Process.cs b/plugins/module_utils/Process.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
@@ -305,7 +304,6 @@ public SafeMemoryBuffer(IntPtr handle) : base(true)
             base.SetHandle(handle);
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             Marshal.FreeHGlobal(handle);
@@ -385,7 +383,6 @@ public SafeNativeHandle() : base(true) { }
         public SafeNativeHandle(IntPtr handle) : this(handle, true) { }
         public SafeNativeHandle(IntPtr handle, bool ownsHandle) : base(ownsHandle) { this.handle = handle; }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             return NativeMethods.CloseHandle(handle);

diff --git a/plugins/module_utils/SCManager.cs b/plugins/module_utils/SCManager.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
@@ -295,7 +294,6 @@ public SafeMemoryBuffer(IntPtr handle) : base(true)
             base.SetHandle(handle);
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             Marshal.FreeHGlobal(handle);
@@ -308,7 +306,6 @@ internal class SafeServiceHandle : SafeHandleZeroOrMinusOneIsInvalid
         public SafeServiceHandle() : base(true) { }
         public SafeServiceHandle(IntPtr handle) : base(true) { this.handle = handle; }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             return NativeMethods.CloseServiceHandle(handle);

diff --git a/plugins/modules/setup.ps1 b/plugins/modules/setup.ps1
@@ -53,7 +53,6 @@ Add-CSharpType -AnsibleModule $module -References @'
 using Microsoft.Win32.SafeHandles;
 using System;
 using System.Collections.Generic;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -227,7 +226,6 @@ namespace Ansible.Windows.Setup
             base.SetHandle(Marshal.AllocHGlobal(cb));
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             Marshal.FreeHGlobal(handle);
@@ -239,7 +237,6 @@ namespace Ansible.Windows.Setup
     {
         public SafeDsMemoryBuffer() : base(true) { }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             NativeMethods.DsRoleFreeMemory(this.handle);
@@ -251,7 +248,6 @@ namespace Ansible.Windows.Setup
     {
         public SafeNetAPIBuffer() : base(true) { }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             NativeMethods.NetApiBufferFree(this.handle);

diff --git a/plugins/modules/win_package.ps1 b/plugins/modules/win_package.ps1
@@ -19,7 +19,6 @@ using Microsoft.Win32.SafeHandles;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Security.Principal;
@@ -180,7 +179,6 @@ namespace Ansible.WinPackage
     {
         public SafeMsiHandle() : base(true) { }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             UInt32 res = NativeMethods.MsiCloseHandle(handle);

diff --git a/tests/integration/targets/setup_win_device/library/win_device.ps1 b/tests/integration/targets/setup_win_device/library/win_device.ps1
@@ -30,7 +30,6 @@ Add-CSharpType -References @'
 using Microsoft.Win32.SafeHandles;
 using System;
 using System.ComponentModel;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -246,7 +245,6 @@ namespace Ansible.Device
     {
         public SafeDeviceInfoSet() : base(true) { }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             return NativeMethods.SetupDiDestroyDeviceInfoList(handle);
@@ -271,7 +269,6 @@ namespace Ansible.Device
             base.SetHandle(Marshal.StringToHGlobalUni(sz));
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         protected override bool ReleaseHandle()
         {
             Marshal.FreeHGlobal(handle);