Skip to content

Commit

Permalink
Package updates & MySQL.data v8 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sledmore
Sledmore committed Jun 11, 2018
1 parent 1507136 commit 283b756
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 75 deletions.
21 changes: 10 additions & 11 deletions Plus Emulator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,21 @@
<Reference Include="AStar">
<HintPath>Resources\libs\AStar.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="HabboEncryption">
<HintPath>Resources\libs\HabboEncryption.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="MoreLinq, Version=2.9.21302.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL">
<HintPath>packages\morelinq.2.9.0\lib\net40\MoreLinq.dll</HintPath>
<Reference Include="MoreLinq, Version=2.10.21623.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL">
<HintPath>packages\morelinq.2.10.0\lib\net40\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=6.10.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.6.10.5\lib\net452\MySql.Data.dll</HintPath>
<Reference Include="MySql.Data, Version=8.0.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>packages\MySql.Data.8.0.11\lib\net452\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel" />
Expand All @@ -100,17 +103,13 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.Management" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
<Reference Include="System.ValueTuple">
<HintPath>packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Communication\Encryption\Crypto\RSA\Pkcs1PadType.cs" />
Expand Down
1 change: 1 addition & 0 deletions PlusEnvironment.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public static void Initialize()
UserID = GetConfig().data["db.username"],
AllowZeroDateTime = true,
ConvertZeroDateTime = true,
SslMode = MySqlSslMode.None
};

_manager = new DatabaseManager(connectionString.ToString());
Expand Down
123 changes: 62 additions & 61 deletions app.config
View file
Original file line number Diff line number Diff line change
@@ -1,123 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup>
<runtime>
<bypassTrustedAppStrongNames enabled="false"/>
<gcConcurrent enabled="true"/>
<gcServer enabled="true"/>
<bypassTrustedAppStrongNames enabled="false" />
<gcConcurrent enabled="true" />
<gcServer enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<log4net>
<root>
<level value="DEBUG"/>
<appender-ref ref="Console"/>
<appender-ref ref="RollingFileAppender"/>
<level value="DEBUG" />
<appender-ref ref="Console" />
<appender-ref ref="RollingFileAppender" />
</root>
<appender name="Console" type="log4net.Appender.ColoredConsoleAppender">
<threshold value="DEBUG"/>
<threshold value="DEBUG" />
<mapping>
<level value="DEBUG"/>
<foreColor value="Cyan, HighIntensity"/>
<level value="DEBUG" />
<foreColor value="Cyan, HighIntensity" />
</mapping>
<mapping>
<level value="ERROR"/>
<foreColor value="Red, HighIntensity"/>
<level value="ERROR" />
<foreColor value="Red, HighIntensity" />
</mapping>
<mapping>
<level value="FATAL"/>
<foreColor value="Red, HighIntensity"/>
<level value="FATAL" />
<foreColor value="Red, HighIntensity" />
</mapping>
<mapping>
<level value="WARN"/>
<foreColor value="Yellow, HighIntensity"/>
<level value="WARN" />
<foreColor value="Yellow, HighIntensity" />
</mapping>
<mapping>
<level value="INFO"/>
<foreColor value="White"/>
<level value="INFO" />
<foreColor value="White" />
</mapping>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date{HH:mm:ss} - [%level%] %message%newline"/>
<conversionPattern value="%date{HH:mm:ss} - [%level%] %message%newline" />
</layout>
</appender>
<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs\console.log"/>
<appendToFile value="true"/>
<rollingStyle value="Size"/>
<maxSizeRollBackups value="30"/>
<maximumFileSize value="10MB"/>
<staticLogFileName value="true"/>
<file value="logs\console.log" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="30" />
<maximumFileSize value="10MB" />
<staticLogFileName value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %-5level - %logger &gt;&gt; %message%newline"/>
<conversionPattern value="%date %-5level - %logger &gt;&gt; %message%newline" />
</layout>
</appender>
<appender name="MySQLErrorFileAppender" type="log4net.Appender.FileAppender">
<file value="logs\errors\MySQL_errors.log"/>
<appendToFile value="true"/>
<file value="logs\errors\MySQL_errors.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline"/>
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline" />
</layout>
<threshold value="ERROR"/>
<threshold value="ERROR" />
</appender>
<appender name="ThreadErrorFileAppender" type="log4net.Appender.FileAppender">
<file value="logs\errors\Thread_errors.log"/>
<appendToFile value="true"/>
<file value="logs\errors\Thread_errors.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline"/>
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline" />
</layout>
<threshold value="ERROR"/>
<threshold value="ERROR" />
</appender>
<appender name="ExceptionErrorFileAppender" type="log4net.Appender.FileAppender">
<file value="logs\errors\Exception_errors.log"/>
<appendToFile value="true"/>
<file value="logs\errors\Exception_errors.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline"/>
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline" />
</layout>
<threshold value="ERROR"/>
<threshold value="ERROR" />
</appender>
<appender name="CriticalErrorFileAppender" type="log4net.Appender.FileAppender">
<file value="logs\errors\Critical_errors.log"/>
<appendToFile value="true"/>
<file value="logs\errors\Critical_errors.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline"/>
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline" />
</layout>
<threshold value="ERROR"/>
<threshold value="ERROR" />
</appender>
<appender name="WiredErrorFileAppender" type="log4net.Appender.FileAppender">
<file value="logs\errors\Wired_errors.log"/>
<appendToFile value="true"/>
<file value="logs\errors\Wired_errors.log" />
<appendToFile value="true" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline"/>
<conversionPattern value="Date/Time: %date%newline%Thread: %t%newline%message%newline%newline" />
</layout>
<threshold value="ERROR"/>
<threshold value="ERROR" />
</appender>
<logger name="MySQL">
<appender-ref ref="MySQLErrorFileAppender"/>
<appender-ref ref="MySQLErrorFileAppender" />
</logger>
<logger name="Thread">
<appender-ref ref="ThreadErrorFileAppender"/>
<appender-ref ref="ThreadErrorFileAppender" />
</logger>
<logger name="Exception">
<appender-ref ref="ExceptionErrorFileAppender"/>
<appender-ref ref="ExceptionErrorFileAppender" />
</logger>
<logger name="Critical">
<appender-ref ref="CriticalErrorFileAppender"/>
<appender-ref ref="CriticalErrorFileAppender" />
</logger>
<logger name="Wired">
<appender-ref ref="WiredErrorFileAppender"/>
<appender-ref ref="WiredErrorFileAppender" />
</logger>
</log4net>
<system.serviceModel>
<bindings/>
<client/>
<bindings />
<client />
</system.serviceModel>

<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient"/>
<add description=".Net Framework Data Provider for MySQL" invariant="MySql.Data.MySqlClient" name="MySQL Data Provider" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
</DbProviderFactories>
</system.data></configuration>
</configuration>
7 changes: 4 additions & 3 deletions packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Google.Protobuf" version="3.5.1" targetFramework="net471" />
<package id="log4net" version="2.0.8" targetFramework="net461" />
<package id="morelinq" version="2.9.0" targetFramework="net471" />
<package id="MySql.Data" version="6.10.5" targetFramework="net461" />
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" requireReinstallation="true" />
<package id="morelinq" version="2.10.0" targetFramework="net471" />
<package id="MySql.Data" version="8.0.11" targetFramework="net471" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net471" />
<package id="Trove.Nini" version="1.1.0.0" targetFramework="net451" />
</packages>

0 comments on commit 283b756

Please sign in to comment.