make things build, don't use automapper commerical

Author: adamhathcock

Directory.Packages.props

@@ -1,7 +1,8 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="AutoMapper" Version="15.0.0" />
+    <PackageVersion Include="AutoMapper" Version="14.0.0" />
     <PackageVersion Include="Bullseye" Version="6.0.0" />
+    <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageVersion Include="Glob" Version="1.1.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.13" />
@@ -16,6 +17,6 @@
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.4" />
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1"/>
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
   </ItemGroup>
-</Project>
+</Project>

build.sh

@@ -13,7 +13,7 @@
 
 Target(
     Clean,
-    ForEach("publish", "**/bin", "**/obj"),
+    ["publish", "**/bin", "**/obj"],
     dir =>
     {
         IEnumerable<string> GetDirectories(string d) => Glob.Directories(".", d);
@@ -43,11 +43,11 @@ void RemoveDirectory(string d)
     }
 );
 
-Target(Build, DependsOn(Format), () => Run("dotnet", "build . -c Release"));
+Target(Build, [Format], () => Run("dotnet", "build . -c Release"));
 
 Target(
     Test,
-    DependsOn(Build),
+    [Build],
     () =>
     {
         IEnumerable<string> GetFiles(string d) => Glob.Files(".", d);
@@ -61,8 +61,8 @@ void RemoveDirectory(string d)
 
 Target(
     Publish,
-    DependsOn(Test),
-    ForEach("src/Conduit"),
+    [Test],
+    ["src/Conduit"],
     project =>
     {
         Run(
@@ -72,5 +72,5 @@ void RemoveDirectory(string d)
     }
 );
 
-Target("default", DependsOn(Publish), () => Console.WriteLine("Done!"));
+Target("default", [Publish], () => Console.WriteLine("Done!"));
 await RunTargetsAndExitAsync(args);

build/Program.cs

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <ItemGroup>
     <PackageReference Include="AutoMapper" />
+    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />

src/Conduit/Conduit.csproj

@@ -5,7 +5,6 @@
 using Conduit.Infrastructure;
 using Conduit.Infrastructure.Security;
 using FluentValidation;
-using FluentValidation.AspNetCore;
 using MediatR;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http;
@@ -14,6 +13,7 @@
 using Microsoft.IdentityModel.Tokens;
 using Serilog;
 using Serilog.Sinks.SystemConsole.Themes;
+using Details = Conduit.Features.Users.Details;
 
 namespace Conduit;
 
@@ -30,9 +30,7 @@ public static void AddConduit(this IServiceCollection services)
             typeof(DBContextTransactionPipelineBehavior<,>)
         );
 
-        services.AddFluentValidationAutoValidation();
-        services.AddFluentValidationClientsideAdapters();
-        services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly());
+        services.AddValidatorsFromAssemblyContaining<Details.QueryValidator>();
 
         services.AddAutoMapper(typeof(Program));
 

src/Conduit/ServicesExtensions.cs

@@ -4,13 +4,11 @@
     "net8.0": {
       "AutoMapper": {
         "type": "Direct",
-        "requested": "[15.0.0, )",
-        "resolved": "15.0.0",
-        "contentHash": "pIOxis0VM4WGV48heK5Y93wysT2gD+hPQd7xFM23wUKsXJ77otM0ugg/wSeUDGJApvJgS3x6kggfLWhK16+E2g==",
+        "requested": "[14.0.0, )",
+        "resolved": "14.0.0",
+        "contentHash": "OC+1neAPM4oCCqQj3g2GJ2shziNNhOkxmNB9cVS8jtx4JbgmRzLcUOxB9Tsz6cVPHugdkHgCaCrTjjSI0Z5sCQ==",
         "dependencies": {
-          "Microsoft.Extensions.Logging": "8.0.0",
-          "Microsoft.Extensions.Options": "8.0.0",
-          "Microsoft.IdentityModel.JsonWebTokens": "8.0.1"
+          "Microsoft.Extensions.Options": "8.0.0"
         }
       },
       "FluentValidation": {
@@ -19,6 +17,16 @@
         "resolved": "12.0.0",
         "contentHash": "8NVLxtMUXynRHJIX3Hn1ACovaqZIJASufXIIFkD0EUbcd5PmMsL1xUD5h548gCezJ5BzlITaR9CAMrGe29aWpA=="
       },
+      "FluentValidation.DependencyInjectionExtensions": {
+        "type": "Direct",
+        "requested": "[12.0.0, )",
+        "resolved": "12.0.0",
+        "contentHash": "B28fBRL1UjhGsBC8fwV6YBZosh+SiU1FxdD7l7p5dGPgRlVI7UnM+Lgzmg+unZtV1Zxzpaw96UY2MYfMaAd8cg==",
+        "dependencies": {
+          "FluentValidation": "12.0.0",
+          "Microsoft.Extensions.Dependencyinjection.Abstractions": "2.1.0"
+        }
+      },
       "MediatR": {
         "type": "Direct",
         "requested": "[13.0.0, )",

src/Conduit/packages.lock.json

@@ -584,8 +584,9 @@
       "conduit": {
         "type": "Project",
         "dependencies": {
-          "AutoMapper": "[15.0.0, )",
+          "AutoMapper": "[14.0.0, )",
           "FluentValidation": "[12.0.0, )",
+          "FluentValidation.DependencyInjectionExtensions": "[12.0.0, )",
           "MediatR": "[13.0.0, )",
           "Microsoft.AspNetCore.Authentication.JwtBearer": "[8.0.13, )",
           "Microsoft.EntityFrameworkCore.InMemory": "[8.0.13, )",
@@ -599,13 +600,11 @@
       },
       "AutoMapper": {
         "type": "CentralTransitive",
-        "requested": "[15.0.0, )",
-        "resolved": "15.0.0",
-        "contentHash": "pIOxis0VM4WGV48heK5Y93wysT2gD+hPQd7xFM23wUKsXJ77otM0ugg/wSeUDGJApvJgS3x6kggfLWhK16+E2g==",
+        "requested": "[14.0.0, )",
+        "resolved": "14.0.0",
+        "contentHash": "OC+1neAPM4oCCqQj3g2GJ2shziNNhOkxmNB9cVS8jtx4JbgmRzLcUOxB9Tsz6cVPHugdkHgCaCrTjjSI0Z5sCQ==",
         "dependencies": {
-          "Microsoft.Extensions.Logging": "8.0.0",
-          "Microsoft.Extensions.Options": "8.0.0",
-          "Microsoft.IdentityModel.JsonWebTokens": "8.0.1"
+          "Microsoft.Extensions.Options": "8.0.0"
         }
       },
       "FluentValidation": {
@@ -614,6 +613,16 @@
         "resolved": "12.0.0",
         "contentHash": "8NVLxtMUXynRHJIX3Hn1ACovaqZIJASufXIIFkD0EUbcd5PmMsL1xUD5h548gCezJ5BzlITaR9CAMrGe29aWpA=="
       },
+      "FluentValidation.DependencyInjectionExtensions": {
+        "type": "CentralTransitive",
+        "requested": "[12.0.0, )",
+        "resolved": "12.0.0",
+        "contentHash": "B28fBRL1UjhGsBC8fwV6YBZosh+SiU1FxdD7l7p5dGPgRlVI7UnM+Lgzmg+unZtV1Zxzpaw96UY2MYfMaAd8cg==",
+        "dependencies": {
+          "FluentValidation": "12.0.0",
+          "Microsoft.Extensions.Dependencyinjection.Abstractions": "2.1.0"
+        }
+      },
       "MediatR": {
         "type": "CentralTransitive",
         "requested": "[13.0.0, )",