Adding support for .NET 8.0 LTS, renaming private fields to start with underscore

UnitTests/AspNetCore/Extensions/HttpContextExtensionsTests.cs

@@ -12,30 +12,30 @@ namespace UnitTests.AspNetCore.Extensions
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class HttpContextExtensionsTests
 	{
-		private Mock<ISession> sessionMock;
+		private Mock<ISession> _sessionMock;
 
-		private string tokenFormName;
-		private string tokenHeaderName;
-		private string tokenValue;
+		private string _tokenFormName;
+		private string _tokenHeaderName;
+		private string _tokenValue;
 
-		private Dictionary<string, string> requestHeaders;
-		private Dictionary<string, string> requestQueries;
-		private Dictionary<object, object> items;
+		private Dictionary<string, string> _requestHeaders;
+		private Dictionary<string, string> _requestQueries;
+		private Dictionary<object, object> _items;
 
-		private IPAddress remote;
+		private IPAddress _remote;
 
 		[TestInitialize]
 		public void InitializeTests()
 		{
-			tokenFormName = null;
-			tokenHeaderName = null;
-			tokenValue = null;
+			_tokenFormName = null;
+			_tokenHeaderName = null;
+			_tokenValue = null;
 
-			requestHeaders = new Dictionary<string, string>();
-			requestQueries = new Dictionary<string, string>();
-			items = new Dictionary<object, object>();
+			_requestHeaders = [];
+			_requestQueries = [];
+			_items = [];
 
-			remote = IPAddress.Loopback;
+			_remote = IPAddress.Loopback;
 		}
 
 		#region Antiforgery
@@ -44,9 +44,9 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnAntiforgery()
 		{
 			// arrange
-			tokenFormName = "af-token";
-			tokenHeaderName = "af-header";
-			tokenValue = "security_first";
+			_tokenFormName = "af-token";
+			_tokenHeaderName = "af-header";
+			_tokenValue = "security_first";
 
 			var context = GetContext();
 
@@ -54,18 +54,18 @@ namespace UnitTests.AspNetCore.Extensions
 			var (formName, headerName, value) = context.GetAntiforgeryToken();
 
 			// assert
-			Assert.AreEqual(tokenFormName, formName);
-			Assert.AreEqual(tokenHeaderName, headerName);
-			Assert.AreEqual(tokenValue, value);
+			Assert.AreEqual(_tokenFormName, formName);
+			Assert.AreEqual(_tokenHeaderName, headerName);
+			Assert.AreEqual(_tokenValue, value);
 		}
 
 		[TestMethod]
 		public void ShouldReturnAntiforgeryNullService()
 		{
 			// arrange
-			tokenFormName = "af-token";
-			tokenHeaderName = "af-header";
-			tokenValue = "security_first";
+			_tokenFormName = "af-token";
+			_tokenHeaderName = "af-header";
+			_tokenValue = "security_first";
 
 			var context = GetContext(hasAntiforgery: false);
 
@@ -101,7 +101,7 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnRemoteAddress()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 
 			var context = GetContext();
 
@@ -109,7 +109,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress();
 
 			// assert
-			Assert.AreEqual(remote, result);
+			Assert.AreEqual(_remote, result);
 		}
 
 		[DataTestMethod]
@@ -119,9 +119,9 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnDefaultHeader(string headerName)
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			var header = IPAddress.Parse("5.6.7.8");
-			requestHeaders.Add(headerName, header.ToString());
+			_requestHeaders.Add(headerName, header.ToString());
 
 			var context = GetContext();
 
@@ -129,7 +129,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress();
 
 			// assert
-			Assert.AreNotEqual(remote, result);
+			Assert.AreNotEqual(_remote, result);
 			Assert.AreEqual(header, result);
 		}
 
@@ -137,12 +137,12 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnCustomHeader()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			string headerName = "FooBar";
 			var headerIp = IPAddress.Parse("5.6.7.8");
 
-			requestHeaders.Add(headerName, headerIp.ToString());
-			requestHeaders.Add("X-Forwarded-For", remote.ToString());
+			_requestHeaders.Add(headerName, headerIp.ToString());
+			_requestHeaders.Add("X-Forwarded-For", _remote.ToString());
 
 			var context = GetContext();
 
@@ -150,7 +150,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress(ipHeaderName: headerName);
 
 			// assert
-			Assert.AreNotEqual(remote, result);
+			Assert.AreNotEqual(_remote, result);
 			Assert.AreEqual(headerIp, result);
 		}
 
@@ -158,8 +158,8 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnAddressInvalidHeader()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
-			requestHeaders.Add("X-Forwarded-For", "1.2.3:4");
+			_remote = IPAddress.Parse("1.2.3.4");
+			_requestHeaders.Add("X-Forwarded-For", "1.2.3:4");
 
 			var context = GetContext();
 
