Updated swashbuckle

RocketSurgeonsGuild · Jan 13, 2020 · 09ee140 · 09ee140
1 parent 543323c
commit 09ee140
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Packages.props b/Packages.props
@@ -25,6 +25,8 @@
     <PackageReference Update="NodaTime" Version="2.4.7" />
     <PackageReference Update="NodaTime.Serialization.JsonNet" Version="2.2.0" />
     <PackageReference Update="NodaTime.Serialization.SystemTextJson" Version="1.0.0-beta01" />
+    <PackageReference Update="Rocket.Surgery.AspNetCore" Version="0.3.0-beta.115" />
+    <PackageReference Update="Rocket.Surgery.AspNetCore.NewtonsoftJson" Version="0.3.0-beta.115" />
     <PackageReference Update="Rocket.Surgery.Conventions" Version="9.0.7" />
     <PackageReference Update="Rocket.Surgery.Conventions" Version="9.0.7" />
     <PackageReference Update="Rocket.Surgery.Conventions.Abstractions" Version="9.0.7" />

diff --git a/src/Swashbuckle.NewtonsoftJson/Rocket.Surgery.AspNetCore.Swashbuckle.NewtonsoftJson.csproj b/src/Swashbuckle.NewtonsoftJson/Rocket.Surgery.AspNetCore.Swashbuckle.NewtonsoftJson.csproj
@@ -6,8 +6,8 @@
     </PropertyGroup>
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
+        <PackageReference Include="Rocket.Surgery.AspNetCore.NewtonsoftJson" />
         <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" />
         <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation.NewtonsoftJson" />
-        <PackageReference Include="NodaTime.Serialization.JsonNet" />
     </ItemGroup>
 </Project>
diff --git a/src/Swashbuckle.NewtonsoftJson/SwashbuckleNewtonsoftJsonConvention.cs b/src/Swashbuckle.NewtonsoftJson/SwashbuckleNewtonsoftJsonConvention.cs
@@ -1,8 +1,12 @@
 using System;
 using JetBrains.Annotations;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using NodaTime;
 using Rocket.Surgery.AspNetCore.Swashbuckle.NewtonsoftJson;
 using Rocket.Surgery.Conventions;
 using Rocket.Surgery.Extensions.DependencyInjection;
@@ -31,7 +35,7 @@ public void Register(IServiceConventionContext context)
             {
                 throw new ArgumentNullException(nameof(context));
             }
-
+            
             context.Services.AddSwaggerGenNewtonsoftSupport();
             context.Services.Configure<SwaggerGenOptions>(
                 options =>

diff --git a/src/Swashbuckle/Rocket.Surgery.AspNetCore.Swashbuckle.csproj b/src/Swashbuckle/Rocket.Surgery.AspNetCore.Swashbuckle.csproj
@@ -6,14 +6,13 @@
     </PropertyGroup>
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
+        <PackageReference Include="Rocket.Surgery.AspNetCore" />
         <PackageReference Include="Swashbuckle.AspNetCore" />
         <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" />
         <!--        <PackageReference Include="Swashbuckle.AspNetCore.Filters" />-->
         <PackageReference Include="MicroElements.Swashbuckle.FluentValidation" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Rocket.Surgery.AspNetCore.FluentValidation" />
-        <PackageReference Include="NodaTime" />
-        <PackageReference Include="NodaTime.Serialization.SystemTextJson" />
     </ItemGroup>
 </Project>
diff --git a/src/Swashbuckle/SwashbuckleConvention.cs b/src/Swashbuckle/SwashbuckleConvention.cs
@@ -10,6 +10,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
+using NodaTime;
+using NodaTime.Serialization.SystemTextJson;
 using Rocket.Surgery.AspNetCore.Swashbuckle;
 using Rocket.Surgery.Conventions;
 using Rocket.Surgery.Extensions.DependencyInjection;
@@ -101,14 +103,12 @@ public void Register(IServiceConventionContext context)
                     }
                 }
             );
-            
+
             AddFluentValdiationRules(context.Services);
         }
 
         private static void AddFluentValdiationRules(IServiceCollection services)
         {
-
-
             services.AddSingleton(
                 new FluentValidationRule("NotEmpty")
                 {