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

2023-12-29 01:58:40 +01:00
parent 8bd511a936
commit 99d3f7758a
59 changed files with 922 additions and 871 deletions
--- a/UnitTests/AspNetCore/Attributes/BasicAuthenticationAttributeTests.cs
+++ b/UnitTests/AspNetCore/Attributes/BasicAuthenticationAttributeTests.cs
@@ -22,28 +22,28 @@ namespace UnitTests.AspNetCore.Attributes
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class BasicAuthenticationAttributeTests
 	{
-		private Mock<IHeaderDictionary> requestHeaderMock;
-		private Mock<IHeaderDictionary> responseHeaderMock;
+		private Mock<IHeaderDictionary> _requestHeaderMock;
+		private Mock<IHeaderDictionary> _responseHeaderMock;

-		private Mock<HttpRequest> requestMock;
-		private Mock<HttpResponse> responseMock;
+		private Mock<HttpRequest> _requestMock;
+		private Mock<HttpResponse> _responseMock;

-		private Mock<HttpContext> contextMock;
+		private Mock<HttpContext> _contextMock;

-		private Dictionary<string, string> requestHeaders;
-		private string validatorRealm;
-		private ClaimsPrincipal validatorResult;
+		private Dictionary<string, string> _requestHeaders;
+		private string _validatorRealm;
+		private ClaimsPrincipal _validatorResult;

-		private string responseHeaderAuthCallback;
+		private string _responseHeaderAuthCallback;

 		[TestInitialize]
 		public void InitializeTest()
 		{
-			requestHeaders = new Dictionary<string, string>();
-			validatorRealm = null;
-			validatorResult = null;
+			_requestHeaders = [];
+			_validatorRealm = null;
+			_validatorResult = null;

-			responseHeaderAuthCallback = null;
+			_responseHeaderAuthCallback = null;
 		}

 		[TestMethod]
@@ -55,7 +55,7 @@ namespace UnitTests.AspNetCore.Attributes
 				Username = "user",
 				Password = "password"
 			};
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");

 			var context = GetContext();

@@ -64,7 +64,7 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.IsTrue(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
+			Assert.IsTrue(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
 		}

 		[TestMethod]
@@ -72,8 +72,8 @@ namespace UnitTests.AspNetCore.Attributes
 		{
 			// arrange
 			var attribute = new BasicAuthenticationAttribute();
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
-			validatorResult = new ClaimsPrincipal();
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
+			_validatorResult = new ClaimsPrincipal();

 			var context = GetContext(hasValidator: true);

@@ -82,7 +82,7 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.IsTrue(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
+			Assert.IsTrue(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
 		}

 		[TestMethod]
@@ -101,7 +101,7 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.IsTrue(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
+			Assert.IsTrue(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
 		}

 		[TestMethod]
@@ -123,8 +123,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
@@ -147,8 +147,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic realm=\"re:alm\"", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic realm=\"re:alm\"", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
@@ -160,7 +160,7 @@ namespace UnitTests.AspNetCore.Attributes
 				Username = "user",
 				Password = "password"
 			};
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}a:{attribute.Password}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}a:{attribute.Password}"))}");
 			var context = GetContext();

 			// act
@@ -171,8 +171,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
@@ -184,7 +184,7 @@ namespace UnitTests.AspNetCore.Attributes
 				Username = "user",
 				Password = "password"
 			};
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}a"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}a"))}");
 			var context = GetContext();

 			// act
@@ -195,8 +195,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
@@ -207,7 +207,7 @@ namespace UnitTests.AspNetCore.Attributes
 			{
 				Realm = "attribute"
 			};
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
 			var context = GetContext(hasValidator: true);

 			// act
@@ -218,17 +218,17 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic realm=\"attribute\"", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic realm=\"attribute\"", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
 		public async Task ShouldAskOnValidatorWithRealmOnValidator()
 		{
 			// arrange
-			validatorRealm = "validator";
+			_validatorRealm = "validator";
 			var attribute = new BasicAuthenticationAttribute();
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}:{attribute.Password}"))}");
 			var context = GetContext(hasValidator: true);

 			// act
@@ -239,8 +239,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(401, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.IsFalse(string.IsNullOrWhiteSpace(responseHeaderAuthCallback));
-			Assert.AreEqual("Basic realm=\"validator\"", responseHeaderAuthCallback);
+			Assert.IsFalse(string.IsNullOrWhiteSpace(_responseHeaderAuthCallback));
+			Assert.AreEqual("Basic realm=\"validator\"", _responseHeaderAuthCallback);
 		}

 		[TestMethod]
