Commit 7091d81e authored by Anthony Mochel's avatar Anthony Mochel
Browse files

fix(entity): change entity settings and plugins

parent ab4fba15
...@@ -66,24 +66,26 @@ ...@@ -66,24 +66,26 @@
</DbProviderFactories> </DbProviderFactories>
</system.data> </system.data>
<!-- Connection string --> <!-- Connection settings-->
<connectionStrings> <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="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" /> <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> </connectionStrings>
<!-- Application Settings --> <!-- Application settings-->
<appSettings> <appSettings>
<add key="CityId" value="2925533" /> <add key="CityId" value="2925533" />
<add key="PartregionId" value="91" /> <add key="PartregionId" value="91" />
</appSettings> </appSettings>
<!-- Entity Framwork --> <!-- Enity framework -->
<entityFramework codeConfigurationType="MySql.Data.Entity.MySqlEFConfiguration, MySql.Data.Entity.EF6"> <entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" /> <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
<providers> <providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" /> <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> </entityFramework>
</configuration> </configuration>
\ No newline at end of file
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <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> <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference> </Reference>
<Reference Include="MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> <Reference Include="MySql.Data.EntityFramework, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.Entity.6.10.9\lib\net452\MySql.Data.Entity.EF6.dll</HintPath> <HintPath>..\packages\MySql.Data.EntityFramework.8.0.19\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <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> <HintPath>..\packages\WeatherNet.2.1\lib\Newtonsoft.Json.dll</HintPath>
...@@ -101,7 +101,6 @@ ...@@ -101,7 +101,6 @@
<Reference Include="MySql.Data, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL"> <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> <HintPath>..\packages\MySql.Data.8.0.19\lib\net452\MySql.Data.dll</HintPath>
</Reference> </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"> <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> <HintPath>..\packages\MySqlConnector.0.62.0\lib\net471\MySqlConnector.dll</HintPath>
</Reference> </Reference>
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
namespace BeeWeatherPollenTracker namespace BeeWeatherPollenTracker
{ {
using MySql.Data.Entity; using MySql.Data.EntityFramework;
using System;
using System.Data.Entity; using System.Data.Entity;
using System.Data.Entity.Infrastructure; using System.Data.Entity.Infrastructure;
......
...@@ -25,11 +25,15 @@ namespace BeeWeatherPollenTracker ...@@ -25,11 +25,15 @@ namespace BeeWeatherPollenTracker
private static void Main(string[] args) private static void Main(string[] args)
{ {
<<<<<<< HEAD
/* /*
* Settings * Settings
*/ */
// Set Entity Configuration // Set Entity Configuration
=======
// Entity Framework setup
>>>>>>> fix(entity): change entity settings and plugins
DbConfiguration.SetConfiguration(new MySqlEFConfiguration()); DbConfiguration.SetConfiguration(new MySqlEFConfiguration());
// Set up API KEY // Set up API KEY
ClientSettings.SetApiKey(OPEN_WEATHER_MAP_API_KEY); ClientSettings.SetApiKey(OPEN_WEATHER_MAP_API_KEY);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<package id="Microsoft.Extensions.Options" version="3.1.2" targetFramework="net472" /> <package id="Microsoft.Extensions.Options" version="3.1.2" targetFramework="net472" />
<package id="Microsoft.Extensions.Primitives" 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" 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="MySqlConnector" version="0.62.0" targetFramework="net472" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net472" /> <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
<package id="System.Buffers" version="4.4.0" targetFramework="net472" /> <package id="System.Buffers" version="4.4.0" targetFramework="net472" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment