Merge branch 'dotnet-7'

Author: PawelGerr

Directory.Build.props

@@ -2,7 +2,7 @@
 
    <PropertyGroup>
       <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-      <VersionPrefix>5.2.0</VersionPrefix>
+      <VersionPrefix>6.0.0</VersionPrefix>
       <Authors>Pawel Gerr</Authors>
       <GenerateDocumentationFile>true</GenerateDocumentationFile>
       <PackageProjectUrl>https://github.com/PawelGerr/Thinktecture.Runtime.Extensions</PackageProjectUrl>
@@ -12,6 +12,7 @@
       <RepositoryUrl>https://github.com/PawelGerr/Thinktecture.Runtime.Extensions</RepositoryUrl>
       <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
       <RootNamespace>Thinktecture</RootNamespace>
+      <TargetFramework>net7.0</TargetFramework>
       <LangVersion>11.0</LangVersion>
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>

README.md

@@ -15,25 +15,14 @@ This library provides some interfaces, classes, [Roslyn Source Generators](https
 
 See [wiki](https://github.com/PawelGerr/Thinktecture.Runtime.Extensions/wiki) for more documentation.
 
-# Required SDK/Compiler/Language Version
-* Compiler version: 4.2.0
-* C# language version: 9 or higher
-
-Verify the version by placing `#error version` into any of your cs-files and build the project/solution.  
-The build output should display the compiler version:
-```
-MyFile.cs(15, 8): [CS1029] #error: 'version'
-MyFile.cs(15, 8): [CS8304] Compiler version: '4.2.0-4.22220.2 (1e40aa11)'. Language version: 10.0.
-```
-
-## Update your IDE and SDK to newest version.  
-Works/tested with:
-* SDK: 6.0.300 / 6.0.301 / 6.0.400
-* Visual Studio: 17.2.4 / 17.3.0
-* JetBrains Rider: 2022.1.2 / 2022.2.2
-
-> Please note: For developers having both, JetBrains Rider and Visual Studio, please update Visual Studio as well, because Rider is using the SDK of Visual Studio by default.
-
+# Requirements
+
+* Version 6:
+  * C# 11 (or higher) for generated code
+  * SDK 7.0.102 (or higher) for building projects
+* Version 5:
+  * C# 9 (or higher) for generated code
+  * SDK 6.0.300 (or higher) for building projects
 
 # Smart Enums
 

Thinktecture.Runtime.Extensions.sln

@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{21EB22
 		.github\workflows\main.yml = .github\workflows\main.yml
 		.gitignore = .gitignore
 		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E6F200ED-86D2-4D5C-9D5F-34592908B107}"

Thinktecture.Runtime.Extensions.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Formattable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

samples/Newtonsoft.Json.AspNetCore.Samples/Thinktecture.Runtime.Extensions.Newtonsoft.Json.AspNetCore.Samples.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <OutputType>EXE</OutputType>
         <NoWarn>$(NoWarn);CA2007;CA2234</NoWarn>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     </ItemGroup>

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/Controllers/DemoController.cs

@@ -41,9 +41,13 @@ public IActionResult RoundTrip(ProductGroupWithJsonConverter group)
    }
 
    [HttpGet("productType/{productType}")]
-   public IActionResult RoundTrip(
-      [FromRoute] ProductType productType,
-      [FromQuery] ProductType? type)
+   public IActionResult RoundTrip(ProductType productType)
+   {
+      return RoundTrip<ProductType, string>(productType);
+   }
+
+   [HttpGet("productType")]
+   public IActionResult RoundTripWithQueryString(ProductType productType)
    {
       return RoundTrip<ProductType, string>(productType);
    }
@@ -54,8 +58,6 @@ public IActionResult RoundTripPost([FromBody] ProductType productType)
       return RoundTrip<ProductType, string>(productType);
    }
 
