diff --git a/.nuget/NuGet.exe.old b/.nuget/NuGet.exe.old deleted file mode 100644 index 8dd7e45a..00000000 Binary files a/.nuget/NuGet.exe.old and /dev/null differ diff --git a/Database/Database.csproj b/Database/Database.csproj index 394d4ca2..00be2b52 100644 --- a/Database/Database.csproj +++ b/Database/Database.csproj @@ -47,8 +47,9 @@ false - - ..\External Libraries\MySql.Data.dll + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll + True @@ -137,6 +138,7 @@ + diff --git a/Database/app.config b/Database/app.config index 4c133a0a..66e5cf65 100644 --- a/Database/app.config +++ b/Database/app.config @@ -1,24 +1,26 @@ - + - -
- - + - + - + - + - + + + + + + diff --git a/Database/packages.config b/Database/packages.config new file mode 100644 index 00000000..d493efdc --- /dev/null +++ b/Database/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/External Libraries/MySql.Data.dll b/External Libraries/MySql.Data.dll deleted file mode 100644 index 9fbc8ef2..00000000 Binary files a/External Libraries/MySql.Data.dll and /dev/null differ diff --git a/Logic/Communications/Payload/ParticipantMailPayload.cs b/Logic/Communications/Payload/ParticipantMailPayload.cs index b7b66243..93522fa9 100644 --- a/Logic/Communications/Payload/ParticipantMailPayload.cs +++ b/Logic/Communications/Payload/ParticipantMailPayload.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using MySql.Data.MySqlClient.Properties; //using Swarmops.Basic.Types.Common; using Swarmops.Logic.Security; using Swarmops.Logic.Swarm; diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index 1c55346d..6f008cd5 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -60,9 +60,9 @@ ..\External Libraries\HtmlAgilityPack.dll - - False - ..\External Libraries\MySql.Data.dll + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll + True ..\packages\NBitcoin.3.0.0.72\lib\net45\NBitcoin.dll @@ -80,8 +80,8 @@ ..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\packages\NGeoIP.1.0.1\lib\net45\RestSharp.dll + + ..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll True diff --git a/Logic/app.config b/Logic/app.config index 51722df3..8fae5a73 100644 --- a/Logic/app.config +++ b/Logic/app.config @@ -12,4 +12,9 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/Logic/packages.config b/Logic/packages.config index 2bc237d9..243c4d5e 100644 --- a/Logic/packages.config +++ b/Logic/packages.config @@ -1,9 +1,10 @@  + - + \ No newline at end of file diff --git a/Site/Site.csproj b/Site/Site.csproj index fc309654..a733bd73 100644 --- a/Site/Site.csproj +++ b/Site/Site.csproj @@ -60,11 +60,11 @@ True - False - bin\NGeoIP.dll + ..\packages\NGeoIP.1.0.1\lib\net45\NGeoIP.dll + True - ..\packages\RestSharp.104.2.0\lib\net4\RestSharp.dll + ..\packages\NGeoIP.1.0.1\lib\net45\RestSharp.dll True diff --git a/Site/web.Debug.config b/Site/web.Debug.config index 468362e6..d18147df 100644 --- a/Site/web.Debug.config +++ b/Site/web.Debug.config @@ -62,7 +62,7 @@ - + diff --git a/Site/web.Release.config b/Site/web.Release.config index b887454e..a5e09012 100644 --- a/Site/web.Release.config +++ b/Site/web.Release.config @@ -63,7 +63,7 @@ - + diff --git a/Site/web.config b/Site/web.config index 72d532b3..7e392fde 100644 --- a/Site/web.config +++ b/Site/web.config @@ -50,7 +50,7 @@ - + diff --git a/Site5/Bin/MySql.Data.dll b/Site5/Bin/MySql.Data.dll index 9fbc8ef2..9abfb6b5 100644 Binary files a/Site5/Bin/MySql.Data.dll and b/Site5/Bin/MySql.Data.dll differ