Unit test fixes to comply with move to .NET 8

Author: dahall

UnitTests/Core/InteropServices/MatrixTests.cs

@@ -1,6 +1,6 @@
-#if NET7_0_OR_GREATER
-using NUnit.Framework;
-using GMatrix4x4 = System.Numerics.Matrix<System.Single>;
+using NUnit.Framework;
+using Vanara;
+using GMatrix4x4 = Vanara.Matrix<float>;
 using GScalar = System.Single;
 
 namespace System.Numerics.Tests;
@@ -25,7 +25,7 @@ public void AdditionTest()
 		GMatrix4x4 vr = GMatrix4x4.CreateIdentity(4);
 
 		GMatrix4x4 bad = GMatrix4x4.CreateIdentity(3);
-		Assert.Throws<ArgumentException>(() => vl + bad);
+		Assert.That(() => vl + bad, Throws.ArgumentException);
 
 		var val = vl + vr;
 		Assert.Equals(val.Columns, vl.Columns);
@@ -102,7 +102,7 @@ public void HashCodeTest()
 		Assert.Equals(val.GetHashCode(), val.GetHashCode());
 
 		GMatrix4x4 val2 = GenerateIncrementalMatrixNumber(4f);
-		Assert.AreNotEqual(val.GetHashCode(), val2.GetHashCode());
+		Assert.That(val.GetHashCode(), Is.Not.EqualTo(val2.GetHashCode()));
 	}
 
 	[Test]
@@ -161,7 +161,7 @@ public void MultiplicationTest()
 		GMatrix4x4 vl = new float[,] { { 1, 2, 3 }, { 4, 5, 6 } };
 		GMatrix4x4 vr = new float[,] { { 10, 11 }, { 20, 21 }, { 30, 31 } };
 
-		Assert.Throws<ArgumentException>(() => vl * GenerateIncrementalMatrixNumber());
+		Assert.That(() => vl * GenerateIncrementalMatrixNumber(), Throws.ArgumentException);
 
 		var val = vl * vr;
 		Assert.Equals(val.Columns, vr.Columns);
@@ -197,14 +197,14 @@ public void PropCheck()
 		Assert.That(val[0, 0] == 1f);
 		Assert.That(val[0, 1] == 0f);
 
-		Assert.Throws<ArgumentOutOfRangeException>(() => val[0, 4] == 0f);
-		Assert.Throws<ArgumentOutOfRangeException>(() => val[4, 0] == 0f);
+		Assert.That(() => val[0, 4] == 0f, Throws.TypeOf<ArgumentOutOfRangeException>());
+		Assert.That(() => val[4, 0] == 0f, Throws.TypeOf<ArgumentOutOfRangeException>());
 
 		val[0, 0] = 2f;
 		Assert.That(val[0, 0] == 2f);
 
-		Assert.Throws<ArgumentOutOfRangeException>(() => val[0, 4] = 0f);
-		Assert.Throws<ArgumentOutOfRangeException>(() => val[4, 0] = 0f);
+		Assert.That(() => val[0, 4] = 0f, Throws.TypeOf<ArgumentOutOfRangeException>());
+		Assert.That(() => val[4, 0] = 0f, Throws.TypeOf<ArgumentOutOfRangeException>());
 	}
 
 	[Test]
@@ -237,7 +237,7 @@ public void SubtractTest()
 		GMatrix4x4 vr = GenerateIncrementalMatrixNumber(-5f);
 
 		GMatrix4x4 bad = GMatrix4x4.CreateIdentity(3);
-		Assert.Throws<ArgumentException>(() => vl - bad);
+		Assert.That(() => vl - bad, Throws.ArgumentException);
 
 		Assert.That(vl != vr);
 		var val = vl - vr;
@@ -283,5 +283,4 @@ public void VectorTest()
 		Assert.Equals(rvec2, val.RowVector(2));
 		Assert.Equals(cvec2, val.ColumnVector(2));
 	}
-}
-#endif
+}

UnitTests/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <TargetFrameworks/>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release;DebugNoTests</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <LangVersion>latest</LangVersion>

