Update to .NET 8

JeremyKuhne · Nov 14, 2023 · 2f7ca83 · 2f7ca83
1 parent 6b9e3c4
commit 2f7ca83
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 18 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,7 +17,7 @@
     <!-- Input Directories -->
     <PackagesDir Condition="'$(PackagesDir)'==''">$(RepoDir)packages\</PackagesDir>
 
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -66,7 +66,7 @@
 
   <!-- Other settings -->
   <PropertyGroup>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/thirtytwo/ProcessAndThreads/ProcessInfo.cs b/src/thirtytwo/ProcessAndThreads/ProcessInfo.cs
@@ -60,7 +60,7 @@ public ProcessInfo()
     public Enumerator GetEnumerator() => new(this);
 
     private SYSTEM_PROCESS_INFORMATION* First
-        => (SYSTEM_PROCESS_INFORMATION*)Unsafe.AsPointer(ref Unsafe.AsRef(_buffer[0]));
+        => (SYSTEM_PROCESS_INFORMATION*)Unsafe.AsPointer(ref Unsafe.AsRef(ref _buffer[0]));
 
     public int Count => _count;
 

diff --git a/src/thirtytwo/Support/StringParameterArray.cs b/src/thirtytwo/Support/StringParameterArray.cs
@@ -32,11 +32,11 @@ public StringParameterArray(string[]? values)
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator char**(in StringParameterArray array)
-        => array._param is null ? null : (char**)Unsafe.AsPointer(ref Unsafe.AsRef(array._param[0]));
+        => array._param is null ? null : (char**)Unsafe.AsPointer(ref Unsafe.AsRef(ref array._param[0]));
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator sbyte**(in StringParameterArray array)
-        => array._param is null ? null : (sbyte**)Unsafe.AsPointer(ref Unsafe.AsRef(array._param[0]));
+        => array._param is null ? null : (sbyte**)Unsafe.AsPointer(ref Unsafe.AsRef(ref array._param[0]));
 
     public void Dispose()
     {

diff --git a/src/thirtytwo/Win32/Foundation/BSTR.cs b/src/thirtytwo/Win32/Foundation/BSTR.cs
@@ -15,7 +15,7 @@ public BSTR(string value) : this((char*)Marshal.StringToBSTR(value))
     public void Dispose()
     {
         Marshal.FreeBSTR((nint)Value);
-        Unsafe.AsRef(this) = default;
+        Unsafe.AsRef(in this) = default;
     }
 
     public string ToStringAndFree()

diff --git a/src/thirtytwo/Win32/Foundation/HANDLE.cs b/src/thirtytwo/Win32/Foundation/HANDLE.cs
@@ -15,6 +15,6 @@ public unsafe void Dispose()
             Interop.CloseHandle(this).ThrowLastErrorIfFalse();
         }
 
-        Unsafe.AsRef(this) = default;
+        Unsafe.AsRef(in this) = default;
     }
 }
diff --git a/src/thirtytwo/Win32/Foundation/PCWSTR.cs b/src/thirtytwo/Win32/Foundation/PCWSTR.cs
@@ -5,7 +5,9 @@
 
 namespace Windows.Win32.Foundation;
 
+#pragma warning disable CA2231 // Overload operator equals on overriding value type Equals
 public unsafe partial struct PCWSTR
+#pragma warning restore CA2231
 {
     public bool IsNull => Value is null;
 
@@ -14,7 +16,7 @@ public void LocalFree()
         if (Value is not null)
         {
             Interop.LocalFree((HLOCAL)(nint)Value);
-            Unsafe.AsRef(this) = default;
+            Unsafe.AsRef(in this) = default;
         }
     }
 }
diff --git a/src/thirtytwo/Win32/Foundation/PWSTR.cs b/src/thirtytwo/Win32/Foundation/PWSTR.cs
@@ -14,7 +14,7 @@ public void LocalFree()
         if (Value is not null)
         {
             Interop.LocalFree((HLOCAL)(nint)Value);
-            Unsafe.AsRef(this) = default;
+            Unsafe.AsRef(in this) = default;
         }
     }
 }
diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HFONT.cs b/src/thirtytwo/Win32/Graphics/Gdi/HFONT.cs
@@ -104,6 +104,6 @@ public void Dispose()
             Interop.DeleteObject(this);
         }
 
-        Unsafe.AsRef(this) = default;
+        Unsafe.AsRef(in this) = default;
     }
 }
diff --git a/src/thirtytwo/Win32/Graphics/Gdi/HRGN.cs b/src/thirtytwo/Win32/Graphics/Gdi/HRGN.cs
@@ -15,7 +15,7 @@ public void Dispose()
             Interop.DeleteObject(this);
         }
 
-        Unsafe.AsRef(this) = default;
+        Unsafe.AsRef(in this) = default;
     }
 
     public static HRGN FromRectangle(Rectangle rectangle)

diff --git a/src/thirtytwo/Win32/System/Com/ComScope.cs b/src/thirtytwo/Win32/System/Com/ComScope.cs
@@ -50,10 +50,10 @@ namespace Windows.Win32.System.Com;
     public static implicit operator nint(in ComScope<T> scope) => scope._value;
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static implicit operator T**(in ComScope<T> scope) => (T**)Unsafe.AsPointer(ref Unsafe.AsRef(scope._value));
+    public static implicit operator T**(in ComScope<T> scope) => (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in scope._value));
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static implicit operator void**(in ComScope<T> scope) => (void**)Unsafe.AsPointer(ref Unsafe.AsRef(scope._value));
+    public static implicit operator void**(in ComScope<T> scope) => (void**)Unsafe.AsPointer(ref Unsafe.AsRef(in scope._value));
 
     public bool IsNull => _value == 0;
 

diff --git a/src/thirtytwo/Win32/UI/WindowsAndMessaging/HICON.cs b/src/thirtytwo/Win32/UI/WindowsAndMessaging/HICON.cs
@@ -72,6 +72,6 @@ public void Dispose()
             Interop.DestroyIcon(this);
         }
 
-        Unsafe.AsRef(this) = default;
+        Unsafe.AsRef(in this) = default;
     }
 }
diff --git a/src/thirtytwo_tests/thirtytwo_tests.csproj b/src/thirtytwo_tests/thirtytwo_tests.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
-
     <RootNamespace>Windows</RootNamespace>
-
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>