-   public record ProductTypeWrapper(ProductType ProductType);
-
    [HttpPost("productTypeWrapper")]
    public IActionResult RoundTripPost([FromBody] ProductTypeWrapper productType)
    {

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/ProductTypeWrapper.cs

@@ -0,0 +1,5 @@
+using Thinktecture.SmartEnums;
+
+namespace Thinktecture;
+
+public record ProductTypeWrapper(ProductType ProductType);

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/Program.cs

@@ -1,17 +1,21 @@
-using System;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Events;
 using Thinktecture.AspNetCore.ModelBinding;
+using Thinktecture.SmartEnums;
 using Thinktecture.Text.Json.Serialization;
+using Thinktecture.Validation;
+using Thinktecture.ValueObjects;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Thinktecture;
@@ -21,8 +25,14 @@ public class Program
    // ReSharper disable once InconsistentNaming
    public static async Task Main()
    {
+      var startMinimalWebApi = true;
+
       var loggerFactory = CreateLoggerFactory();
-      var server = StartServerAsync(loggerFactory);
+      var app = startMinimalWebApi
+                   ? StartMinimalWebApiAsync(loggerFactory)
+                   : StartServerAsync(loggerFactory); // MVC controllers
+
+      await app;
 
       // calls
       // 	http://localhost:5000/api/category/fruits
@@ -38,23 +48,30 @@ public static async Task Main()
       // 	http://localhost:5000/api/productName/bread
       // 	http://localhost:5000/api/productName/a
       // 	http://localhost:5000/api/boundary
-      await DoHttpRequestsAsync(loggerFactory.CreateLogger<Program>());
+      await DoHttpRequestsAsync(loggerFactory.CreateLogger<Program>(), startMinimalWebApi);
 
-      await server;
+      await Task.Delay(5000);
    }
 
-   private static async Task DoHttpRequestsAsync(ILogger logger)
+   private static async Task DoHttpRequestsAsync(ILogger logger, bool forMinimalWebApi)
    {
       using var client = new HttpClient();
 
       await DoRequestAsync(logger, client, "category/fruits");
       await DoRequestAsync(logger, client, "categoryWithConverter/fruits");
       await DoRequestAsync(logger, client, "group/1");
-      await DoRequestAsync(logger, client, "group/42"); // invalid
+      await DoRequestAsync(logger, client, "group/42");      // invalid
+      await DoRequestAsync(logger, client, "group/invalid"); // invalid
       await DoRequestAsync(logger, client, "groupWithConverter/1");
       await DoRequestAsync(logger, client, "groupWithConverter/42"); // invalid
-      await DoRequestAsync(logger, client, "productType/groceries?type=groceries");
-      await DoRequestAsync(logger, client, "productType/invalid");                                 // invalid
+      await DoRequestAsync(logger, client, "productType/groceries");
+      await DoRequestAsync(logger, client, "productType?productType=groceries");
+      await DoRequestAsync(logger, client, "productType", "groceries");
+      await DoRequestAsync(logger, client, "productType/invalid"); // invalid
+
+      if (forMinimalWebApi)
+         await DoRequestAsync(logger, client, "productTypeWithFilter?productType=invalid"); // invalid
+
       await DoRequestAsync(logger, client, "productType", "invalid");                              // invalid
       await DoRequestAsync(logger, client, "productTypeWrapper", new { ProductType = "invalid" }); // invalid
       await DoRequestAsync(logger, client, "productTypeWithJsonConverter/groceries");
@@ -124,7 +141,46 @@ private static Task StartServerAsync(ILoggerFactory loggerFactory)
                                        })
                     .Build();
 
