Update to Menes 0.9.0

marain-dotnet · Jan 29, 2020 · ed7485f · ed7485f
1 parent 1d152e1
commit ed7485f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/Solutions/Marain.Tenancy.Host.Functions/Marain.Tenancy.Host.Functions.csproj b/Solutions/Marain.Tenancy.Host.Functions/Marain.Tenancy.Host.Functions.csproj
@@ -13,12 +13,6 @@
     <PackageReference Include="Corvus.Tenancy.Storage.Azure.Blob" Version="0.18.0" />
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.29" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.0.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
-    <PackageReference Include="Serilog.Sinks.AzureTableStorage" Version="4.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Solutions/Marain.Tenancy.Host.Functions/Marain/Tenancy/Functions/Startup.cs b/Solutions/Marain.Tenancy.Host.Functions/Marain/Tenancy/Functions/Startup.cs
@@ -6,6 +6,7 @@
 
 namespace Marain.Tenancy.ControlHost
 {
+    using System;
     using Microsoft.Azure.WebJobs;
     using Microsoft.Azure.WebJobs.Hosting;
     using Microsoft.Extensions.Configuration;
@@ -23,17 +24,24 @@ public void Configure(IWebJobsBuilder builder)
         {
             IServiceCollection services = builder.Services;
 
-            LoggerConfiguration loggerConfig = new LoggerConfiguration()
-                    .Enrich.FromLogContext()
-                    .MinimumLevel.Debug()
-                    .WriteTo.Logger(lc => lc.WriteTo.Console().MinimumLevel.Debug())
-                    .WriteTo.Logger(lc => lc.WriteTo.Debug().MinimumLevel.Debug());
-
-            Log.Logger = loggerConfig.CreateLogger();
+            services.AddLogging();
 
             IConfigurationRoot root = Configure(services);
 
-            services.AddTenancyApi(root, config => config.Documents.AddSwaggerEndpoint());
+            services.AddTenancyApi(root, config =>
+            {
+                if (config == null)
+                {
+                    throw new ArgumentNullException(nameof(config), "AddTenancyApi callback: config");
+                }
+
+                if (config.Documents == null)
+                {
+                    throw new ArgumentNullException(nameof(config.Documents), "AddTenancyApi callback: config.Documents");
+                }
+
+                config.Documents.AddSwaggerEndpoint();
+            });
         }
 
         private static IConfigurationRoot Configure(IServiceCollection services)

diff --git a/Solutions/Marain.Tenancy.Hosting.AspNetCore/Marain.Tenancy.Hosting.AspNetCore.csproj b/Solutions/Marain.Tenancy.Hosting.AspNetCore/Marain.Tenancy.Hosting.AspNetCore.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="0.18.0" />
     <PackageReference Include="Corvus.Tenancy.Abstractions" Version="0.18.0" />
     <PackageReference Include="Corvus.Tenancy.Storage.Azure.Blob" Version="0.18.0" />
-    <PackageReference Include="Menes.Abstractions" Version="0.8.0" />
+    <PackageReference Include="Menes.Abstractions" Version="0.9.0" />
     <PackageReference Include="Menes.Hosting.AspNetCore" Version="0.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>

diff --git a/Solutions/Marain.Tenancy.OpenApi.Service/Marain.Tenancy.OpenApi.Service.csproj b/Solutions/Marain.Tenancy.OpenApi.Service/Marain.Tenancy.OpenApi.Service.csproj
@@ -25,7 +25,7 @@
 
   <ItemGroup>
     <PackageReference Include="Corvus.Azure.Storage.Tenancy" Version="0.18.0" />
-    <PackageReference Include="Menes.Abstractions" Version="0.8.0" />
+    <PackageReference Include="Menes.Abstractions" Version="0.9.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />

diff --git a/Solutions/Marain.Tenancy.sln b/Solutions/Marain.Tenancy.sln
@@ -20,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marain.Tenancy.Specs", "Mar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marain.Tenancy.Client", "Marain.Tenancy.Client\Marain.Tenancy.Client.csproj", "{E2682002-CE47-4189-AEAD-AB3F6EFC4E49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marain.Tenancy.ClientTenantProvider", "Marain.Tenancy.ClientTenantProvider\Marain.Tenancy.ClientTenantProvider.csproj", "{97382102-88AF-405C-9992-9E743634458A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marain.Tenancy.ClientTenantProvider", "Marain.Tenancy.ClientTenantProvider\Marain.Tenancy.ClientTenantProvider.csproj", "{97382102-88AF-405C-9992-9E743634458A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution