wip: modified references on targets

Xabaril · Jan 24, 2022 · 2558733 · 2558733
1 parent 34b16a8
commit 2558733
Show file tree

Hide file tree

Showing 9 changed files with 904 additions and 914 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -9,68 +9,68 @@
   <ItemGroup>
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(NetTestSdk)" />
     <PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.5" />
-    <PackageReference Update="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.5" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
-    <PackageReference Update="Microsoft.ApplicationInsights" Version="2.17.0" />
-    <PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1"  />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.2.1" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Primitives" Version="5.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Hosting" Version="5.0.0" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.1" />
+    <PackageReference Update="Microsoft.ApplicationInsights" Version="2.20.0" />
+    <PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.20.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0"  />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="4.5.1" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.1" />
+    <PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Update="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="5.0.5" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="5.0.5" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="5.0.5" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" />
-    <PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" />
-    <PackageReference Update="Azure.Identity" Version="1.3.0" />
-    <PackageReference Update="Microsoft.Data.SqlClient" Version="2.1.2" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="6.0.1" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Update="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Update="Azure.Identity" Version="1.5.0" />
+    <PackageReference Update="Microsoft.Data.SqlClient" Version="4.0.1" />
 
 
-    <PackageReference Update="System.Text.Json" Version="5.0.2" />
-    <PackageReference Update="System.Net.Http.Json" Version="5.0.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
+    <PackageReference Update="System.Text.Json" Version="6.0.1" />
+    <PackageReference Update="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
     <PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
 
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Update="Respawn" Version="3.3.0" />
+    <PackageReference Update="Respawn" Version="5.0.1" />
     <PackageReference Update="Acheve.TestHost" Version="3.0.0" />
-    <PackageReference Update="FluentAssertions" Version="5.10.3" />
-    <PackageReference Update="FluentValidation" Version="10.1.0" />
+    <PackageReference Update="FluentAssertions" Version="6.4.0" />
+    <PackageReference Update="FluentValidation" Version="10.3.6" />
     <PackageReference Update="FluentValidation.AspNetCore" Version="10.1.0" />
-    <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
-    <PackageReference Update="Hellang.Middleware.ProblemDetails" Version="5.4.0" />
-    <PackageReference Update="NSwag.MSBuild" Version="13.10.9"/>
+    <PackageReference Update="MediatR.Extensions.Microsoft.DependencyInjection" Version="10.0.1" />
+    <PackageReference Update="Hellang.Middleware.ProblemDetails" Version="6.3.0" />
+    <PackageReference Update="NSwag.MSBuild" Version="13.15.5"/>
     <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Update="BlazorInputFile" Version="0.2.0" />
     <PackageReference Update="BuildBundlerMinifier" Version="3.2.449" />
-    <PackageReference Update="IdentityModel" Version="5.1.0" />
-    <PackageReference Update="Serilog.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Update="Serilog.Settings.Configuration" Version="3.1.0" />
+    <PackageReference Update="IdentityModel" Version="6.0.0" />
+    <PackageReference Update="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Update="Serilog.Settings.Configuration" Version="3.3.0" />
     <PackageReference Update="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
-    <PackageReference Update="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Update="Swashbuckle.AspNetCore" Version="5.6.3" />
-    <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+    <PackageReference Update="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Update="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="4.0.0" />
     <PackageReference Update="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
     <PackageReference Update="MiniProfiler.Shared" Version="4.2.22" />
   </ItemGroup>

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -1,22 +1,22 @@
 <Project>
   <PropertyGroup Label="SDK Versions">
-    <NetFrameworkVersion>net5.0</NetFrameworkVersion>
+    <NetFrameworkVersion>net6.0</NetFrameworkVersion>
     <NetStandardVersion>netstandard21</NetStandardVersion>
-    <NetTestSdk>16.9.4</NetTestSdk>
+    <NetTestSdk>17.0.0</NetTestSdk>
     <LangVersion>preview</LangVersion>
-    <GitHubSourceLink>1.0.0</GitHubSourceLink>
+    <GitHubSourceLink>1.1.1</GitHubSourceLink>
   </PropertyGroup>  
 
   <PropertyGroup Label="Esquio Versions">
