[r] latest C#

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+	"cSpell.words": [
+		"cref",
+		"registrator"
+	]
+}

src/Simplify.Web.Multipart/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.4.5] - 2022-05-18
+
+### Added
+
+- Explicit .NET 6 targeting
+
+### Dependencies
+
+- Simplify.Web bump to 4.6 (PR#36)
+
 ## [1.4.4] - 2022-03-13
 
 ### Dependencies

src/Simplify.Web.Multipart/Model/Binding/HttpMultipartFormModelBinder.cs

@@ -3,38 +3,37 @@
 using HttpMultipartParser;
 using Simplify.Web.Model.Binding;
 
-namespace Simplify.Web.Multipart.Model.Binding
+namespace Simplify.Web.Multipart.Model.Binding;
+
+/// <summary>
+/// Provides form multipart data to object binding
+/// </summary>
+/// <seealso cref="IModelBinder" />
+public class HttpMultipartFormModelBinder : IModelBinder
 {
 	/// <summary>
-	/// Provides form multipart data to object binding
+	/// Binds the model.
 	/// </summary>
-	/// <seealso cref="IModelBinder" />
-	public class HttpMultipartFormModelBinder : IModelBinder
+	/// <typeparam name="T">Model type</typeparam>
+	/// <param name="args">The <see cref="ModelBinderEventArgs{T}" /> instance containing the event data.</param>
+	public async Task BindAsync<T>(ModelBinderEventArgs<T> args)
 	{
-		/// <summary>
-		/// Binds the model.
-		/// </summary>
-		/// <typeparam name="T">Model type</typeparam>
-		/// <param name="args">The <see cref="ModelBinderEventArgs{T}" /> instance containing the event data.</param>
-		public async Task BindAsync<T>(ModelBinderEventArgs<T> args)
-		{
-			if (!args.Context.Request.ContentType.Contains("multipart/form-data"))
-				return;
+		if (!args.Context.Request.ContentType.Contains("multipart/form-data"))
+			return;
 
-			var multipartModelType = typeof(MultipartViewModel);
+		var multipartModelType = typeof(MultipartViewModel);
 
-			if (typeof(T) != multipartModelType)
-				throw new ModelBindingException("For HTTP multipart form data model type should be: " + multipartModelType.Name);
+		if (typeof(T) != multipartModelType)
+			throw new ModelBindingException("For HTTP multipart form data model type should be: " + multipartModelType.Name);
 
-			var parser = await MultipartFormDataParser.ParseAsync(args.Context.Request.Body);
-			var obj = Activator.CreateInstance<T>();
+		var parser = await MultipartFormDataParser.ParseAsync(args.Context.Request.Body);
+		var obj = Activator.CreateInstance<T>();
 
-			var model = (MultipartViewModel)(object)obj;
+		var model = (MultipartViewModel)(object)obj;
 
-			model.Files = parser.Files;
-			model.Parameters = parser.Parameters;
+		model.Files = parser.Files;
+		model.Parameters = parser.Parameters;
 
-			args.SetModel(obj);
-		}
+		args.SetModel(obj);
 	}
 }

src/Simplify.Web.Multipart/Model/MultipartViewModel.cs

@@ -1,27 +1,26 @@
 using System.Collections.Generic;
 using HttpMultipartParser;
 
-namespace Simplify.Web.Multipart.Model
+namespace Simplify.Web.Multipart.Model;
+
+/// <summary>
+/// HTTP multipart form data model
+/// </summary>
+public class MultipartViewModel
 {
 	/// <summary>
-	/// HTTP multipart form data model
+	/// HTTP multipart form data files
 	/// </summary>
-	public class MultipartViewModel
-	{
-		/// <summary>
-		/// HTTP multipart form data files
-		/// </summary>
-		/// <value>
-		/// The files.
-		/// </value>
-		public IReadOnlyList<FilePart> Files { get; set; }
+	/// <value>
+	/// The files.
+	/// </value>
+	public IReadOnlyList<FilePart> Files { get; set; }
 
-		/// <summary>
-		/// HTTP multipart form data parameters
-		/// </summary>
-		/// <value>
-		/// The parameters.
-		/// </value>
-		public IReadOnlyList<ParameterPart> Parameters { get; set; }
-	}
+	/// <summary>
+	/// HTTP multipart form data parameters
+	/// </summary>
+	/// <value>
+	/// The parameters.
+	/// </value>
+	public IReadOnlyList<ParameterPart> Parameters { get; set; }
 }

src/Simplify.Web.Multipart/Simplify.Web.Multipart.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
-		<LangVersion>9.0</LangVersion>
-		<OutputPath>bin\Any CPU\$(Configuration)\</OutputPath>
+		<TargetFrameworks>net6.0;net5.0;netstandard2.0</TargetFrameworks>
+		<LangVersion>latest</LangVersion>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Version>1.4.4</Version>
+		<Version>1.4.5</Version>
 
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>

src/Simplify.Web.Multipart/SimplifyDIRegistratorExtensions.cs

@@ -1,18 +1,17 @@
 using Simplify.DI;
 using Simplify.Web.Multipart.Model.Binding;
 
-namespace Simplify.Web.Multipart
+namespace Simplify.Web.Multipart;
+
+/// <summary>
+/// Provides Simplify.Web.Json default registration
+/// </summary>
+public static class SimplifyDIRegistratorExtensions
 {
 	/// <summary>
-	/// Provides Simplify.Web.Json default registration
+	/// Registers Simplify.Web.Json JsonModelBinder.
 	/// </summary>
-	public static class SimplifyDIRegistratorExtensions
-	{
-		/// <summary>
-		/// Registers Simplify.Web.Json JsonModelBinder.
-		/// </summary>
-		/// <param name="registrator">The registrator.</param>
-		public static IDIRegistrator RegisterHttpMultipartFormModelBinder(this IDIRegistrator registrator) =>
-			registrator.Register<HttpMultipartFormModelBinder>(LifetimeType.Singleton);
-	}
+	/// <param name="registrator">The registrator.</param>
+	public static IDIRegistrator RegisterHttpMultipartFormModelBinder(this IDIRegistrator registrator) =>
+		registrator.Register<HttpMultipartFormModelBinder>(LifetimeType.Singleton);
 }

src/TestClient/Program.cs

@@ -2,28 +2,19 @@
 using System.Text;
 using RestSharp;
 
-namespace TestClient
-{
-	internal class Program
-	{
-		private static void Main()
-		{
-			var client = new RestClient("http://localhost:5000/");
+var client = new RestClient("http://localhost:5000/");
 
-			var request = new RestRequest("api/v1/testIn", Method.Post)
-			{
-				AlwaysMultipartFormData = true
-			};
+var request = new RestRequest("api/v1/testIn", Method.Post)
+{
+	AlwaysMultipartFormData = true
+};
 
-			request.AddFile("test file", Encoding.UTF8.GetBytes("Hello World!!!"), "MyFile.txt", "text/plain");
+request.AddFile("test file", Encoding.UTF8.GetBytes("Hello World!!!"), "MyFile.txt", "text/plain");
 
-			var result = client.ExecuteAsync(request).Result;
+var result = client.ExecuteAsync(request).Result;
 
-			if (result.IsSuccessful != true)
-				throw new InvalidOperationException("Error sending file: " + result.Content);
+if (result.IsSuccessful != true)
+	throw new InvalidOperationException("Error sending file: " + result.Content);
 
-			Console.WriteLine("HTTP status: " + result.StatusCode);
-			Console.ReadLine();
-		}
-	}
-}
+Console.WriteLine("HTTP status: " + result.StatusCode);
+Console.ReadLine();

src/TestServer/Controllers/Api/v1/TestInController.cs

@@ -7,33 +7,32 @@
 using Simplify.Web.Attributes;
 using Simplify.Web.Multipart.Model;
 
-namespace TestServer.Controllers.Api.v1
+namespace TestServer.Controllers.Api.v1;
+
+[Post("/api/v1/testIn")]
+public class TestInController : AsyncController<MultipartViewModel>
 {
-	[Post("/api/v1/testIn")]
-	public class TestInController : AsyncController<MultipartViewModel>
+	public override async Task<ControllerResponse> Invoke()
 	{
-		public override async Task<ControllerResponse> Invoke()
-		{
-			var file = Model.Files.FirstOrDefault() ?? throw new ArgumentException("No files in model");
-			using var stream = new StreamReader(file.Data);
-			var fileData = await stream.ReadToEndAsync();
+		var file = Model.Files.FirstOrDefault() ?? throw new ArgumentException("No files in model");
+		using var stream = new StreamReader(file.Data);
+		var fileData = await stream.ReadToEndAsync();
 
-			Trace.WriteLine($"Files count: '{Model.Files.Count}'");
-			Trace.WriteLine($"File name: '{file.FileName}'");
-			Trace.WriteLine($"File content: '{fileData}'");
+		Trace.WriteLine($"Files count: '{Model.Files.Count}'");
+		Trace.WriteLine($"File name: '{file.FileName}'");
+		Trace.WriteLine($"File content: '{fileData}'");
 
-			// Assert
+		// Assert
 
-			if (file.Name != "test file")
-				return Content($"Wrong name, actual: '{file.Name}'", 500);
+		if (file.Name != "test file")
+			return Content($"Wrong name, actual: '{file.Name}'", 500);
 
-			if (file.FileName != "MyFile.txt")
-				return Content($"Wrong file name, actual: '{file.FileName}'", 500);
+		if (file.FileName != "MyFile.txt")
+			return Content($"Wrong file name, actual: '{file.FileName}'", 500);
 
-			if (fileData != "Hello World!!!")
-				return Content($"Wrong file data, actual: '{fileData}'", 500);
+		if (fileData != "Hello World!!!")
+			return Content($"Wrong file data, actual: '{fileData}'", 500);
 
-			return NoContent();
-		}
+		return NoContent();
 	}
 }

src/TestServer/Controllers/StatusController.cs

@@ -1,14 +1,10 @@
 using Simplify.Web;
 using Simplify.Web.Attributes;
 
-namespace TestServer.Controllers
+namespace TestServer.Controllers;
+
+[Get("status")]
+public class StatusController : Controller
 {
-	[Get("status")]
-	public class StatusController : Controller
-	{
-		public override ControllerResponse Invoke()
-		{
-			return Content("Service is running!");
-		}
-	}
+	public override ControllerResponse Invoke() => Content("Service is running!");
 }

src/TestServer/Program.cs

@@ -1,14 +1,13 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
-namespace TestServer
+namespace TestServer;
+
+public class Program
 {
-	public class Program
-	{
-		public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
+	public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
 
-		public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-			WebHost.CreateDefaultBuilder(args)
-			.UseStartup<Startup>();
-	}
+	public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+		WebHost.CreateDefaultBuilder(args)
+		.UseStartup<Startup>();
 }

src/TestServer/Setup/IocRegistrations.cs

@@ -1,13 +1,9 @@
 using Simplify.DI;
 using Simplify.Web.Multipart;
 
-namespace TestServer.Setup
+namespace TestServer.Setup;
+
+public static class IocRegistrations
 {
-	public static class IocRegistrations
-	{
-		public static void Register()
-		{
-			DIContainer.Current.RegisterHttpMultipartFormModelBinder();
-		}
-	}
+	public static void Register() => DIContainer.Current.RegisterHttpMultipartFormModelBinder();
 }

src/TestServer/Startup.cs

@@ -7,22 +7,21 @@
 using Simplify.Web.Multipart.Model.Binding;
 using TestServer.Setup;
 
-namespace TestServer
+namespace TestServer;
+
+public class Startup
 {
-	public class Startup
+	public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 	{
-		public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-		{
-			IocRegistrations.Register();
+		IocRegistrations.Register();
 
-			if (env.IsDevelopment())
-				app.UseDeveloperExceptionPage();
+		if (env.IsDevelopment())
+			app.UseDeveloperExceptionPage();
 
-			HttpModelHandler.RegisterModelBinder<HttpMultipartFormModelBinder>();
+		HttpModelHandler.RegisterModelBinder<HttpMultipartFormModelBinder>();
 
-			app.UseSimplifyWeb();
+		app.UseSimplifyWeb();
 
-			DIContainer.Current.Verify();
-		}
+		DIContainer.Current.Verify();
 	}
 }