@@ -248,7 +248,7 @@ namespace UnitTests.AspNetCore.Attributes
 		{
 			// arrange
 			var attribute = new BasicAuthenticationAttribute();
-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{attribute.Username}"))}");
 			var context = GetContext();

 			// act
@@ -262,34 +262,38 @@ namespace UnitTests.AspNetCore.Attributes

 		private AuthorizationFilterContext GetContext(bool isAnonymousAllowed = false, bool hasValidator = false)
 		{
-			requestHeaderMock = new Mock<IHeaderDictionary>();
-			foreach (var header in requestHeaders)
+			_requestHeaderMock = new Mock<IHeaderDictionary>();
+			foreach (var header in _requestHeaders)
 			{
-				requestHeaderMock
+				StringValues outVal = header.Value;
+				_requestHeaderMock
 					.Setup(h => h.ContainsKey(header.Key))
 					.Returns(true);
-				requestHeaderMock
+				_requestHeaderMock
 					.Setup(h => h[header.Key])
 					.Returns(header.Value);
+				_requestHeaderMock
+					.Setup(h => h.TryGetValue(header.Key, out outVal))
+					.Returns(true);
 			}

-			responseHeaderMock = new Mock<IHeaderDictionary>();
-			responseHeaderMock
-				.SetupSet(h => h["WWW-Authenticate"] = It.IsAny<StringValues>())
-				.Callback<string, StringValues>((key, value) =>
+			_responseHeaderMock = new Mock<IHeaderDictionary>();
+			_responseHeaderMock
+				.SetupSet(h => h.WWWAuthenticate = It.IsAny<StringValues>())
+				.Callback<StringValues>((value) =>
 				{
-					responseHeaderAuthCallback = value;
+					_responseHeaderAuthCallback = value;
 				});

-			requestMock = new Mock<HttpRequest>();
-			requestMock
+			_requestMock = new Mock<HttpRequest>();
+			_requestMock
 				.Setup(r => r.Headers)
-				.Returns(requestHeaderMock.Object);
+				.Returns(_requestHeaderMock.Object);

-			responseMock = new Mock<HttpResponse>();
-			responseMock
+			_responseMock = new Mock<HttpResponse>();
+			_responseMock
 				.Setup(r => r.Headers)
-				.Returns(responseHeaderMock.Object);
+				.Returns(_responseHeaderMock.Object);

 			var requestServicesMock = new Mock<IServiceProvider>();

@@ -298,10 +302,10 @@ namespace UnitTests.AspNetCore.Attributes
 				var validatorMock = new Mock<IBasicAuthenticationValidator>();
 				validatorMock
 					.Setup(v => v.Realm)
-					.Returns(validatorRealm);
+					.Returns(_validatorRealm);
 				validatorMock
 					.Setup(v => v.ValidateAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IPAddress>(), It.IsAny<CancellationToken>()))
-					.ReturnsAsync(validatorResult);
+					.ReturnsAsync(_validatorResult);

 				requestServicesMock
 					.Setup(rs => rs.GetService(typeof(IBasicAuthenticationValidator)))
@@ -313,20 +317,20 @@ namespace UnitTests.AspNetCore.Attributes
 				.Setup(ci => ci.RemoteIpAddress)
 				.Returns(IPAddress.Loopback);

-			contextMock = new Mock<HttpContext>();
-			contextMock
+			_contextMock = new Mock<HttpContext>();
+			_contextMock
 				.Setup(c => c.Request)
-				.Returns(requestMock.Object);
-			contextMock
+				.Returns(_requestMock.Object);
+			_contextMock
 				.Setup(c => c.Response)
-				.Returns(responseMock.Object);
-			contextMock
+				.Returns(_responseMock.Object);
+			_contextMock
 				.Setup(c => c.RequestServices)
 				.Returns(requestServicesMock.Object);
-			contextMock
+			_contextMock
 				.Setup(c => c.Connection)
 				.Returns(connectionInfoMock.Object);
-			contextMock
+			_contextMock
 				.Setup(c => c.RequestAborted)
 				.Returns(CancellationToken.None);

@@ -341,7 +345,7 @@ namespace UnitTests.AspNetCore.Attributes

 			return new AuthorizationFilterContext(new ActionContext
 			{
-				HttpContext = contextMock.Object,
+				HttpContext = _contextMock.Object,
 				RouteData = routeDataMock.Object,
 				ActionDescriptor = actionDescriptor,
 			}, new List<IFilterMetadata>());
--- a/UnitTests/AspNetCore/Attributes/IPAllowListAttributeTests.cs
+++ b/UnitTests/AspNetCore/Attributes/IPAllowListAttributeTests.cs
@@ -16,20 +16,20 @@ namespace UnitTests.AspNetCore.Attributes
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class IPAllowListAttributeTests
 	{
-		private Dictionary<string, string> requestHeaders;
-		private Dictionary<object, object> itemsCallback;
-		private string configKey;
-		private bool configExists;
-		private List<string> allowedIpsConfig;
+		private Dictionary<string, string> _requestHeaders;
+		private Dictionary<object, object> _itemsCallback;
+		private string _configKey;
+		private bool _configExists;
+		private List<string> _allowedIpsConfig;

 		[TestInitialize]
 		public void InitializeTest()
 		{
-			requestHeaders = new Dictionary<string, string>();
-			itemsCallback = new Dictionary<object, object>();
-			configKey = null;
-			configExists = false;
-			allowedIpsConfig = new List<string>();
+			_requestHeaders = [];
+			_itemsCallback = [];
+			_configKey = null;
+			_configExists = false;
+			_allowedIpsConfig = [];
 		}

 		[TestMethod]
@@ -48,8 +48,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -71,8 +71,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -87,8 +87,8 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -109,8 +109,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[DataTestMethod]
@@ -142,22 +142,22 @@ namespace UnitTests.AspNetCore.Attributes
 				Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);
 			}

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldAllowLocalAccessConfig()
 		{
 			// arrange
-			configKey = "White:List";
-			configExists = true;
-			allowedIpsConfig.Add("127.0.0.0/8");
-			allowedIpsConfig.Add("192.168.178.10");
+			_configKey = "White:List";
+			_configExists = true;
+			_allowedIpsConfig.Add("127.0.0.0/8");
+			_allowedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPAllowListAttribute
 			{
 				AllowLocalAccess = true,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -166,22 +166,22 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldDenyLocalAccessConfig()
 		{
 			// arrange
-			configKey = "White:List";
-			configExists = true;
-			allowedIpsConfig.Add("");
-			allowedIpsConfig.Add("192.168.178.10");
+			_configKey = "White:List";
+			_configExists = true;
+			_allowedIpsConfig.Add("");
+			_allowedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPAllowListAttribute
 			{
 				AllowLocalAccess = false,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -193,8 +193,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[DataTestMethod]
@@ -203,13 +203,13 @@ namespace UnitTests.AspNetCore.Attributes
 		public void ShouldAllowSpecificAddressConfig(string address)
 		{
 			// arrange
-			configKey = "White:List";
-			configExists = true;
-			allowedIpsConfig.Add("192.168.178.10");
+			_configKey = "White:List";
+			_configExists = true;
+			_allowedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPAllowListAttribute
 			{
 				AllowLocalAccess = false,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var remote = IPAddress.Parse(address);
 			var context = GetContext(remote);
@@ -229,20 +229,20 @@ namespace UnitTests.AspNetCore.Attributes
 				Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);
 			}

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldDenyOnMissingConfiguration()
 		{
 			// arrange
-			configKey = "White:List";
-			configExists = false;
+			_configKey = "White:List";
+			_configExists = false;
 			var attribute = new IPAllowListAttribute
 			{
 				AllowLocalAccess = false,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -254,14 +254,14 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		private ActionExecutingContext GetContext(IPAddress remote = null)
 		{
 			var requestHeaderMock = new Mock<IHeaderDictionary>();
-			foreach (var header in requestHeaders)
+			foreach (var header in _requestHeaders)
 			{
 				requestHeaderMock
 					.Setup(h => h.ContainsKey(header.Key))
@@ -287,11 +287,11 @@ namespace UnitTests.AspNetCore.Attributes
 			var itemsMock = new Mock<IDictionary<object, object>>();
 			itemsMock
 				.SetupSet(i => i[It.IsAny<object>()] = It.IsAny<object>())
-				.Callback<object, object>((key, val) => itemsCallback.Add(key, val));
+				.Callback<object, object>((key, val) => _itemsCallback.Add(key, val));

 			var configurationMock = new Mock<IConfiguration>();
 			var children = new List<IConfigurationSection>();
-			foreach (string ipAddress in allowedIpsConfig)
+			foreach (string ipAddress in _allowedIpsConfig)
 			{
 				var csm = new Mock<IConfigurationSection>();
 				csm.Setup(cs => cs.Value).Returns(ipAddress);
@@ -305,8 +305,8 @@ namespace UnitTests.AspNetCore.Attributes
 				.Returns(children);

 			configurationMock
-				.Setup(c => c.GetSection(configKey))
-				.Returns(configExists ? configSectionMock.Object : null);
+				.Setup(c => c.GetSection(_configKey))
+				.Returns(_configExists ? configSectionMock.Object : null);

 			var requestServicesMock = new Mock<IServiceProvider>();
 			requestServicesMock
--- a/UnitTests/AspNetCore/Attributes/IPBlockListAttributeTests.cs
+++ b/UnitTests/AspNetCore/Attributes/IPBlockListAttributeTests.cs
@@ -16,20 +16,20 @@ namespace UnitTests.AspNetCore.Attributes
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class IPBlockListAttributeTests
 	{
-		private Dictionary<string, string> requestHeaders;
-		private Dictionary<object, object> itemsCallback;
-		private string configKey;
-		private bool configExists;
-		private List<string> restrictedIpsConfig;
+		private Dictionary<string, string> _requestHeaders;
+		private Dictionary<object, object> _itemsCallback;
+		private string _configKey;
+		private bool _configExists;
+		private List<string> _restrictedIpsConfig;

 		[TestInitialize]
 		public void InitializeTest()
 		{
-			requestHeaders = new Dictionary<string, string>();
-			itemsCallback = new Dictionary<object, object>();
-			configKey = null;
-			configExists = false;
-			restrictedIpsConfig = new List<string>();
+			_requestHeaders = [];
+			_itemsCallback = [];
+			_configKey = null;
+			_configExists = false;
+			_restrictedIpsConfig = [];
 		}

 		[TestMethod]
@@ -45,8 +45,8 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -65,8 +65,8 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -85,8 +85,8 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
@@ -108,8 +108,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[DataTestMethod]
@@ -141,22 +141,22 @@ namespace UnitTests.AspNetCore.Attributes
 				Assert.IsNull(context.Result);
 			}

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldAllowLocalAccessConfig()
 		{
 			// arrange
-			configKey = "Black:List";
-			configExists = true;
-			restrictedIpsConfig.Add("127.0.0.0/8");
-			restrictedIpsConfig.Add("192.168.178.10");
+			_configKey = "Black:List";
+			_configExists = true;
+			_restrictedIpsConfig.Add("127.0.0.0/8");
+			_restrictedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPBlockListAttribute
 			{
 				BlockLocalAccess = false,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -165,23 +165,23 @@ namespace UnitTests.AspNetCore.Attributes

 			// assert
 			Assert.IsNull(context.Result);
-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldBlockLocalAccessConfig()
 		{
 			// arrange
-			configKey = "Black:List";
-			configExists = true;
-			restrictedIpsConfig.Add("");
-			restrictedIpsConfig.Add("127.0.0.0/8");
-			restrictedIpsConfig.Add("192.168.178.10");
+			_configKey = "Black:List";
+			_configExists = true;
+			_restrictedIpsConfig.Add("");
+			_restrictedIpsConfig.Add("127.0.0.0/8");
+			_restrictedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPBlockListAttribute
 			{
 				BlockLocalAccess = true,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -193,8 +193,8 @@ namespace UnitTests.AspNetCore.Attributes
 			Assert.IsTrue(context.Result is StatusCodeResult);
 			Assert.AreEqual(403, ((StatusCodeResult)context.Result).StatusCode);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		[DataTestMethod]
@@ -203,14 +203,14 @@ namespace UnitTests.AspNetCore.Attributes
 		public void ShouldBlockSpecificAddressConfig(string address)
 		{
 			// arrange
-			configKey = "Black:List";
-			configExists = true;
-			restrictedIpsConfig.Add("127.0.0.0/8");
-			restrictedIpsConfig.Add("192.168.178.10");
+			_configKey = "Black:List";
+			_configExists = true;
+			_restrictedIpsConfig.Add("127.0.0.0/8");
+			_restrictedIpsConfig.Add("192.168.178.10");
 			var attribute = new IPBlockListAttribute
 			{
 				BlockLocalAccess = true,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var remote = IPAddress.Parse(address);
 			var context = GetContext(remote);
@@ -230,20 +230,20 @@ namespace UnitTests.AspNetCore.Attributes
 				Assert.IsNull(context.Result);
 			}

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(remote, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(remote, _itemsCallback["RemoteAddress"]);
 		}

 		[TestMethod]
 		public void ShouldAllowOnMissingConfiguration()
 		{
 			// arrange
-			configKey = "Black:List";
-			configExists = false;
+			_configKey = "Black:List";
+			_configExists = false;
 			var attribute = new IPBlockListAttribute
 			{
 				BlockLocalAccess = true,
-				ConfigurationKey = configKey
+				ConfigurationKey = _configKey
 			};
 			var context = GetContext();

@@ -253,14 +253,14 @@ namespace UnitTests.AspNetCore.Attributes
 			// assert
 			Assert.IsNull(context.Result);

-			Assert.AreEqual(1, itemsCallback.Count);
-			Assert.AreEqual(IPAddress.Loopback, itemsCallback["RemoteAddress"]);
+			Assert.AreEqual(1, _itemsCallback.Count);
+			Assert.AreEqual(IPAddress.Loopback, _itemsCallback["RemoteAddress"]);
 		}

 		private ActionExecutingContext GetContext(IPAddress remote = null)
 		{
 			var requestHeaderMock = new Mock<IHeaderDictionary>();
-			foreach (var header in requestHeaders)
+			foreach (var header in _requestHeaders)
 			{
 				requestHeaderMock
 					.Setup(h => h.ContainsKey(header.Key))
@@ -286,11 +286,11 @@ namespace UnitTests.AspNetCore.Attributes
 			var itemsMock = new Mock<IDictionary<object, object>>();
 			itemsMock
 				.SetupSet(i => i[It.IsAny<object>()] = It.IsAny<object>())
-				.Callback<object, object>((key, val) => itemsCallback.Add(key, val));
+				.Callback<object, object>((key, val) => _itemsCallback.Add(key, val));

 			var configurationMock = new Mock<IConfiguration>();
 			var children = new List<IConfigurationSection>();
-			foreach (string ipAddress in restrictedIpsConfig)
+			foreach (string ipAddress in _restrictedIpsConfig)
 			{
 				var csm = new Mock<IConfigurationSection>();
 				csm.Setup(cs => cs.Value).Returns(ipAddress);
@@ -304,8 +304,8 @@ namespace UnitTests.AspNetCore.Attributes
 				.Returns(children);

 			configurationMock
-				.Setup(c => c.GetSection(configKey))
-				.Returns(configExists ? configSectionMock.Object : null);
+				.Setup(c => c.GetSection(_configKey))
+				.Returns(_configExists ? configSectionMock.Object : null);

 			var requestServicesMock = new Mock<IServiceProvider>();
 			requestServicesMock
--- a/UnitTests/AspNetCore/Extensions/HttpContextExtensionsTests.cs
+++ b/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;
--- a/UnitTests/AspNetCore/Extensions/ModelStateDictionaryExtensionsTests.cs
+++ b/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
--- a/UnitTests/AspNetCore/Extensions/SessionExtensionsTests.cs
+++ b/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;
 		}
 	}
 }
--- a/UnitTests/AspNetCore/Security/BasicAuthentication/BasicAuthenticationMiddlewareTests.cs
+++ b/UnitTests/AspNetCore/Security/BasicAuthentication/BasicAuthenticationMiddlewareTests.cs
@@ -18,26 +18,26 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class BasicAuthenticationMiddlewareTests
 	{
-		private Dictionary<string, string> requestHeaders;
+		private Dictionary<string, string> _requestHeaders;

-		private Dictionary<string, string> responseHeadersCallback;
-		private int responseStatusCodeCallback;
+		private Dictionary<string, string> _responseHeadersCallback;
+		private int _responseStatusCodeCallback;

-		private string validatorRealm;
-		private ClaimsPrincipal validatorResponse;
-		private List<(string username, string password, IPAddress ipAddr)> validatorCallback;
+		private string _validatorRealm;
+		private ClaimsPrincipal _validatorResponse;
+		private List<(string username, string password, IPAddress ipAddr)> _validatorCallback;

 		[TestInitialize]
 		public void InitializeTests()
 		{
-			requestHeaders = new Dictionary<string, string>();
+			_requestHeaders = [];

-			responseHeadersCallback = new Dictionary<string, string>();
-			responseStatusCodeCallback = 0;
+			_responseHeadersCallback = [];
+			_responseStatusCodeCallback = 0;

-			validatorRealm = null;
-			validatorResponse = null;
-			validatorCallback = new List<(string username, string password, IPAddress ipAddr)>();
+			_validatorRealm = null;
+			_validatorResponse = null;
+			_validatorCallback = [];
 		}

 		[TestMethod]
@@ -47,8 +47,8 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			string username = "user";
 			string password = "pass:word";

-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"))}");
-			validatorResponse = new ClaimsPrincipal();
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"))}");
+			_validatorResponse = new ClaimsPrincipal();

 			var middleware = GetMiddleware();
 			var context = GetContext();
@@ -57,13 +57,13 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			await middleware.InvokeAsync(context);

 			// assert
-			Assert.AreEqual(0, responseStatusCodeCallback); // not triggered
-			Assert.AreEqual(0, responseHeadersCallback.Count);
-			Assert.AreEqual(1, validatorCallback.Count);
+			Assert.AreEqual(0, _responseStatusCodeCallback); // not triggered
+			Assert.AreEqual(0, _responseHeadersCallback.Count);
+			Assert.AreEqual(1, _validatorCallback.Count);

-			Assert.AreEqual(username, validatorCallback.First().username);
-			Assert.AreEqual(password, validatorCallback.First().password);
-			Assert.AreEqual(IPAddress.Loopback, validatorCallback.First().ipAddr);
+			Assert.AreEqual(username, _validatorCallback.First().username);
+			Assert.AreEqual(password, _validatorCallback.First().password);
+			Assert.AreEqual(IPAddress.Loopback, _validatorCallback.First().ipAddr);
 		}

 		[TestMethod]
@@ -77,13 +77,13 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			await middleware.InvokeAsync(context);

 			// assert
-			Assert.AreEqual(401, responseStatusCodeCallback);
+			Assert.AreEqual(401, _responseStatusCodeCallback);

-			Assert.AreEqual(0, validatorCallback.Count);
+			Assert.AreEqual(0, _validatorCallback.Count);

-			Assert.AreEqual(1, responseHeadersCallback.Count);
-			Assert.AreEqual("WWW-Authenticate", responseHeadersCallback.Keys.First());
-			Assert.AreEqual("Basic", responseHeadersCallback.Values.First());
+			Assert.AreEqual(1, _responseHeadersCallback.Count);
+			Assert.AreEqual("WWW-Authenticate", _responseHeadersCallback.Keys.First());
+			Assert.AreEqual("Basic", _responseHeadersCallback.Values.First());
 		}

 		[TestMethod]
@@ -93,10 +93,10 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			string username = "user";
 			string password = "pw";

-			validatorRealm = "TEST";
+			_validatorRealm = "TEST";
 			var remote = IPAddress.Parse("1.2.3.4");

-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}:{password}"))}");

 			var middleware = GetMiddleware();
 			var context = GetContext(remote);
@@ -105,16 +105,16 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			await middleware.InvokeAsync(context);

 			// assert
-			Assert.AreEqual(401, responseStatusCodeCallback);
+			Assert.AreEqual(401, _responseStatusCodeCallback);

-			Assert.AreEqual(1, responseHeadersCallback.Count);
-			Assert.AreEqual("WWW-Authenticate", responseHeadersCallback.Keys.First());
-			Assert.AreEqual($"Basic realm=\"{validatorRealm}\"", responseHeadersCallback.Values.First());
+			Assert.AreEqual(1, _responseHeadersCallback.Count);
+			Assert.AreEqual("WWW-Authenticate", _responseHeadersCallback.Keys.First());
+			Assert.AreEqual($"Basic realm=\"{_validatorRealm}\"", _responseHeadersCallback.Values.First());

-			Assert.AreEqual(1, validatorCallback.Count);
-			Assert.AreEqual(username, validatorCallback.First().username);
-			Assert.AreEqual(password, validatorCallback.First().password);
-			Assert.AreEqual(remote, validatorCallback.First().ipAddr);
+			Assert.AreEqual(1, _validatorCallback.Count);
+			Assert.AreEqual(username, _validatorCallback.First().username);
+			Assert.AreEqual(password, _validatorCallback.First().password);
+			Assert.AreEqual(remote, _validatorCallback.First().ipAddr);
 		}

 		[TestMethod]
@@ -123,7 +123,7 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			// arrange
 			string username = "user";

-			requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}"))}");
+			_requestHeaders.Add("Authorization", $"Basic {Convert.ToBase64String(Encoding.UTF8.GetBytes($"{username}"))}");

 			var middleware = GetMiddleware();
 			var context = GetContext();
@@ -132,7 +132,7 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			await middleware.InvokeAsync(context);

 			// assert
-			Assert.AreEqual(500, responseStatusCodeCallback);
+			Assert.AreEqual(500, _responseStatusCodeCallback);
 		}

 		private BasicAuthenticationMiddleware GetMiddleware()
@@ -141,11 +141,11 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			var validatorMock = new Mock<IBasicAuthenticationValidator>();
 			validatorMock
 				.Setup(v => v.Realm)
-				.Returns(validatorRealm);
+				.Returns(_validatorRealm);
 			validatorMock
 				.Setup(v => v.ValidateAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IPAddress>(), It.IsAny<CancellationToken>()))
-				.Callback<string, string, IPAddress, CancellationToken>((username, password, ipAddress, _) => validatorCallback.Add((username, password, ipAddress)))
-				.ReturnsAsync(validatorResponse);
+				.Callback<string, string, IPAddress, CancellationToken>((username, password, ipAddress, _) => _validatorCallback.Add((username, password, ipAddress)))
+				.ReturnsAsync(_validatorResponse);

 			return new BasicAuthenticationMiddleware(nextMock.Object, validatorMock.Object);
 		}
@@ -154,7 +154,7 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 		{
 			// Request
 			var requestHeaderMock = new Mock<IHeaderDictionary>();
-			foreach (var header in requestHeaders)
+			foreach (var header in _requestHeaders)
 			{
 				requestHeaderMock
 					.Setup(h => h.ContainsKey(header.Key))
@@ -173,7 +173,7 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 			var responseHeaderMock = new Mock<IHeaderDictionary>();
 			responseHeaderMock
 				.SetupSet(h => h[It.IsAny<string>()] = It.IsAny<StringValues>())
-				.Callback<string, StringValues>((key, value) => responseHeadersCallback[key] = value);
+				.Callback<string, StringValues>((key, value) => _responseHeadersCallback[key] = value);

 			var responseMock = new Mock<HttpResponse>();
 			responseMock
@@ -181,7 +181,7 @@ namespace UnitTests.AspNetCore.Security.BasicAuthentication
 				.Returns(responseHeaderMock.Object);
 			responseMock
 				.SetupSet(r => r.StatusCode = It.IsAny<int>())
-				.Callback<int>((code) => responseStatusCodeCallback = code);
+				.Callback<int>((code) => _responseStatusCodeCallback = code);

 			// Connection
 			var connectionInfoMock = new Mock<ConnectionInfo>();
--- a/UnitTests/AspNetCore/Security/PathProtection/ProtectedPathMiddlewareTests.cs
+++ b/UnitTests/AspNetCore/Security/PathProtection/ProtectedPathMiddlewareTests.cs
@@ -14,17 +14,17 @@ namespace UnitTests.AspNetCore.Security.PathProtection
 	[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
 	public class ProtectedPathMiddlewareTests
 	{
-		private Mock<RequestDelegate> nextMock;
-		private Mock<HttpContext> httpContextMock;
-		private Mock<IAuthorizationService> authorizationServiceMock;
-		private Mock<IAuthenticationService> authenticationServiceMock;
+		private Mock<RequestDelegate> _nextMock;
+		private Mock<HttpContext> _httpContextMock;
+		private Mock<IAuthorizationService> _authorizationServiceMock;
+		private Mock<IAuthenticationService> _authenticationServiceMock;

-		private ProtectedPathOptions options;
+		private ProtectedPathOptions _options;

 		[TestInitialize]
 		public void InitializeTest()
 		{
-			options = new ProtectedPathOptions
+			_options = new ProtectedPathOptions
 			{
 				Path = "/secure/protected",
 				PolicyName = "Protection"
@@ -36,21 +36,21 @@ namespace UnitTests.AspNetCore.Security.PathProtection
 		{
 			// arrange
 			var middleware = GetMiddleware();
-			var context = GetHttpContext(options.Path);
+			var context = GetHttpContext(_options.Path);
 			var auth = GetAuthService(true);

 			// act
 			await middleware.InvokeAsync(context, auth);

 			// assert
-			authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), options.PolicyName), Times.Once);
-			authorizationServiceMock.VerifyNoOtherCalls();
+			_authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), _options.PolicyName), Times.Once);
+			_authorizationServiceMock.VerifyNoOtherCalls();

-			authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Never);
-			authenticationServiceMock.VerifyNoOtherCalls();
+			_authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Never);
+			_authenticationServiceMock.VerifyNoOtherCalls();

-			nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Once);
-			nextMock.VerifyNoOtherCalls();
+			_nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Once);
+			_nextMock.VerifyNoOtherCalls();
 		}

 		[TestMethod]
@@ -65,14 +65,14 @@ namespace UnitTests.AspNetCore.Security.PathProtection
 			await middleware.InvokeAsync(context, auth);

 			// assert
-			authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), options.PolicyName), Times.Never);
-			authorizationServiceMock.VerifyNoOtherCalls();
+			_authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), _options.PolicyName), Times.Never);
+			_authorizationServiceMock.VerifyNoOtherCalls();

-			authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Never);
-			authenticationServiceMock.VerifyNoOtherCalls();
+			_authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Never);
+			_authenticationServiceMock.VerifyNoOtherCalls();

-			nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Once);
-			nextMock.VerifyNoOtherCalls();
+			_nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Once);
+			_nextMock.VerifyNoOtherCalls();
 		}

 		[TestMethod]
@@ -80,27 +80,27 @@ namespace UnitTests.AspNetCore.Security.PathProtection
 		{
 			// arrange
 			var middleware = GetMiddleware();
-			var context = GetHttpContext(options.Path);
+			var context = GetHttpContext(_options.Path);
 			var auth = GetAuthService(false);

 			// act
 			await middleware.InvokeAsync(context, auth);

 			// assert
-			authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), options.PolicyName), Times.Once);
-			authorizationServiceMock.VerifyNoOtherCalls();
+			_authorizationServiceMock.Verify(s => s.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), _options.PolicyName), Times.Once);
+			_authorizationServiceMock.VerifyNoOtherCalls();