-    <esquio>5.0.5$(VersionSuffix)</esquio>
-    <esquioaspnetcore>5.0.5$(VersionSuffix)</esquioaspnetcore>
-    <esquioaspnetcoreapplicationinsightsprocessor>5.0.5$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
-    <esquioconfigurationstore>5.0.5$(VersionSuffix)</esquioconfigurationstore>
-    <esquiodatabasestore>5.0.5$(VersionSuffix)</esquiodatabasestore>
-    <esquioentityframeworkstore>5.0.5$(VersionSuffix)</esquioentityframeworkstore>
-    <esquiominiprofiler>5.0.5$(VersionSuffix)</esquiominiprofiler>
-    <esquiocli>5.0.5$(VersionSuffix)</esquiocli>
-    <esquiohttpstore>5.0.5$(VersionSuffix)</esquiohttpstore>
-    <esquioblazorwasm>5.0.5$(VersionSuffix)</esquioblazorwasm>
+    <esquio>6.0.0$(VersionSuffix)</esquio>
+    <esquioaspnetcore>6.0.0$(VersionSuffix)</esquioaspnetcore>
+    <esquioaspnetcoreapplicationinsightsprocessor>6.0.0$(VersionSuffix)</esquioaspnetcoreapplicationinsightsprocessor>
+    <esquioconfigurationstore>6.0.0$(VersionSuffix)</esquioconfigurationstore>
+    <esquiodatabasestore>6.0.0$(VersionSuffix)</esquiodatabasestore>
+    <esquioentityframeworkstore>6.0.0$(VersionSuffix)</esquioentityframeworkstore>
+    <esquiominiprofiler>6.0.0$(VersionSuffix)</esquiominiprofiler>
+    <esquiocli>6.0.0$(VersionSuffix)</esquiocli>
+    <esquiohttpstore>6.0.0$(VersionSuffix)</esquiohttpstore>
+    <esquioblazorwasm>6.0.0$(VersionSuffix)</esquioblazorwasm>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "src", "tests", "samples"],
   "sdk": {
-    "version": "5.0.100"
+    "version": "6.0.101"
   }
 }
diff --git a/install-sdk.ps1 b/install-sdk.ps1
@@ -1,2 +1,2 @@
-$SdkVersion = "5.0.100"
+$SdkVersion = "6.0.101"
 & "./dotnet-install.ps1" -Version $SdkVersion
diff --git a/install-sdk.sh b/install-sdk.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-SdkVersion="5.0.100"
+SdkVersion="6.0.101"
 ./dotnet-install.sh -Version $SdkVersion
 export PATH="$PATH:$HOME/.dotnet"
diff --git a/src/Esquio.UI.Api/Esquio.UI.Api.csproj b/src/Esquio.UI.Api/Esquio.UI.Api.csproj
@@ -46,8 +46,8 @@
   </ItemGroup>
 
   <Target Name="CreateServicesFromControllers" AfterTargets="AfterBuild">
-    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="$(NSwagExe_Net50) webapi2openapi /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths: %USERPROFILE%\\.nuget\\packages" />
-    <Exec Condition="'$(OS)' == 'Unix'" Command="$(NSwagExe_Net50) webapi2swagger /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths:$HOME/.nuget/packages" />
+    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="$(NSwagExe_Net60) webapi2openapi /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths: %USERPROFILE%\\.nuget\\packages" />
+    <Exec Condition="'$(OS)' == 'Unix'" Command="$(NSwagExe_Net60) webapi2swagger /assembly:$(OutDir)$(ProjectName).dll /AspNetCore=true /DefaultPropertyNameHandling:CamelCase /output:swagger.json /referencepaths:$HOME/.nuget/packages" />
   </Target>
 
 </Project>
diff --git a/src/Esquio.UI.Api/Infrastructure/Behaviors/LoggerMediatRBehavior.cs b/src/Esquio.UI.Api/Infrastructure/Behaviors/LoggerMediatRBehavior.cs
@@ -8,7 +8,7 @@
 namespace Esquio.UI.Api.Infrastructure.Behaviors
 {
     public class LoggerMediatRBehavior<TRequest, TResponse>
-        : IPipelineBehavior<TRequest, TResponse>
+        : IPipelineBehavior<TRequest, TResponse> where TRequest: IRequest<TResponse>
     {
         private readonly ILoggerFactory _loggerFactory;
 

diff --git a/src/Esquio.UI.Api/swagger.json b/src/Esquio.UI.Api/swagger.json
@@ -1,5 +1,5 @@
 {
-  "x-generator": "NSwag v13.10.9.0 (NJsonSchema v10.4.1.0 (Newtonsoft.Json v12.0.0.0))",
+  "x-generator": "NSwag v13.15.5.0 (NJsonSchema v10.6.6.0 (Newtonsoft.Json v13.0.0.0))",
   "swagger": "2.0",
   "info": {
     "title": "My Title",
@@ -1630,6 +1630,9 @@
     "ProblemDetails": {
       "type": "object",
       "additionalProperties": {},
+      "required": [
+        "extensions"
+      ],
       "properties": {
         "type": {
           "type": "string"
@@ -1715,13 +1718,41 @@
       }
     },
     "ValidationProblemDetails": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/HttpValidationProblemDetails"
+        },
+        {
+          "type": "object",
+          "additionalProperties": {},
+          "required": [
+            "errors"
+          ],
+          "properties": {
+            "errors": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      ]
+    },
+    "HttpValidationProblemDetails": {
       "allOf": [
         {
           "$ref": "#/definitions/ProblemDetails"
         },
         {
           "type": "object",
           "additionalProperties": {},
+          "required": [
+            "errors"
+          ],
           "properties": {
             "errors": {
               "type": "object",