@@ -167,16 +167,16 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress();
 
 			// assert
-			Assert.AreEqual(remote, result);
+			Assert.AreEqual(_remote, result);
 		}
 
 		[TestMethod]
 		public void ShouldReturnFirstAddressOnMultipleProxies()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			var header = IPAddress.Parse("5.6.7.8");
-			requestHeaders.Add("X-Forwarded-For", $"{header}, 111.222.111.222");
+			_requestHeaders.Add("X-Forwarded-For", $"{header}, 111.222.111.222");
 
 			var context = GetContext();
 
@@ -184,7 +184,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress();
 
 			// assert
-			Assert.AreNotEqual(remote, result);
+			Assert.AreNotEqual(_remote, result);
 			Assert.AreEqual(header, result);
 		}
 
@@ -192,9 +192,9 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnV4AddressOnMapped()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			var header = IPAddress.Parse("::ffff:127.0.0.1");
-			requestHeaders.Add("X-Forwarded-For", "::ffff:127.0.0.1");
+			_requestHeaders.Add("X-Forwarded-For", "::ffff:127.0.0.1");
 
 			var context = GetContext();
 
@@ -202,7 +202,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var result = context.GetRemoteIpAddress();
 
 			// assert
-			Assert.AreNotEqual(remote, result);
+			Assert.AreNotEqual(_remote, result);
 			Assert.AreNotEqual(header, result);
 			Assert.AreEqual(header.MapToIPv4(), result);
 		}