-			authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Once);
-			authenticationServiceMock.VerifyNoOtherCalls();
+			_authenticationServiceMock.Verify(s => s.ChallengeAsync(It.IsAny<HttpContext>(), It.IsAny<string>(), It.IsAny<AuthenticationProperties>()), Times.Once);
+			_authenticationServiceMock.VerifyNoOtherCalls();

-			nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Never);
-			nextMock.VerifyNoOtherCalls();
+			_nextMock.Verify(n => n.Invoke(It.IsAny<HttpContext>()), Times.Never);
+			_nextMock.VerifyNoOtherCalls();
 		}

 		private ProtectedPathMiddleware GetMiddleware()
 		{
-			nextMock = new Mock<RequestDelegate>();
-			return new ProtectedPathMiddleware(nextMock.Object, options);
+			_nextMock = new Mock<RequestDelegate>();
+			return new ProtectedPathMiddleware(_nextMock.Object, _options);
 		}

 		private HttpContext GetHttpContext(string requestPath)
@@ -110,32 +110,32 @@ namespace UnitTests.AspNetCore.Security.PathProtection
 				.Setup(r => r.Path)
 				.Returns(new PathString(requestPath));

-			authenticationServiceMock = new Mock<IAuthenticationService>();
+			_authenticationServiceMock = new Mock<IAuthenticationService>();

 			var requestServicesMock = new Mock<IServiceProvider>();
 			requestServicesMock
 				.Setup(s => s.GetService(typeof(IAuthenticationService)))