UnitTests/PInvoke/CldApi/CldApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>UnitTest.PInvoke.CldApi</AssemblyName>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows10.0.19041.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\PInvoke\CldApi\Vanara.PInvoke.CldApi.csproj" />

UnitTests/PInvoke/ComCtl32/ComCtl32.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>UnitTest.PInvoke.ComCtl32</AssemblyName>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>

UnitTests/PInvoke/NdfApi/NdfApi.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <AssemblyName>UnitTest.PInvoke.NdfApi</AssemblyName>
     <RegisterForComInterop>false</RegisterForComInterop>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <EnableComHosting>true</EnableComHosting>
   </PropertyGroup>
   <ItemGroup>

UnitTests/PInvoke/Printing/PrintingTests.cs

@@ -424,7 +424,7 @@ public void PortTest()
 
 		Assert.That(SetPort(null, port, PORT_STATUS.PORT_STATUS_OFFLINE, PORT_STATUS_TYPE.PORT_STATUS_TYPE_ERROR), ResultIs.Successful);
 		Assert.That(SetPort(null, port, "Off-line", PORT_STATUS_TYPE.PORT_STATUS_TYPE_ERROR), ResultIs.Successful);
-		Assert.That(SetPort(null, port, 0, 0), ResultIs.Successful);
+		Assert.That(SetPort(null, port, 0, default(IntPtr)), ResultIs.Successful);
 	}
 
 	[Test]

UnitTests/PInvoke/Security/AdvApi32/PSIDTests.cs

@@ -37,7 +37,7 @@ public void AllocateAndInitializeSidTest()
 		Assert.That(() => s = ConvertSidToStringSid(pSid), Throws.Nothing);
 		Assert.That(s, Is.EqualTo("S-1-1-0"));
 		Assert.That(GetSidSubAuthority(pSid, 0), Is.EqualTo(0));
-		var len = GetLengthSid(pSid);
+		SizeT len = GetLengthSid(pSid);
 		var p2 = new SafePSID(len);
 		b = CopySid(len, (IntPtr)p2, pSid);
 		Assert.That(EqualSid(p2, pSid));
@@ -132,7 +132,7 @@ public void GetWindowsAccountDomainSidTest()
 	[Test]
 	public void InitializeSidTest()
 	{
-		using var pSid = new SafePSID(32);
+		using var pSid = new SafePSID((SizeT)32);
 		Assert.That(InitializeSid(pSid, KnownSIDAuthority.SECURITY_LOCAL_SID_AUTHORITY, 2), ResultIs.Successful);
 	}
 
@@ -173,7 +173,7 @@ public void PSIDTest()
 		var id2 = new SecurityIdentifier((IntPtr)sid3);
 		Assert.That(id2.IsWellKnown(WellKnownSidType.WorldSid));
 
-		using var sid4 = new SafePSID(100);
+		using var sid4 = new SafePSID((SizeT)100);
 		Assert.That(!sid4.IsClosed);
 		Assert.That(!sid4.IsValidSid);
 		Assert.That((int)sid4.Size, Is.EqualTo(100));

UnitTests/PInvoke/Security/AdvApi32/WinSaferTests.cs

@@ -28,7 +28,7 @@ public void SaferGetSetLevelInformationTest()
 			//Assert.That(SaferSetLevelInformation(hLvl, SAFER_OBJECT_INFO_CLASS.SaferObjectDescription, str, str.Size), ResultIs.Successful);
 			Assert.That(SaferGetLevelInformation(hLvl, SAFER_OBJECT_INFO_CLASS.SaferObjectDescription, retstr, retstr.Size, out _), ResultIs.Successful);
 			//Assert.That(retstr.ToString(), Is.EqualTo(str.ToString()));
-			TestContext.WriteLine(retstr);
+			TestContext.WriteLine((string?)retstr);
 		}
 	}
 

UnitTests/Windows.Shell/Windows.Shell.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>UnitTest.Windows.Shell</AssemblyName>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>