fix(entity): change entity settings and plugins

BeeWeatherPollenTracker/App.config

@@ -66,24 +66,26 @@
     </DbProviderFactories>
   </system.data>
   
-  <!-- Connection string -->
+  <!-- Connection settings-->
   <connectionStrings>
     <add name="delmeEntities" connectionString="metadata=res://*/BeeWeatherModel.csdl|res://*/BeeWeatherModel.ssdl|res://*/BeeWeatherModel.msl;provider=MySql.Data.MySqlClient;provider connection string=&quot;server=digitalbeekeeper.de;user id=cnam1;password=Belana2016();persistsecurityinfo=True;database=delme&quot;" providerName="System.Data.EntityClient" />
     <add name="delmeEntities1" connectionString="metadata=res://*/BeesWeatherModel.csdl|res://*/BeesWeatherModel.ssdl|res://*/BeesWeatherModel.msl;provider=MySql.Data.MySqlClient;provider connection string=&quot;server=digitalbeekeeper.de;user id=cnam1;password=Belana2016();persistsecurityinfo=True;database=delme&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   
-  <!-- Application Settings -->
+  <!-- Application settings-->
   <appSettings>
     <add key="CityId" value="2925533" />
     <add key="PartregionId" value="91" />
   </appSettings>
-
-  <!-- Entity Framwork -->
-  <entityFramework codeConfigurationType="MySql.Data.Entity.MySqlEFConfiguration, MySql.Data.Entity.EF6">
+  
+  <!-- Enity framework -->
+  <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
     <providers>
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-    </providers>
+      
+    <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
+      </provider></providers>
   </entityFramework>
+  
 </configuration>
\ No newline at end of file

BeeWeatherPollenTracker/BeeWeatherPollenTracker.csproj

@@ -44,8 +44,8 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.Entity.6.10.9\lib\net452\MySql.Data.Entity.EF6.dll</HintPath>
+    <Reference Include="MySql.Data.EntityFramework, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.19\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\WeatherNet.2.1\lib\Newtonsoft.Json.dll</HintPath>
@@ -101,7 +101,6 @@
     <Reference Include="MySql.Data, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.8.0.19\lib\net452\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.EntityFramework, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL" />
     <Reference Include="MySqlConnector, Version=0.62.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
       <HintPath>..\packages\MySqlConnector.0.62.0\lib\net471\MySqlConnector.dll</HintPath>
     </Reference>

BeeWeatherPollenTracker/BeesWeatherModel.Context.cs

@@ -9,7 +9,8 @@
 
 namespace BeeWeatherPollenTracker
 {
-    using MySql.Data.Entity;
+    using MySql.Data.EntityFramework;
+    using System;
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
 

BeeWeatherPollenTracker/Program.cs

@@ -25,11 +25,15 @@ namespace BeeWeatherPollenTracker
 
         private static void Main(string[] args)
         {
+<<<<<<< HEAD
             /*
              * Settings
              */
 
             // Set Entity Configuration 
+=======
+            // Entity Framework setup
+>>>>>>> fix(entity): change entity settings and plugins
             DbConfiguration.SetConfiguration(new MySqlEFConfiguration());
             // Set up API KEY
             ClientSettings.SetApiKey(OPEN_WEATHER_MAP_API_KEY);

BeeWeatherPollenTracker/packages.config

@@ -21,7 +21,7 @@
   <package id="Microsoft.Extensions.Options" version="3.1.2" targetFramework="net472" />
   <package id="Microsoft.Extensions.Primitives" version="3.1.2" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.19" targetFramework="net472" />
-  <package id="MySql.Data.Entity" version="6.10.9" targetFramework="net472" />
+  <package id="MySql.Data.EntityFramework" version="8.0.19" targetFramework="net472" />
   <package id="MySqlConnector" version="0.62.0" targetFramework="net472" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net472" />