-				.Returns(authenticationServiceMock.Object);
+				.Returns(_authenticationServiceMock.Object);

-			httpContextMock = new Mock<HttpContext>();
-			httpContextMock
+			_httpContextMock = new Mock<HttpContext>();
+			_httpContextMock
 				.Setup(c => c.Request)
 				.Returns(requestMock.Object);
-			httpContextMock
+			_httpContextMock
 				.Setup(c => c.RequestServices)
 				.Returns(requestServicesMock.Object);

-			return httpContextMock.Object;
+			return _httpContextMock.Object;
 		}

 		private IAuthorizationService GetAuthService(bool success)
 		{
-			authorizationServiceMock = new Mock<IAuthorizationService>();
-			authorizationServiceMock
+			_authorizationServiceMock = new Mock<IAuthorizationService>();
+			_authorizationServiceMock
 				.Setup(service => service.AuthorizeAsync(It.IsAny<ClaimsPrincipal>(), It.IsAny<object>(), It.IsAny<string>()))
 				.ReturnsAsync(() => success ? AuthorizationResult.Success() : AuthorizationResult.Failed());

-			return authorizationServiceMock.Object;
+			return _authorizationServiceMock.Object;
 		}
 	}
 }
--- a/UnitTests/AspNetCore/Utilities/PasswordHelperTests.cs
+++ b/UnitTests/AspNetCore/Utilities/PasswordHelperTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
+using System.Reflection;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.VisualStudio.TestTools.UnitTesting;