-      return webHost.RunAsync();
+      return webHost.StartAsync();
+   }
+
+   private static Task StartMinimalWebApiAsync(ILoggerFactory loggerFactory)
+   {
+      var builder = WebApplication.CreateBuilder();
+      builder.Services
+             .AddSingleton(loggerFactory)
+             .ConfigureHttpJsonOptions(options => options.SerializerOptions.Converters.Add(new ValueObjectJsonConverterFactory()));
+
+      var app = builder.Build();
+
+      var group = app.MapGroup("/api");
+
+      group.MapGet("category/{category}", (ProductCategory category) => new { Value = category, category.IsValid });
+      group.MapGet("categoryWithConverter/{category}", (ProductCategoryWithJsonConverter category) => new { Value = category, category.IsValid });
+      group.MapGet("group/{group}", (ProductGroup group) => new { Value = group, group.IsValid });
+      group.MapGet("groupWithConverter/{group}", (ProductGroupWithJsonConverter group) => new { Value = group, group.IsValid });
+      group.MapGet("productType/{productType}", (ProductType productType) => productType);
+      group.MapGet("productType", (ProductType productType) => productType);
+      group.MapGet("productTypeWithFilter", (BoundValueObject<ProductType> productType) => ValueTask.FromResult(productType.Value))
+           .AddEndpointFilter((context, next) =>
+                              {
+                                 var value = context.GetArgument<IBoundParam>(0);
+
+                                 if (value.Error is not null)
+                                    return new ValueTask<object?>(Results.BadRequest(value.Error));
+
+                                 return next(context);
+                              });
+      group.MapPost("productType", ([FromBody] ProductType productType) => productType);
+      group.MapPost("productTypeWrapper", ([FromBody] ProductTypeWrapper productType) => productType);
+      group.MapGet("productTypeWithJsonConverter/{productType}", (ProductTypeWithJsonConverter productType) => productType);
+      group.MapGet("productName/{name}", (ProductName name) => name);
+      group.MapPost("productName", ([FromBody] ProductName name) => name);
+      group.MapGet("otherProductName/{name}", (OtherProductName? name) => name);
+      group.MapPost("otherProductName", ([FromBody] OtherProductName name) => name);
+      group.MapPost("boundary", ([FromBody] BoundaryWithJsonConverter boundary) => boundary);
+
+      return app.StartAsync();
    }
 
    private static ILoggerFactory CreateLoggerFactory()

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <OutputType>EXE</OutputType>
         <NoWarn>$(NoWarn);CA2007;CA2234</NoWarn>
     </PropertyGroup>

samples/Thinktecture.Runtime.Extensions.AspNetCore.Samples/Validation/BoundValueObject.cs

@@ -0,0 +1,82 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Thinktecture.Validation;
+
+public class BoundValueObject<T, TKey> : IBoundParam
+   where T : IKeyedValueObject<T, TKey>
+   where TKey : IParsable<TKey>
+{
+   private readonly T? _item;
+   public T? Item => Error is null ? _item : throw new ValidationException(Error);
+
+   public string? Error { get; }
+
+   private BoundValueObject(T? item)
+   {
+      _item = item;
+   }
+
+   private BoundValueObject(string error)
+   {
+      Error = error ?? throw new ArgumentNullException(nameof(error));
+   }
+
+   public static bool TryParse(string s, IFormatProvider? formatProvider, out BoundValueObject<T, TKey> value)
+   {
+      if (!TKey.TryParse(s, formatProvider, out var key))
+      {
+         value = new BoundValueObject<T, TKey>($"The value '{s}' cannot be converted to '{typeof(TKey).FullName}'.");
+      }
+      else
+      {
+         var validationResult = T.Validate(key, out var item);
+
+         if (validationResult is null || item is IValidatableEnum<TKey>)
+         {
+            value = new BoundValueObject<T, TKey>(item);
+         }
+         else
+         {
+            value = new BoundValueObject<T, TKey>(validationResult.ErrorMessage ?? $"The value '{s}' cannot be converted to '{typeof(T).FullName}'.");
+         }
+      }
+
+      return true;
+   }
+}
+
+public class BoundValueObject<T> : IBoundParam
+   where T : IKeyedValueObject<T, string>
+{
+   private readonly T? _item;
+   public T? Value => Error is null ? _item : throw new ValidationException(Error);
+
+   public string? Error { get; }
+
+   private BoundValueObject(T? item)
+   {
+      _item = item;
+   }
+
+   private BoundValueObject(string error)
+   {
+      Error = error ?? throw new ArgumentNullException(nameof(error));
+   }
+
+   public static bool TryParse(string s, IFormatProvider? formatProvider, out BoundValueObject<T> value)
+   {
+      var validationResult = T.Validate(s, out var item);
+
+      if (validationResult is null || item is IValidatableEnum<string>)
+      {
+         value = new BoundValueObject<T>(item);
+      }
+      else
+      {
+         value = new BoundValueObject<T>(validationResult.ErrorMessage ?? $"The value '{s}' cannot be converted to '{typeof(T).FullName}'.");
+      }
+
+      return true;
+   }
+}