From a5435fe15d25675b1ef89d02179e796a9d8707dd Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Thu, 26 Jul 2018 15:35:42 +0100
Subject: [PATCH] Upgraded to .net 2.1.2 (Includes security fixes)

---
 appveyor.yml                  | 10 +++++-----
 build.cake                    |  2 +-
 src/Ombi/Ombi.csproj          |  2 +-
 src/Ombi/Startup.cs           |  2 --
 src/Ombi/StartupExtensions.cs | 13 +------------
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 39d67b91d..862993a21 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,19 +15,19 @@ test: off
 after_build:
 - cmd: >-
     
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\windows.zip"
+    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.1\windows.zip"
     
     
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\osx.tar.gz"  
+    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.1\osx.tar.gz"  
     
     
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\linux.tar.gz"
+    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.1\linux.tar.gz"
 
     
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\linux-arm.tar.gz"
+    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.1\linux-arm.tar.gz"
 
     
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\windows-32bit.zip"
+    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.1\windows-32bit.zip"
 
     
 #   appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.0\linux-arm64.tar.gz"
diff --git a/build.cake b/build.cake
index a497c5f77..d200eac98 100644
--- a/build.cake
+++ b/build.cake
@@ -26,7 +26,7 @@ var csProj = "./src/Ombi/Ombi.csproj";          // Path to the project.csproj
 var solutionFile = "Ombi.sln";                  // Solution file if needed
 GitVersion versionInfo = null;
 
-var frameworkVer = "netcoreapp2.0";
+var frameworkVer = "netcoreapp2.1";
 
 var buildSettings = new DotNetCoreBuildSettings
 {
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index 06fc02b81..f2adbe506 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -67,7 +67,7 @@
     <PackageReference Include="Hangfire.RecurringJobExtensions" Version="1.1.6" />
     <PackageReference Include="Hangfire.SQLite" Version="1.4.2" />
 
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" />
diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
index b8a841592..42503a5c6 100644
--- a/src/Ombi/Startup.cs
+++ b/src/Ombi/Startup.cs
@@ -5,7 +5,6 @@ using AutoMapper.EquivalencyExpression;
 using Hangfire;
 using Hangfire.Dashboard;
 using Hangfire.SQLite;
-using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpOverrides;
@@ -79,7 +78,6 @@ namespace Ombi
         // This method gets called by the runtime. Use this method to add services to the container.
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            TelemetryConfiguration.Active.DisableTelemetry = true;
             // Add framework services.
             services.AddDbContext<OmbiContext>();
 
diff --git a/src/Ombi/StartupExtensions.cs b/src/Ombi/StartupExtensions.cs
index a2c44e7f3..0304ae48d 100644
--- a/src/Ombi/StartupExtensions.cs
+++ b/src/Ombi/StartupExtensions.cs
@@ -1,25 +1,14 @@
 using System;
 using System.IO;
-using System.Linq;
-using System.Net;
 using System.Reflection;
-using System.Security.Principal;
 using System.Text;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.IdentityModel.Tokens;
 using Ombi.Config;
-using Ombi.Core.Authentication;
-using Ombi.Core.Settings;
 using Ombi.Helpers;
 using Ombi.Models.Identity;
-using Ombi.Settings.Settings.Models;
 using Swashbuckle.AspNetCore.Swagger;
 
 namespace Ombi
@@ -45,7 +34,7 @@ namespace Ombi
                     }
                 });
                 c.CustomSchemaIds(x => x.FullName);
-                var basePath = PlatformServices.Default.Application.ApplicationBasePath;
+                var basePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
                 var xmlPath = Path.Combine(basePath, "Swagger.xml");
                 try
                 {