Migrate P/Invoke to LibraryImport, suppress SYSLIB1054 for CreateProcess, enable AllowUnsafeBlocks, fix remaining warnings

Author: davidnmbond

PanoramicData.SshServer.Test/CommandService.cs

@@ -51,7 +51,7 @@ private void MessageLoop()
 				break;
 
 			var data = bytes.Length != len
-				? bytes.Take(len).ToArray()
+				? [.. bytes.Take(len)]
 				: bytes;
 			DataReceived?.Invoke(this, data);
 		}

PanoramicData.SshServer.Test/ExampleApp.csproj

@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net10.0</TargetFramework>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
 	<ItemGroup>

PanoramicData.SshServer.Test/MiniTerm/Native/ProcessApi.cs

@@ -6,7 +6,7 @@ namespace ExampleApp.MiniTerm.Native;
 /// <summary>
 /// PInvoke signatures for win32 process api
 /// </summary>
-static class ProcessApi
+static partial class ProcessApi
 {
 	internal const uint EXTENDED_STARTUPINFO_PRESENT = 0x00080000;
 
@@ -92,29 +92,33 @@ public readonly bool Equals(SECURITY_ATTRIBUTES other) =>
 		public static bool operator !=(SECURITY_ATTRIBUTES left, SECURITY_ATTRIBUTES right) => !left.Equals(right);
 	}
 
-	[DllImport("kernel32.dll", SetLastError = true)]
+	[LibraryImport("kernel32.dll", SetLastError = true)]
 	[return: MarshalAs(UnmanagedType.Bool)]
-	internal static extern bool InitializeProcThreadAttributeList(
+	internal static partial bool InitializeProcThreadAttributeList(
 		nint lpAttributeList, int dwAttributeCount, int dwFlags, ref nint lpSize);
 
-	[DllImport("kernel32.dll", SetLastError = true)]
+	[LibraryImport("kernel32.dll", SetLastError = true)]
 	[return: MarshalAs(UnmanagedType.Bool)]
-	internal static extern bool UpdateProcThreadAttribute(
+	internal static partial bool UpdateProcThreadAttribute(
 		nint lpAttributeList, uint dwFlags, nint attribute, nint lpValue,
 		nint cbSize, nint lpPreviousValue, nint lpReturnSize);
 
-	[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+	// LibraryImport cannot be used here: STARTUPINFOEX contains non-blittable string fields (SYSLIB1051)
+#pragma warning disable SYSLIB1054 // Use 'LibraryImportAttribute' instead of 'DllImportAttribute'
+	[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
 	[return: MarshalAs(UnmanagedType.Bool)]
 	internal static extern bool CreateProcess(
 		string lpApplicationName, string lpCommandLine, ref SECURITY_ATTRIBUTES lpProcessAttributes,
 		ref SECURITY_ATTRIBUTES lpThreadAttributes, bool bInheritHandles, uint dwCreationFlags,
 		nint lpEnvironment, string lpCurrentDirectory, [In] ref STARTUPINFOEX lpStartupInfo,
 		out PROCESS_INFORMATION lpProcessInformation);
+#pragma warning restore SYSLIB1054
 
-	[DllImport("kernel32.dll", SetLastError = true)]
+	[LibraryImport("kernel32.dll", SetLastError = true)]
 	[return: MarshalAs(UnmanagedType.Bool)]
-	internal static extern bool DeleteProcThreadAttributeList(nint lpAttributeList);
+	internal static partial bool DeleteProcThreadAttributeList(nint lpAttributeList);
 
-	[DllImport("kernel32.dll", SetLastError = true)]
-	internal static extern bool CloseHandle(nint hObject);
+	[LibraryImport("kernel32.dll", SetLastError = true)]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	internal static partial bool CloseHandle(nint hObject);
 }

PanoramicData.SshServer.Test/MiniTerm/Terminal.cs

@@ -52,7 +52,7 @@ public void Run() =>
 					break;
 				}
 
-				DataReceived?.Invoke(this, buf.Take(length).ToArray());
+				DataReceived?.Invoke(this, [.. buf.Take(length)]);
 			}
 
 			CloseReceived?.Invoke(this, 0);
@@ -88,9 +88,6 @@ private void Dispose(bool disposing)
 		}
 	}
 
-	public void Dispose()
-	{
-		// Do not change this code. Put clean-up code in 'Dispose(bool disposing)' method
+	public void Dispose() =>
 		Dispose(disposing: true);
-	}
 }

PanoramicData.SshServer.Test/TcpForwardService.cs

@@ -76,7 +76,7 @@ private void MessageLoop()
 				break;
 
 			var data = bytes.Length != len
-				? bytes.Take(len).ToArray()
+				? [.. bytes.Take(len)]
 				: bytes;
 			DataReceived?.Invoke(this, data);
 		}

PanoramicData.SshServer/Algorithms/DiffieHellman.cs

@@ -80,16 +80,16 @@ public byte[] DecryptKeyExchange(byte[] keyEx)
 		return bytes;
 	}
 
-	private BigInteger BytesToBigint(byte[] bytes) => new(bytes.Reverse().Concat(new byte[] { 0 }).ToArray());
+	private BigInteger BytesToBigint(byte[] bytes) => new([.. bytes.Reverse(), .. new byte[] { 0 }]);
 
 	private byte[] BigintToBytes(BigInteger bigint)
 	{
 		var bytes = bigint.ToByteArray();
 		if (bytes.Length > 1 && bytes[bytes.Length - 1] == 0)
 		{
-			return bytes.Reverse().Skip(1).ToArray();
+			return [.. bytes.Reverse().Skip(1)];
 		}
 
-		return bytes.Reverse().ToArray();
+		return [.. bytes.Reverse()];
 	}
 }

PanoramicData.SshServer/Messages/Userauth/PublicKeyRequestMessage.cs

@@ -27,7 +27,7 @@ protected override void OnLoad(SshDataWorker reader)
 		if (HasSignature)
 		{
 			Signature = reader.ReadBinary();
-			PayloadWithoutSignature = RawBytes.Take(RawBytes.Length - Signature.Length - 5).ToArray();
+			PayloadWithoutSignature = [.. RawBytes.Take(RawBytes.Length - Signature.Length - 5)];
 		}
 	}
 }

PanoramicData.SshServer/Services/Channel.cs

@@ -76,9 +76,10 @@ public void SendData(byte[] data)
 			}
 
 			if (buf == null || packetSize != buf.Length)
-				{
-					buf = new byte[packetSize];
-				}
+			{
+				buf = new byte[packetSize];
+			}
+
 			Array.Copy(data, offset, buf, 0, packetSize);
 
 			msg.Data = buf;