Update c# version and fix OpenAPi options issue

enbiso · Nov 23, 2019 · 47c9034 · 47c9034
1 parent d72abb9
commit 47c9034
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
   global:
-    - PACKAGE_VERSION="3.0.0-rc6"
+    - PACKAGE_VERSION="3.0.0-rc7"
     - PACKAGE_ICON="https://www.enbiso.com/logo.svg"
     - PACKAGE_PROJECT="https://nlib.enbiso.com"
     - PACKAGE_REPO="https://github.com/enbiso/Enbiso.NLib"

diff --git a/Enbiso.NLib.Cqrs.Idempotent/Enbiso.NLib.Cqrs.Idempotent.csproj b/Enbiso.NLib.Cqrs.Idempotent/Enbiso.NLib.Cqrs.Idempotent.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.Cqrs/Enbiso.NLib.Cqrs.csproj b/Enbiso.NLib.Cqrs/Enbiso.NLib.Cqrs.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.DependencyInjection/Enbiso.NLib.DependencyInjection.csproj b/Enbiso.NLib.DependencyInjection/Enbiso.NLib.DependencyInjection.csproj
@@ -22,6 +22,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
 
   </PropertyGroup>
 

diff --git a/Enbiso.NLib.Domain.Events/Enbiso.NLib.Domain.Events.csproj b/Enbiso.NLib.Domain.Events/Enbiso.NLib.Domain.Events.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.Domain/Enbiso.NLib.Domain.csproj b/Enbiso.NLib.Domain/Enbiso.NLib.Domain.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/Enbiso.NLib.EventBus.Abstractions/Enbiso.NLib.EventBus.Abstractions.csproj b/Enbiso.NLib.EventBus.Abstractions/Enbiso.NLib.EventBus.Abstractions.csproj
@@ -19,6 +19,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.*" />

diff --git a/Enbiso.NLib.EventBus.RabbitMq/Enbiso.NLib.EventBus.RabbitMq.csproj b/Enbiso.NLib.EventBus.RabbitMq/Enbiso.NLib.EventBus.RabbitMq.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.0.*" />

diff --git a/Enbiso.NLib.EventBus.ServiceBus/Enbiso.NLib.EventBus.ServiceBus.csproj b/Enbiso.NLib.EventBus.ServiceBus/Enbiso.NLib.EventBus.ServiceBus.csproj
@@ -21,7 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
-
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.1.*" />

diff --git a/Enbiso.NLib.EventBus/Enbiso.NLib.EventBus.csproj b/Enbiso.NLib.EventBus/Enbiso.NLib.EventBus.csproj
@@ -22,6 +22,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.EventLogger.EntityFramework/Enbiso.NLib.EventLogger.EntityFramework.csproj b/Enbiso.NLib.EventLogger.EntityFramework/Enbiso.NLib.EventLogger.EntityFramework.csproj
@@ -18,6 +18,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.*" />

diff --git a/Enbiso.NLib.EventLogger.Mongo/Enbiso.NLib.EventLogger.Mongo.csproj b/Enbiso.NLib.EventLogger.Mongo/Enbiso.NLib.EventLogger.Mongo.csproj
@@ -19,6 +19,7 @@
         <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
         <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
         <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+        <LangVersion>8</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Enbiso.NLib.EventLogger/Enbiso.NLib.EventLogger.csproj b/Enbiso.NLib.EventLogger/Enbiso.NLib.EventLogger.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Text.Json" Version="4.6.*" />

diff --git a/Enbiso.NLib.GlobalExceptions/Enbiso.NLib.GlobalExceptions.csproj b/Enbiso.NLib.GlobalExceptions/Enbiso.NLib.GlobalExceptions.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.GlobalExceptions/GlobalExceptionHandler.cs b/Enbiso.NLib.GlobalExceptions/GlobalExceptionHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Enbiso.NLib.GlobalExceptions
@@ -8,7 +9,7 @@ namespace Enbiso.NLib.GlobalExceptions
     /// </summary>
     public interface IGlobalExceptionHandler
     {
-        Type[] ValidTypes { get; }
+        IEnumerable<Type> ValidTypes { get; }
 
         Task<GlobalExceptionResponse> HandleException(Exception exception);
     }
@@ -20,7 +21,7 @@ public interface IGlobalExceptionHandler
     public abstract class GlobalExceptionHandler<TException> : IGlobalExceptionHandler
         where TException : Exception
     {
-        public Type[] ValidTypes => new [] { typeof(TException) };
+        public IEnumerable<Type> ValidTypes => new [] { typeof(TException) };
         protected abstract Task<GlobalExceptionResponse> Handle(TException ex);
 
         public Task<GlobalExceptionResponse> HandleException(Exception exception)

diff --git a/Enbiso.NLib.Idempotency.EntityFramework/Enbiso.NLib.Idempotency.EntityFramework.csproj b/Enbiso.NLib.Idempotency.EntityFramework/Enbiso.NLib.Idempotency.EntityFramework.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.*" />

diff --git a/Enbiso.NLib.Idempotency/Enbiso.NLib.Idempotency.csproj b/Enbiso.NLib.Idempotency/Enbiso.NLib.Idempotency.csproj
@@ -21,6 +21,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.*" />

diff --git a/Enbiso.NLib.OpenApi/Enbiso.NLib.OpenApi.csproj b/Enbiso.NLib.OpenApi/Enbiso.NLib.OpenApi.csproj
@@ -22,6 +22,7 @@
     <PackageIconUrl>$(PACKAGE_ICON)</PackageIconUrl>
     <PackageProjectUrl>$(PACKAGE_PROJECT)</PackageProjectUrl>
     <RepositoryUrl>$(PACKAGE_REPO)</RepositoryUrl>
+    <LangVersion>8</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Enbiso.NLib.OpenApi/ServiceExtensions.cs b/Enbiso.NLib.OpenApi/ServiceExtensions.cs
@@ -19,8 +19,13 @@ public static class ServiceExtensions
         /// <param name="optBuilder"></param>
         public static void AddOpenApi(this IServiceCollection services, Action<OpenApiOptions> optBuilder)
         {
+            services.AddOptions();
+
+            optBuilder ??= options => {};
+            services.Configure(optBuilder);
+
             var opts = new OpenApiOptions();
-            optBuilder?.Invoke(opts);
+            optBuilder.Invoke(opts);
 
             services.AddSwaggerGen(c =>
             {