Updating to VS 2026

test/AMWD.Common.AspNetCore.Tests/Extensions/HttpContextExtensionsTest.cs

@@ -110,7 +110,7 @@ namespace AMWD.Common.AspNetCore.Tests.Extensions
 			Assert.AreEqual(_remote, result);
 		}
 
-		[DataTestMethod]
+		[TestMethod]
 		[DataRow("Cf-Connecting-Ip")]
 		[DataRow("X-Real-IP")]
 		[DataRow("X-Forwarded-For")]

test/AMWD.Common.AspNetCore.Tests/Extensions/ModelStateDictionaryExtensionsTest.cs

@@ -55,25 +55,23 @@ namespace AMWD.Common.AspNetCore.Tests.Extensions
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNull()
 		{
 			// arrange
 			ModelStateDictionary modelState = null;
 
-			// act
-			modelState.AddModelError(_testModel, m => m.SubModel.SubValueB, "ShitHappens");
+			// act & assert
+			Assert.ThrowsExactly<ArgumentNullException>(() => modelState.AddModelError(_testModel, m => m.SubModel.SubValueB, "ShitHappens"));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(InvalidOperationException))]
 		public void ShouldThrowInvalidOperation()
 		{
 			// arrange
 			var modelState = new ModelStateDictionary();
 
 			// act
-			modelState.AddModelError(_testModel, m => m, "ShitHappens");
+			Assert.ThrowsExactly<InvalidOperationException>(() => modelState.AddModelError(_testModel, m => m, "ShitHappens"));
 		}
 
 		internal class TestModel

test/AMWD.Common.AspNetCore.Tests/Extensions/SessionExtensionsTest.cs

@@ -113,8 +113,8 @@ namespace AMWD.Common.AspNetCore.Tests.Extensions
 
 			// assert
 			Assert.IsNotNull(result);
-			Assert.AreEqual(null, result.ValueA);
-			Assert.AreEqual(null, result.ValueB);
+			Assert.IsNull(result.ValueA);
+			Assert.IsNull(result.ValueB);
 		}
 
 		[TestMethod]