From 1056bd53ae4cba40f7169d7006ccb7377c725e30 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 15 Oct 2017 15:41:43 -0500
Subject: [PATCH] upgrade to dotnet core 2.0, change data provider

---
 src/FilterLists.Api/FilterLists.Api.csproj          | 13 ++++++-------
 .../Extensions/ConfigureServicesCollection.cs       |  7 +++----
 src/FilterLists.Data/FilterLists.Data.csproj        |  8 ++++----
 .../FilterLists.DataLoad.csproj                     |  8 ++++----
 .../FilterLists.Services.csproj                     |  4 ++--
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj
index 2d08a0969..16b17da44 100644
--- a/src/FilterLists.Api/FilterLists.Api.csproj
+++ b/src/FilterLists.Api/FilterLists.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
@@ -10,14 +10,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,4 +24,4 @@
     <ProjectReference Include="..\FilterLists.Services\FilterLists.Services.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 2e98b73ac..f7b9c9122 100644
--- a/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -1,11 +1,10 @@
 using FilterLists.Data.Contexts;
 using FilterLists.Data.Repositories.Contracts;
 using FilterLists.Data.Repositories.Implementations;
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using MySQL.Data.Entity.Extensions;
 
 namespace FilterLists.Data.DependencyInjection.Extensions
 {
@@ -14,9 +13,9 @@ public static class ConfigureServicesCollection
         public static void AddFilterListsRepositories(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddSingleton(c => configuration);
-            services.AddEntityFramework()
+            services.AddEntityFrameworkMySql()
                 .AddDbContext<FilterListsDbContext>(options =>
-                    options.UseMySQL(configuration.GetConnectionString("FilterListsConnection")));
+                    options.UseMySql(configuration.GetConnectionString("FilterListsConnection")));
             services.TryAddScoped<IListRepository, ListRepository>();
             services.TryAddScoped<ITableCsvRepository, TableCsvRepository>();
         }
diff --git a/src/FilterLists.Data/FilterLists.Data.csproj b/src/FilterLists.Data/FilterLists.Data.csproj
index 2c151e999..07fa49a64 100644
--- a/src/FilterLists.Data/FilterLists.Data.csproj
+++ b/src/FilterLists.Data/FilterLists.Data.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
-    <PackageReference Include="SapientGuardian.EntityFrameworkCore.MySql" Version="7.1.23" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj b/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj
index e89309558..2a2ca9c2f 100644
--- a/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj
+++ b/src/FilterLists.DataLoad/FilterLists.DataLoad.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj
index 6be1f0254..76c4f5a95 100644
--- a/src/FilterLists.Services/FilterLists.Services.csproj
+++ b/src/FilterLists.Services/FilterLists.Services.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>