From 95c5c839f0e6570893d5f1b5e3030cb9d7823b47 Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Wed, 13 Sep 2017 08:25:05 +0100 Subject: [PATCH] Upgraded to .net core 2.0 #1486 --- global.json | 2 +- src/Ombi.Api.Discord/Ombi.Api.Discord.csproj | 2 +- src/Ombi.Api.Emby/Ombi.Api.Emby.csproj | 2 +- .../Ombi.Api.FanartTv.csproj | 2 +- .../Ombi.Api.Mattermost.csproj | 2 +- src/Ombi.Api.Plex/Ombi.Api.Plex.csproj | 2 +- .../Ombi.Api.Pushbullet.csproj | 2 +- .../Ombi.Api.Pushover.csproj | 2 +- src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj | 4 +-- src/Ombi.Api.Service/Ombi.Api.Service.csproj | 4 +-- src/Ombi.Api.Slack/Ombi.Api.Slack.csproj | 2 +- src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj | 2 +- src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj | 2 +- src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj | 2 +- src/Ombi.Api/Ombi.Api.csproj | 4 +-- src/Ombi.Core.Tests/Ombi.Core.Tests.csproj | 2 +- src/Ombi.Core/Ombi.Core.csproj | 6 ++-- .../Ombi.DependencyInjection.csproj | 8 ++--- src/Ombi.Helpers/Ombi.Helpers.csproj | 4 +-- src/Ombi.Mapping/Ombi.Mapping.csproj | 2 +- .../Ombi.Notifications.Templates.csproj | 2 +- .../Ombi.Notifications.Tests.csproj | 2 +- .../Ombi.Notifications.csproj | 2 +- .../Ombi.Schedule.Tests.csproj | 4 +-- .../PlexAvailabilityCheckerTests.cs | 4 +-- src/Ombi.Schedule/Ombi.Schedule.csproj | 2 +- src/Ombi.Settings/Ombi.Settings.csproj | 4 +-- src/Ombi.Store/Entities/OmbiUser.cs | 2 +- src/Ombi.Store/Ombi.Store.csproj | 13 ++++---- .../Ombi.Api.TheMovieDb.csproj | 2 +- src/Ombi.Updater/Ombi.Updater.csproj | 2 +- src/Ombi/Ombi.csproj | 24 +++++--------- src/Ombi/Program.cs | 18 +++++------ src/Ombi/Startup.cs | 32 +++++++++++-------- 34 files changed, 83 insertions(+), 88 deletions(-) diff --git a/global.json b/global.json index 676999ef9..56fc9d4cc 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "1.1.0" + "version": "2.0.0" } } \ No newline at end of file diff --git a/src/Ombi.Api.Discord/Ombi.Api.Discord.csproj b/src/Ombi.Api.Discord/Ombi.Api.Discord.csproj index 579902701..321c1f333 100644 --- a/src/Ombi.Api.Discord/Ombi.Api.Discord.csproj +++ b/src/Ombi.Api.Discord/Ombi.Api.Discord.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Emby/Ombi.Api.Emby.csproj b/src/Ombi.Api.Emby/Ombi.Api.Emby.csproj index c6c440743..0e6e0d01d 100644 --- a/src/Ombi.Api.Emby/Ombi.Api.Emby.csproj +++ b/src/Ombi.Api.Emby/Ombi.Api.Emby.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj b/src/Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj index 579902701..321c1f333 100644 --- a/src/Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj +++ b/src/Ombi.Api.FanartTv/Ombi.Api.FanartTv.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj b/src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj index 1375dd07c..ca15bae05 100644 --- a/src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj +++ b/src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj @@ -1,7 +1,7 @@ - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj b/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj index 16caae0b5..f1a3b8ec7 100644 --- a/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj +++ b/src/Ombi.Api.Plex/Ombi.Api.Plex.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj b/src/Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj index 579902701..321c1f333 100644 --- a/src/Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj +++ b/src/Ombi.Api.Pushbullet/Ombi.Api.Pushbullet.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Pushover/Ombi.Api.Pushover.csproj b/src/Ombi.Api.Pushover/Ombi.Api.Pushover.csproj index 4245b64cf..ce5475fae 100644 --- a/src/Ombi.Api.Pushover/Ombi.Api.Pushover.csproj +++ b/src/Ombi.Api.Pushover/Ombi.Api.Pushover.csproj @@ -1,7 +1,7 @@ - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj b/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj index 60538f620..fa6f5dfb9 100644 --- a/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj +++ b/src/Ombi.Api.Radarr/Ombi.Api.Radarr.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -9,7 +9,7 @@ - + diff --git a/src/Ombi.Api.Service/Ombi.Api.Service.csproj b/src/Ombi.Api.Service/Ombi.Api.Service.csproj index 54fc21118..794e01d30 100644 --- a/src/Ombi.Api.Service/Ombi.Api.Service.csproj +++ b/src/Ombi.Api.Service/Ombi.Api.Service.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -11,7 +11,7 @@ - + diff --git a/src/Ombi.Api.Slack/Ombi.Api.Slack.csproj b/src/Ombi.Api.Slack/Ombi.Api.Slack.csproj index 579902701..321c1f333 100644 --- a/src/Ombi.Api.Slack/Ombi.Api.Slack.csproj +++ b/src/Ombi.Api.Slack/Ombi.Api.Slack.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj b/src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj index 579902701..321c1f333 100644 --- a/src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj +++ b/src/Ombi.Api.Sonarr/Ombi.Api.Sonarr.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj b/src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj index 2b9cc9adc..578131238 100644 --- a/src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj +++ b/src/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj b/src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj index c6c440743..0e6e0d01d 100644 --- a/src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj +++ b/src/Ombi.Api.TvMaze/Ombi.Api.TvMaze.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Api/Ombi.Api.csproj b/src/Ombi.Api/Ombi.Api.csproj index d9b593b9c..afbe5ea20 100644 --- a/src/Ombi.Api/Ombi.Api.csproj +++ b/src/Ombi.Api/Ombi.Api.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -9,7 +9,7 @@ - + diff --git a/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj b/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj index 20321dae1..aacbf66a9 100644 --- a/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj +++ b/src/Ombi.Core.Tests/Ombi.Core.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp1.1 + netcoreapp2.0 diff --git a/src/Ombi.Core/Ombi.Core.csproj b/src/Ombi.Core/Ombi.Core.csproj index 1cbe7c803..e837d8009 100644 --- a/src/Ombi.Core/Ombi.Core.csproj +++ b/src/Ombi.Core/Ombi.Core.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -12,8 +12,8 @@ - - + + diff --git a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj index 6bf22e8a7..124d81439 100644 --- a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj +++ b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Ombi.Helpers/Ombi.Helpers.csproj b/src/Ombi.Helpers/Ombi.Helpers.csproj index a48bbcfaf..f5d481daf 100644 --- a/src/Ombi.Helpers/Ombi.Helpers.csproj +++ b/src/Ombi.Helpers/Ombi.Helpers.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Ombi.Mapping/Ombi.Mapping.csproj b/src/Ombi.Mapping/Ombi.Mapping.csproj index 6518eef84..b25c4f3e9 100644 --- a/src/Ombi.Mapping/Ombi.Mapping.csproj +++ b/src/Ombi.Mapping/Ombi.Mapping.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Notifications.Templates/Ombi.Notifications.Templates.csproj b/src/Ombi.Notifications.Templates/Ombi.Notifications.Templates.csproj index 7c8695cee..085c44dc1 100644 --- a/src/Ombi.Notifications.Templates/Ombi.Notifications.Templates.csproj +++ b/src/Ombi.Notifications.Templates/Ombi.Notifications.Templates.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj index d6b0a4d1a..d3576132b 100644 --- a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj +++ b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp1.1 + netcoreapp2.0 diff --git a/src/Ombi.Notifications/Ombi.Notifications.csproj b/src/Ombi.Notifications/Ombi.Notifications.csproj index 9bdcaf566..b87e427bb 100644 --- a/src/Ombi.Notifications/Ombi.Notifications.csproj +++ b/src/Ombi.Notifications/Ombi.Notifications.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj b/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj index dd9930445..9cb0c6641 100644 --- a/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj +++ b/src/Ombi.Schedule.Tests/Ombi.Schedule.Tests.csproj @@ -1,12 +1,12 @@ - netcoreapp1.1 + netcoreapp2.0 - + diff --git a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs index 1b5e532e9..9372e077a 100644 --- a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs +++ b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs @@ -70,7 +70,7 @@ namespace Ombi.Schedule.Tests { var request = new ChildRequests { - ParentRequest = new TvRequests {TvDbId = 1}, + ParentRequest = new TvRequests { TvDbId = 1 }, SeasonRequests = new EditableList { new SeasonRequests @@ -108,7 +108,7 @@ namespace Ombi.Schedule.Tests _tv.Verify(x => x.Save(), Times.Once); Assert.True(request.SeasonRequests[0].Episodes[0].Available); - + } } } \ No newline at end of file diff --git a/src/Ombi.Schedule/Ombi.Schedule.csproj b/src/Ombi.Schedule/Ombi.Schedule.csproj index 7401be829..10e361f0f 100644 --- a/src/Ombi.Schedule/Ombi.Schedule.csproj +++ b/src/Ombi.Schedule/Ombi.Schedule.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Settings/Ombi.Settings.csproj b/src/Ombi.Settings/Ombi.Settings.csproj index cbfc6f108..5a99cc830 100644 --- a/src/Ombi.Settings/Ombi.Settings.csproj +++ b/src/Ombi.Settings/Ombi.Settings.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -9,7 +9,7 @@ - + diff --git a/src/Ombi.Store/Entities/OmbiUser.cs b/src/Ombi.Store/Entities/OmbiUser.cs index 377e47247..668e04bcf 100644 --- a/src/Ombi.Store/Entities/OmbiUser.cs +++ b/src/Ombi.Store/Entities/OmbiUser.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations.Schema; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity; namespace Ombi.Store.Entities { diff --git a/src/Ombi.Store/Ombi.Store.csproj b/src/Ombi.Store/Ombi.Store.csproj index 62d1b6567..0d8b793d5 100644 --- a/src/Ombi.Store/Ombi.Store.csproj +++ b/src/Ombi.Store/Ombi.Store.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 3.0.0.0 3.0.0.0 @@ -9,15 +9,14 @@ - - - - - + + + + - + diff --git a/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj b/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj index 5c54cad74..66689e1c6 100644 --- a/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj +++ b/src/Ombi.TheMovieDbApi/Ombi.Api.TheMovieDb.csproj @@ -1,7 +1,7 @@  - netstandard1.6 + netstandard2.0 Ombi.Api.TheMovieDb 3.0.0.0 3.0.0.0 diff --git a/src/Ombi.Updater/Ombi.Updater.csproj b/src/Ombi.Updater/Ombi.Updater.csproj index fb2a9d892..94c20f44a 100644 --- a/src/Ombi.Updater/Ombi.Updater.csproj +++ b/src/Ombi.Updater/Ombi.Updater.csproj @@ -3,7 +3,7 @@ Exe win10-x64;osx.10.12-x64;ubuntu.16.04-x64;debian.8-x64;centos.7-x64; - netcoreapp1.1 + netcoreapp2.0 3.0.0.0 3.0.0.0 diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 9a3c0686f..0e855d934 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -1,7 +1,7 @@  - netcoreapp1.1 + netcoreapp2.0 win10-x64;osx.10.12-x64;ubuntu.16.04-x64;debian.8-x64;centos.7-x64; false 2.3 @@ -12,12 +12,12 @@ - bin\Debug\netcoreapp1.1\Swagger.xml + bin\Debug\netcoreapp2.0\Swagger.xml 1701;1702;1705;1591; - bin\Release\netcoreapp1.1\Swagger.xml + bin\Release\netcoreapp2.0\Swagger.xml @@ -47,19 +47,11 @@ - - - - - - - - - - - - - + + + + + diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs index 6c5a3f737..b53e31b10 100644 --- a/src/Ombi/Program.cs +++ b/src/Ombi/Program.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Configuration; using Ombi.Store.Context; using Ombi.Store.Entities; using CommandLine; +using Microsoft.AspNetCore; namespace Ombi { @@ -68,17 +69,14 @@ namespace Ombi Console.WriteLine($"We are running on {urlValue}"); - var webHost = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseUrls(urlArgs) - .UseStartup() - .Build(); - - - webHost.Run(); + BuildWebHost(args, urlArgs).Run(); } + + public static IWebHost BuildWebHost(string[] args, string urlArgs) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .UseUrls(urlArgs) + .Build(); } public class Options diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 0c87a7ae6..44578c292 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -7,9 +7,11 @@ using AutoMapper.EquivalencyExpression; using Hangfire; using Hangfire.Dashboard; using Hangfire.MemoryStorage; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.SpaServices.Webpack; using Microsoft.AspNetCore.StaticFiles; @@ -153,21 +155,17 @@ namespace Ombi //x.UseSQLiteStorage("Data Source=Ombi.db;"); x.UseActivator(new IoCJobActivator(services.BuildServiceProvider())); }); - } - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IMemoryCache cache) - { - var tokenOptions = (IOptions)app.ApplicationServices.GetService( - typeof(IOptions)); - var ctx = (IOmbiContext)app.ApplicationServices.GetService(typeof(IOmbiContext)); + var tokenOptions = Configuration.GetSection("TokenAuthentication"); + + var tokenValidationParameters = new TokenValidationParameters { ValidateIssuerSigningKey = true, - IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(tokenOptions.Value.SecretKey)), + IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(tokenOptions.GetValue("SecretKey", string.Empty))), RequireExpirationTime = true, ValidateLifetime = true, @@ -176,14 +174,22 @@ namespace Ombi ClockSkew = TimeSpan.Zero }; - app.UseJwtBearerAuthentication(new JwtBearerOptions() + services.AddAuthentication().AddJwtBearer(x => { - Audience = "Ombi", - AutomaticAuthenticate = true, - TokenValidationParameters = tokenValidationParameters, - + x.Audience = "Ombi"; + x.TokenValidationParameters = tokenValidationParameters; }); + } + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, IMemoryCache cache) + { + + var ctx = (IOmbiContext)app.ApplicationServices.GetService(typeof(IOmbiContext)); + + + + app.UseAuthentication(); loggerFactory.AddSerilog();