@@ -215,7 +215,7 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnTrueOnLocal()
 		{
 			// arrange
-			remote = IPAddress.Loopback;
+			_remote = IPAddress.Loopback;
 
 			var context = GetContext();
 
@@ -230,7 +230,7 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnFalseOnRemote()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 
 			var context = GetContext();
 
@@ -245,9 +245,9 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnTrueOnDefaultHeader()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			var headerIp = IPAddress.Loopback;
-			requestHeaders.Add("X-Forwarded-For", headerIp.ToString());
+			_requestHeaders.Add("X-Forwarded-For", headerIp.ToString());
 
 			var context = GetContext();
 
@@ -262,10 +262,10 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldReturnTrueOnCustomHeader()
 		{
 			// arrange
-			remote = IPAddress.Parse("1.2.3.4");
+			_remote = IPAddress.Parse("1.2.3.4");
 			string headerName = "FooBar";
 			var headerIp = IPAddress.Loopback;
-			requestHeaders.Add(headerName, headerIp.ToString());
+			_requestHeaders.Add(headerName, headerIp.ToString());
 
 			var context = GetContext();
 
@@ -281,7 +281,7 @@ namespace UnitTests.AspNetCore.Extensions
 		{
 			// arrange
 			var headerIp = IPAddress.Parse("1.2.3.4");
-			requestHeaders.Add("X-Forwarded-For", headerIp.ToString());
+			_requestHeaders.Add("X-Forwarded-For", headerIp.ToString());
 
 			var context = GetContext();
 
@@ -298,7 +298,7 @@ namespace UnitTests.AspNetCore.Extensions
 			// arrange
 			string headerName = "FooBar";
 			var headerIp = IPAddress.Parse("1.2.3.4");
-			requestHeaders.Add(headerName, headerIp.ToString());
+			_requestHeaders.Add(headerName, headerIp.ToString());
 
 			var context = GetContext();
 
@@ -333,8 +333,8 @@ namespace UnitTests.AspNetCore.Extensions
 			string request = "abc";
 			string query = "def";
 
-			items.Add("OriginalRequest", request);
-			requestQueries.Add("ReturnUrl", query);
+			_items.Add("OriginalRequest", request);
+			_requestQueries.Add("ReturnUrl", query);
 
 			var context = GetContext();
 
@@ -351,7 +351,7 @@ namespace UnitTests.AspNetCore.Extensions
 		{
 			// arrange
 			string query = "def";
-			requestQueries.Add("ReturnUrl", query);
+			_requestQueries.Add("ReturnUrl", query);
 
 			var context = GetContext();
 
@@ -376,7 +376,7 @@ namespace UnitTests.AspNetCore.Extensions
 			context.ClearSession();
 
 			// assert
-			sessionMock.Verify(s => s.Clear(), Times.Once);
+			_sessionMock.Verify(s => s.Clear(), Times.Once);
 		}
 
 		[TestMethod]
@@ -389,7 +389,7 @@ namespace UnitTests.AspNetCore.Extensions
 			context.ClearSession();
 
 			// assert
-			sessionMock.Verify(s => s.Clear(), Times.Never);
+			_sessionMock.Verify(s => s.Clear(), Times.Never);
 		}
 
 		#endregion Session
@@ -398,7 +398,7 @@ namespace UnitTests.AspNetCore.Extensions
 		{
 			// Request
 			var requestHeaderMock = new Mock<IHeaderDictionary>();
-			foreach (var header in requestHeaders)
+			foreach (var header in _requestHeaders)
 			{
 				requestHeaderMock
 					.Setup(h => h.ContainsKey(header.Key))
@@ -409,7 +409,7 @@ namespace UnitTests.AspNetCore.Extensions
 			}
 
 			var requestQueryMock = new Mock<IQueryCollection>();
-			foreach (var query in requestQueries)
+			foreach (var query in _requestQueries)
 			{
 				requestQueryMock
 					.Setup(h => h.ContainsKey(query.Key))
@@ -434,7 +434,7 @@ namespace UnitTests.AspNetCore.Extensions
 				var antiforgeryMock = new Mock<IAntiforgery>();
 				antiforgeryMock
 					.Setup(af => af.GetAndStoreTokens(It.IsAny<HttpContext>()))
-					.Returns(() => string.IsNullOrWhiteSpace(tokenValue) ? null : new AntiforgeryTokenSet(tokenValue, tokenValue, tokenFormName, tokenHeaderName));
+					.Returns(() => string.IsNullOrWhiteSpace(_tokenValue) ? null : new AntiforgeryTokenSet(_tokenValue, _tokenValue, _tokenFormName, _tokenHeaderName));
 
 				requestServicesMock
 					.Setup(rs => rs.GetService(typeof(IAntiforgery)))
@@ -448,10 +448,10 @@ namespace UnitTests.AspNetCore.Extensions
 				.Returns(IPAddress.Loopback);
 			connectionInfoMock
 				.Setup(ci => ci.RemoteIpAddress)
-				.Returns(remote);
+				.Returns(_remote);
 
 			// Session
-			sessionMock = new Mock<ISession>();
+			_sessionMock = new Mock<ISession>();
 
 			var contextMock = new Mock<HttpContext>();
 			contextMock
@@ -465,12 +465,12 @@ namespace UnitTests.AspNetCore.Extensions
 				.Returns(connectionInfoMock.Object);
 			contextMock
 				.Setup(c => c.Items)
-				.Returns(items);
+				.Returns(_items);
 			if (hasSession)
 			{
 				contextMock
 					.Setup(c => c.Session)
-					.Returns(sessionMock.Object);
+					.Returns(_sessionMock.Object);
 			}
 
 			return contextMock.Object;

UnitTests/AspNetCore/Extensions/ModelStateDictionaryExtensionsTests.cs

@@ -9,12 +9,12 @@ namespace UnitTests.AspNetCore.Extensions
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class ModelStateDictionaryExtensionsTests
 	{
-		private TestModel testModel;
+		private TestModel _testModel;
 
 		[TestInitialize]
 		public void InitializeTests()
 		{
-			testModel = new TestModel
+			_testModel = new TestModel
 			{
 				ValueA = "A",
 				ValueB = "B",
@@ -33,7 +33,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var modelState = new ModelStateDictionary();
 
 			// act
-			modelState.AddModelError(testModel, m => m.ValueA, "ShitHappens");
+			modelState.AddModelError(_testModel, m => m.ValueA, "ShitHappens");
 
 			// assert
 			Assert.AreEqual(1, modelState.Count);
@@ -48,7 +48,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var modelState = new ModelStateDictionary();
 
 			// act
-			modelState.AddModelError(testModel, m => m.SubModel.SubValueB, "ShitHappens");
+			modelState.AddModelError(_testModel, m => m.SubModel.SubValueB, "ShitHappens");
 
 			// assert
 			Assert.AreEqual(1, modelState.Count);
@@ -64,7 +64,7 @@ namespace UnitTests.AspNetCore.Extensions
 			ModelStateDictionary modelState = null;
 
 			// act
-			modelState.AddModelError(testModel, m => m.SubModel.SubValueB, "ShitHappens");
+			modelState.AddModelError(_testModel, m => m.SubModel.SubValueB, "ShitHappens");
 		}
 
 		[TestMethod]
@@ -75,7 +75,7 @@ namespace UnitTests.AspNetCore.Extensions
 			var modelState = new ModelStateDictionary();
 
 			// act
-			modelState.AddModelError(testModel, m => m, "ShitHappens");
+			modelState.AddModelError(_testModel, m => m, "ShitHappens");
 		}
 
 		internal class TestModel

UnitTests/AspNetCore/Extensions/SessionExtensionsTests.cs

@@ -10,12 +10,12 @@ namespace UnitTests.AspNetCore.Extensions
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class SessionExtensionsTests
 	{
-		private Mock<ISession> sessionMock;
+		private Mock<ISession> _sessionMock;
 
-		private string sessionKey;
-		private byte[] sessionValue;
+		private string _sessionKey;
+		private byte[] _sessionValue;
 
-		private TestModel model;
+		private TestModel _model;
 
 		internal class TestModel
 		{
@@ -27,10 +27,10 @@ namespace UnitTests.AspNetCore.Extensions
 		[TestInitialize]
 		public void InitializeTests()
 		{
-			sessionKey = null;
-			sessionValue = null;
+			_sessionKey = null;
+			_sessionValue = null;
 
-			model = new TestModel
+			_model = new TestModel
 			{
 				ValueA = "A",
 				ValueB = "B"
@@ -41,7 +41,7 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldCheckKeyExists()
 		{
 			// arrange
-			sessionKey = "exists";
+			_sessionKey = "exists";
 			var session = GetSession();
 
 			// act
@@ -57,25 +57,25 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldGetValue()
 		{
 			// arrange
-			sessionKey = "test";
-			sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model));
+			_sessionKey = "test";
+			_sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(_model));
 			var session = GetSession();
 
 			// act
-			var result = session.GetValue<TestModel>(sessionKey);
+			var result = session.GetValue<TestModel>(_sessionKey);
 
 			// assert
 			Assert.IsNotNull(result);
-			Assert.AreEqual(model.ValueA, result.ValueA);
-			Assert.AreEqual(model.ValueB, result.ValueB);
+			Assert.AreEqual(_model.ValueA, result.ValueA);
+			Assert.AreEqual(_model.ValueB, result.ValueB);
 		}
 
 		[TestMethod]
 		public void ShouldGetNull()
 		{
 			// arrange
-			sessionKey = "foo";
-			sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model));
+			_sessionKey = "foo";
+			_sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(_model));
 			var session = GetSession();
 
 			// act
@@ -89,25 +89,25 @@ namespace UnitTests.AspNetCore.Extensions
 		public void ShouldGetValueWithFallback()
 		{
 			// arrange
-			sessionKey = "test";
-			sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model));
+			_sessionKey = "test";
+			_sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(_model));
 			var session = GetSession();
 
 			// act
-			var result = session.GetValue(sessionKey, new TestModel());
+			var result = session.GetValue(_sessionKey, new TestModel());
 
 			// assert
 			Assert.IsNotNull(result);
-			Assert.AreEqual(model.ValueA, result.ValueA);
-			Assert.AreEqual(model.ValueB, result.ValueB);
+			Assert.AreEqual(_model.ValueA, result.ValueA);
+			Assert.AreEqual(_model.ValueB, result.ValueB);
 		}
 
 		[TestMethod]
 		public void ShouldGetFallback()
 		{
 			// arrange
-			sessionKey = "foo";
-			sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(model));
+			_sessionKey = "foo";
+			_sessionValue = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(_model));
 			var session = GetSession();
 
 			// act
@@ -127,33 +127,33 @@ namespace UnitTests.AspNetCore.Extensions
 			var session = GetSession();
 
 			// act
-			session.SetValue(key, model);
+			session.SetValue(key, _model);
 
 			// arrange
-			Assert.AreEqual(key, sessionKey);
-			Assert.AreEqual(JsonConvert.SerializeObject(model), Encoding.UTF8.GetString(sessionValue));
+			Assert.AreEqual(key, _sessionKey);
+			Assert.AreEqual(JsonConvert.SerializeObject(_model), Encoding.UTF8.GetString(_sessionValue));
 		}
 
 		private ISession GetSession()
 		{
-			string[] keys = new[] { sessionKey };
+			string[] keys = [_sessionKey];
 
-			sessionMock = new Mock<ISession>();
-			sessionMock
-				.Setup(s => s.TryGetValue(It.IsAny<string>(), out sessionValue))
-				.Returns<string, byte[]>((key, value) => sessionKey == key);
-			sessionMock
+			_sessionMock = new Mock<ISession>();
+			_sessionMock
+				.Setup(s => s.TryGetValue(It.IsAny<string>(), out _sessionValue))
+				.Returns<string, byte[]>((key, value) => _sessionKey == key);
+			_sessionMock
 				.Setup(s => s.Set(It.IsAny<string>(), It.IsAny<byte[]>()))
 				.Callback<string, byte[]>((key, value) =>
 				{
-					sessionKey = key;
-					sessionValue = value;
+					_sessionKey = key;
+					_sessionValue = value;
 				});
-			sessionMock
+			_sessionMock
 				.Setup(s => s.Keys)
 				.Returns(keys);
 
-			return sessionMock.Object;
+			return _sessionMock.Object;
 		}
 	}
 }