Skip to content

Commit 44c7b76

Browse files
committed
misc changes from install testing and to make I got synced
1 parent 93fd0a1 commit 44c7b76

51 files changed

Lines changed: 1045 additions & 951 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Assemblies/MySql.Data.dll

12 KB
Binary file not shown.

OSAE.API/App.config

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
44
<add key="log4net.Internal.Debug" value="true"/>
55
</appSettings>
66
<log4net>
77
<appender name="MySql_ADONetAppender" type="log4net.Appender.ADONetAppender">
8-
<bufferSize value="1" />
8+
<bufferSize value="1"/>
99
<connectionType value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data"/>
10-
<commandText value="INSERT INTO osae_log (Date,Thread,Level,Logger,Message,Exception) VALUES (?log_date, ?thread, ?log_level, ?logger, ?message, ?exception)" />
10+
<commandText value="INSERT INTO osae_log (Date,Thread,Level,Logger,Message,Exception) VALUES (?log_date, ?thread, ?log_level, ?logger, ?message, ?exception)"/>
1111
<parameter>
1212
<parameterName value="?log_date"/>
1313
<dbType value="DateTime"/>
@@ -54,21 +54,21 @@
5454
</appender>
5555

5656
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
57-
<file value="${ProgramData}\OSAE\Logs2\" />
58-
<staticLogFileName value="false" />
59-
<appendToFile value="true" />
60-
<rollingStyle value="Date" />
61-
<datePattern value="yyyy.MM.dd' OSAE.log'" />
62-
<maxSizeRollBackups value="10" />
57+
<file value="${ProgramData}\OSAE\Logs2\"/>
58+
<staticLogFileName value="false"/>
59+
<appendToFile value="true"/>
60+
<rollingStyle value="Date"/>
61+
<datePattern value="yyyy.MM.dd' OSAE.log'"/>
62+
<maxSizeRollBackups value="10"/>
6363
<layout type="log4net.Layout.PatternLayout">
64-
<conversionPattern value="%date{yyyy.MM.dd hh:mm:ss.fff tt}&#9;[%thread]&#9;%-5level&#9;%logger&#9;[%property{NDC}]&#9;%message&#9;%exception%newline" />
64+
<conversionPattern value="%date{yyyy.MM.dd hh:mm:ss.fff tt} [%thread] %-5level %logger [%property{NDC}] %message %exception%newline"/>
6565
</layout>
6666
</appender>
6767

6868
<root>
69-
<level value="ALL" />
70-
<appender-ref ref="MySql_ADONetAppender" />
71-
<appender-ref ref="RollingLogFileAppender" />
69+
<level value="ALL"/>
70+
<appender-ref ref="MySql_ADONetAppender"/>
71+
<appender-ref ref="RollingLogFileAppender"/>
7272
</root>
7373
</log4net>
74-
</configuration>
74+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>

OSAE.API/General/Common.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Net.Sockets;
88
using System.Security;
99
using System.Security.Policy;
10+
///using MySql.Data.MySqlClient;
1011
using MySql.Data.MySqlClient;
1112
using OSAE.General;
1213

OSAE.API/OSAE.API.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>OSAE</RootNamespace>
1212
<AssemblyName>OSAE.API</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
</PropertyGroup>
@@ -47,7 +47,7 @@
4747
<HintPath>..\Assemblies\log4net.dll</HintPath>
4848
</Reference>
4949
<Reference Include="Microsoft.CSharp" />
50-
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
50+
<Reference Include="MySql.Data, Version=6.10.6.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\Assemblies\MySql.Data.dll</HintPath>
5353
</Reference>

0 commit comments

Comments
 (0)