From 2171768757083b88dfdec9164a4ad24ebdb1d75c Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 30 Sep 2020 22:36:09 +0100 Subject: [PATCH] package updates --- src/Ombi.Api.Plex/Ombi.Api.Plex.csproj | 4 ---- src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj | 2 +- src/Ombi.Api.Service/Ombi.Api.Service.csproj | 2 +- src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj | 2 +- src/Ombi.Api/Ombi.Api.csproj | 3 +-- src/Ombi.Core.Tests/Ombi.Core.Tests.csproj | 2 +- src/Ombi.Core/Ombi.Core.csproj | 8 ++++---- .../Ombi.DependencyInjection.csproj | 4 ++-- .../Ombi.Helpers.Tests.csproj | 2 +- src/Ombi.Helpers/Ombi.Helpers.csproj | 6 +++--- src/Ombi.Mapping/AutoMapperProfile.cs | 19 ++++++++++--------- src/Ombi.Mapping/Ombi.Mapping.csproj | 6 +++--- .../Ombi.Notifications.Tests.csproj | 2 +- .../Ombi.Schedule.Tests.csproj | 2 +- src/Ombi.Schedule/Ombi.Schedule.csproj | 2 +- .../Ombi.Settings.Tests.csproj | 2 +- src/Ombi.Settings/Ombi.Settings.csproj | 4 ++-- src/Ombi.Store/Ombi.Store.csproj | 6 +++--- src/Ombi.Tests/Ombi.Tests.csproj | 4 ++-- .../Ombi.Api.TheMovieDb.csproj | 2 +- src/Ombi.Updater/Ombi.Updater.csproj | 16 ++++++++-------- src/Ombi/Ombi.csproj | 16 +++++++--------- src/Ombi/Startup.cs | 11 +++++------ 23 files changed, 60 insertions(+), 67 deletions(-) diff --git a/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj b/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj index e5f5b3394..5c67fe577 100644 --- a/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj +++ b/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj @@ -9,10 +9,6 @@ 8.0 - - - - diff --git a/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj b/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj index 4fc0becae..07b8c609f 100644 --- a/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj +++ b/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Ombi.Api.Service/Ombi.Api.Service.csproj b/src/Ombi.Api.Service/Ombi.Api.Service.csproj index 2a434c8cd..18ae372a2 100644 --- a/src/Ombi.Api.Service/Ombi.Api.Service.csproj +++ b/src/Ombi.Api.Service/Ombi.Api.Service.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj b/src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj index d55f9680a..dd350ff91 100644 --- a/src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj +++ b/src/Ombi.Api.Twilio/Ombi.Api.Twilio.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + netstandard2.1 diff --git a/src/Ombi.Api/Ombi.Api.csproj b/src/Ombi.Api/Ombi.Api.csproj index 34e051c00..a6af5851f 100644 --- a/src/Ombi.Api/Ombi.Api.csproj +++ b/src/Ombi.Api/Ombi.Api.csproj @@ -10,10 +10,9 @@ - + - diff --git a/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj b/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj index 4f2662c76..2be1554de 100644 --- a/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj +++ b/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj @@ -16,7 +16,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Ombi.Core/Ombi.Core.csproj b/src/Ombi.Core/Ombi.Core.csproj index 99c531183..4f987cea3 100644 --- a/src/Ombi.Core/Ombi.Core.csproj +++ b/src/Ombi.Core/Ombi.Core.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj index 3661731de..9dfb38770 100644 --- a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj +++ b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj @@ -10,9 +10,9 @@ - + - + diff --git a/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj b/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj index 1046f9e68..7fd44f346 100644 --- a/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj +++ b/src/Ombi.Helpers.Tests/Ombi.Helpers.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Ombi.Helpers/Ombi.Helpers.csproj b/src/Ombi.Helpers/Ombi.Helpers.csproj index cd33b9455..6b129146e 100644 --- a/src/Ombi.Helpers/Ombi.Helpers.csproj +++ b/src/Ombi.Helpers/Ombi.Helpers.csproj @@ -11,11 +11,11 @@ - - + + - + diff --git a/src/Ombi.Mapping/AutoMapperProfile.cs b/src/Ombi.Mapping/AutoMapperProfile.cs index a39bc8e71..1625d7000 100644 --- a/src/Ombi.Mapping/AutoMapperProfile.cs +++ b/src/Ombi.Mapping/AutoMapperProfile.cs @@ -2,8 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using AutoMapper; using AutoMapper.Configuration; using Microsoft.Extensions.DependencyInjection; +using Ombi.Mapping.Profiles; namespace Ombi.Mapping { @@ -11,18 +13,17 @@ namespace Ombi.Mapping { public static IServiceCollection AddOmbiMappingProfile(this IServiceCollection services) { - Assembly ass = typeof(AutoMapperProfile).GetTypeInfo().Assembly; - var assemblies = new List(); - foreach (TypeInfo ti in ass.DefinedTypes) + var profiles = new List { - if (ti.ImplementedInterfaces.Contains(typeof(IProfileConfiguration))) - { - assemblies.Add(ti.AsType()); - } - } + new MovieProfile(), + new OmbiProfile(), + new SettingsProfile(), + new TvProfile(), + new TvProfileV2() + }; var config = new AutoMapper.MapperConfiguration(cfg => { - cfg.AddProfiles(assemblies); + cfg.AddProfiles(profiles); }); var mapper = config.CreateMapper(); diff --git a/src/Ombi.Mapping/Ombi.Mapping.csproj b/src/Ombi.Mapping/Ombi.Mapping.csproj index 2f5172663..0b8645b08 100644 --- a/src/Ombi.Mapping/Ombi.Mapping.csproj +++ b/src/Ombi.Mapping/Ombi.Mapping.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj index ecbcbdae2..d73f6c745 100644 --- a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj +++ b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj b/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj index 5c6cae7d0..217d4997d 100644 --- a/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj +++ b/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Ombi.Schedule/Ombi.Schedule.csproj b/src/Ombi.Schedule/Ombi.Schedule.csproj index a6d992c0e..41d15d503 100644 --- a/src/Ombi.Schedule/Ombi.Schedule.csproj +++ b/src/Ombi.Schedule/Ombi.Schedule.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Ombi.Settings.Tests/Ombi.Settings.Tests.csproj b/src/Ombi.Settings.Tests/Ombi.Settings.Tests.csproj index d55c38004..a8674b9f2 100644 --- a/src/Ombi.Settings.Tests/Ombi.Settings.Tests.csproj +++ b/src/Ombi.Settings.Tests/Ombi.Settings.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Ombi.Settings/Ombi.Settings.csproj b/src/Ombi.Settings/Ombi.Settings.csproj index 1012f01e0..8f2d80251 100644 --- a/src/Ombi.Settings/Ombi.Settings.csproj +++ b/src/Ombi.Settings/Ombi.Settings.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Ombi.Store/Ombi.Store.csproj b/src/Ombi.Store/Ombi.Store.csproj index dade5a1b9..9d6bc3e92 100644 --- a/src/Ombi.Store/Ombi.Store.csproj +++ b/src/Ombi.Store/Ombi.Store.csproj @@ -11,12 +11,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Ombi.Tests/Ombi.Tests.csproj b/src/Ombi.Tests/Ombi.Tests.csproj index 25fdd3ebe..f4346de50 100644 --- a/src/Ombi.Tests/Ombi.Tests.csproj +++ b/src/Ombi.Tests/Ombi.Tests.csproj @@ -7,13 +7,13 @@ - + - + diff --git a/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj b/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj index c3713684c..2f8b0ce3b 100644 --- a/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj +++ b/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Ombi.Updater/Ombi.Updater.csproj b/src/Ombi.Updater/Ombi.Updater.csproj index 1a305bb14..b23f3297a 100644 --- a/src/Ombi.Updater/Ombi.Updater.csproj +++ b/src/Ombi.Updater/Ombi.Updater.csproj @@ -12,14 +12,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 800b864bf..7fd6ce5a9 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -60,14 +60,12 @@ - - - + - + - - + + @@ -78,9 +76,9 @@ - - - + + + diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index ae78f1d28..f80b8139a 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -28,7 +28,6 @@ using Microsoft.AspNetCore.StaticFiles.Infrastructure; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using ILogger = Serilog.ILogger; -using HealthChecks.UI.Client; using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Ombi.HealthChecks; @@ -218,12 +217,12 @@ namespace Ombi endpoints.MapHealthChecks("/health", new HealthCheckOptions { Predicate = _ => true, - ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse - }); - endpoints.MapHealthChecksUI(opts => - { - opts.AddCustomStylesheet("HealthCheck.css"); + //ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse }); + //endpoints.MapHealthChecksUI(opts => + //{ + // opts.AddCustomStylesheet("HealthCheck.css"); + //}); } });