Fixes #155

Simplify.Web.Tests target framework set to .NET 5.0

Author: i4004

src/Simplify.Web.Tests/Core/Controllers/ControllersProcessorTests.cs

@@ -19,7 +19,7 @@ namespace Simplify.Web.Tests.Core.Controllers
 	[TestFixture]
 	public class ControllersProcessorTests
 	{
-		private readonly IDictionary<string, object> _routeParameters = new ExpandoObject();
+		private readonly IDictionary<string, object> _routeParameters = new ExpandoObject()!;
 		private ControllersProcessor _processor = null!;
 		private Mock<IControllersAgent> _agent = null!;
 		private Mock<IControllerExecutor> _controllersExecutor = null!;

src/Simplify.Web.Tests/Core/Controllers/Execution/ControllersExecutorTests.cs

@@ -116,7 +116,7 @@ public async Task Process_AsyncControllerHaveRawDataResponse_CreatedDefaultRetur
 			// Assign
 
 			_controllerResponse.Setup(x => x.Process()).Returns(Task.FromResult(ControllerResponseResult.RawOutput));
-			_asyncController.Setup(x => x.Invoke()).Returns(Task.FromResult(_controllerResponse.Object));
+			_asyncController.Setup(x => x.Invoke()).Returns(Task.FromResult(_controllerResponse.Object)!);
 			_controllerFactory.Setup(
 				x =>
 					x.CreateController(It.IsAny<Type>(), It.IsAny<IDIContainerProvider>(), It.IsAny<HttpContext>(),

src/Simplify.Web.Tests/Meta/ControllersMetaDataFactoryTests.cs

@@ -22,7 +22,7 @@ public void CreateControllerMetaData_TestController_PropertiesSetCorrectly()
 			if (metaData.Security == null || metaData.ExecParameters == null || metaData.Role == null)
 				throw new InvalidOperationException();
 
-			var roles = metaData.Security.RequiredUserRoles.ToList();
+			var roles = metaData.Security.RequiredUserRoles!.ToList();
 
 			// Assert
 

src/Simplify.Web.Tests/Modules/Data/FileReaderTests.cs

@@ -83,7 +83,7 @@ public void LoadXDocument_FileExist_Loaded()
 			Assert.AreEqual(
 				XDocument.Parse(
 					"<?xml version=\"1.0\" encoding=\"utf-8\" ?><data>ru data</data>")
-					.Root.OuterXml(), _fileReader.LoadXDocument("Foo.xml")!.Root.OuterXml());
+					.Root!.OuterXml(), _fileReader.LoadXDocument("Foo.xml")!.Root!.OuterXml());
 		}
 
 		[Test]
@@ -93,7 +93,7 @@ public void LoadXDocument_FileNameWithoutExtensionFileExist_Loaded()
 			Assert.AreEqual(
 				XDocument.Parse(
 					"<?xml version=\"1.0\" encoding=\"utf-8\" ?><data>ru data</data>")
-					.Root.OuterXml(), _fileReader.LoadXDocument("Foo")!.Root.OuterXml());
+					.Root!.OuterXml(), _fileReader.LoadXDocument("Foo")!.Root!.OuterXml());
 		}
 
 		[Test]
@@ -102,7 +102,7 @@ public void LoadXDocument_FileNotExistButDefaultFileExist_DefaultFile()
 			// Act & Assert
 			Assert.AreEqual(XDocument.Parse(
 					"<?xml version=\"1.0\" encoding=\"utf-8\" ?><data>en bar data</data>")
-					.Root.OuterXml(), _fileReader.LoadXDocument("Bar.xml")!.Root.OuterXml());
+					.Root!.OuterXml(), _fileReader.LoadXDocument("Bar.xml")!.Root!.OuterXml());
 		}
 
 		[Test]
@@ -124,7 +124,7 @@ public void LoadXDocument_CacheEnabled_SecondTimeFromCache()
 
 			Assert.AreEqual(XDocument.Parse(
 					"<?xml version=\"1.0\" encoding=\"utf-8\" ?><data>ru data</data>")
-					.Root.OuterXml(), result.Root!.OuterXml());
+					.Root!.OuterXml(), result.Root!.OuterXml());
 		}
 
 		[Test]
@@ -146,7 +146,7 @@ public void LoadXDocument_CacheEnabledDefaultFile_DefaultFileFromCache()
 
 			Assert.AreEqual(XDocument.Parse(
 					"<?xml version=\"1.0\" encoding=\"utf-8\" ?><data>en bar data</data>")
-					.Root.OuterXml(), result.Root!.OuterXml());
+					.Root!.OuterXml(), result.Root!.OuterXml());
 		}
 
 		#endregion LoadXDocument

src/Simplify.Web.Tests/Simplify.Web.Tests.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-		<LangVersion>9.0</LangVersion>
+		<TargetFramework>net5.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
 

src/Simplify.Web.Tests/TestEntities/TestController2.cs

@@ -7,7 +7,7 @@ public class TestController2 : AsyncController
 	{
 #pragma warning disable 1998
 
-		public override async Task<ControllerResponse> Invoke()
+		public override async Task<ControllerResponse?> Invoke()
 #pragma warning restore 1998
 		{
 			throw new NotImplementedException();

src/Simplify.Web.Tests/TestEntities/TestController5.cs

@@ -5,6 +5,6 @@ namespace Simplify.Web.Tests.TestEntities
 {
 	public class TestController5 : AsyncController<TestModel>
 	{
-		public override Task<ControllerResponse> Invoke() => throw new NotImplementedException();
+		public override Task<ControllerResponse?> Invoke() => throw new NotImplementedException();
 	}
 }

src/Simplify.Web/AsyncControllerBase.cs

@@ -10,6 +10,6 @@ public abstract class AsyncControllerBase : ControllerBase
 		/// <summary>
 		/// Invokes the controller.
 		/// </summary>
-		public abstract Task<ControllerResponse> Invoke();
+		public abstract Task<ControllerResponse?> Invoke();
 	}
 }

src/Simplify.Web/SyncControllerBase.cs

@@ -8,6 +8,6 @@ public abstract class SyncControllerBase : ControllerBase
 		/// <summary>
 		/// Invokes the controller.
 		/// </summary>
-		public abstract ControllerResponse Invoke();
+		public abstract ControllerResponse? Invoke();
 	}
 }