diff --git a/.gitignore b/.gitignore index 02b05b7..2245f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ [Tt]emp/ [Oo]bj/ +.vs/ + # Autogenerated VS/MD solution and project files /*.csproj /*.unityproj diff --git a/Assets/Log4Net.meta b/Assets/Log4Net.meta new file mode 100644 index 0000000..fd289a1 --- /dev/null +++ b/Assets/Log4Net.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 509a8cbb4dd1db7459b45f7f4a6f212c +folderAsset: yes +timeCreated: 1461529934 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4NetSrc.meta b/Assets/Log4Net/Log4NetSrc.meta similarity index 100% rename from Assets/Log4NetSrc.meta rename to Assets/Log4Net/Log4NetSrc.meta diff --git a/Assets/Log4NetSrc/Appender.meta b/Assets/Log4Net/Log4NetSrc/Appender.meta similarity index 100% rename from Assets/Log4NetSrc/Appender.meta rename to Assets/Log4Net/Log4NetSrc/Appender.meta diff --git a/Assets/Log4NetSrc/Appender/AdoNetAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/AdoNetAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/AdoNetAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/AdoNetAppender.cs index 48b41a9..d1623fc 100644 --- a/Assets/Log4NetSrc/Appender/AdoNetAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/AdoNetAppender.cs @@ -18,7 +18,7 @@ #endregion // SSCLI 1.0 has no support for ADO.NET -#if !SSCLI && !UNITY_4_3 +#if !SSCLI && !UNITY_4_3 && !UNITY_5 using System; using System.Collections; diff --git a/Assets/Log4NetSrc/Appender/AdoNetAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/AdoNetAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/AdoNetAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/AdoNetAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs diff --git a/Assets/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/AnsiColorTerminalAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/AppenderCollection.cs b/Assets/Log4Net/Log4NetSrc/Appender/AppenderCollection.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/AppenderCollection.cs rename to Assets/Log4Net/Log4NetSrc/Appender/AppenderCollection.cs diff --git a/Assets/Log4NetSrc/Appender/AppenderCollection.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/AppenderCollection.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/AppenderCollection.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/AppenderCollection.cs.meta diff --git a/Assets/Log4NetSrc/Appender/AppenderSkeleton.cs b/Assets/Log4Net/Log4NetSrc/Appender/AppenderSkeleton.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/AppenderSkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Appender/AppenderSkeleton.cs index bcfb215..9192c40 100644 --- a/Assets/Log4NetSrc/Appender/AppenderSkeleton.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/AppenderSkeleton.cs @@ -317,7 +317,7 @@ public void DoAppend(LoggingEvent loggingEvent) this.Append(loggingEvent); } } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch(Exception ex) { ErrorHandler.Error("Failed in DoAppend", ex); @@ -426,7 +426,7 @@ public void DoAppend(LoggingEvent[] loggingEvents) this.Append((LoggingEvent[])filteredEvents.ToArray(typeof(LoggingEvent))); } } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch(Exception ex) { ErrorHandler.Error("Failed in Bulk DoAppend", ex); diff --git a/Assets/Log4NetSrc/Appender/AppenderSkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/AppenderSkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/AppenderSkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/AppenderSkeleton.cs.meta diff --git a/Assets/Log4NetSrc/Appender/AspNetTraceAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/AspNetTraceAppender.cs similarity index 98% rename from Assets/Log4NetSrc/Appender/AspNetTraceAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/AspNetTraceAppender.cs index b7349b6..9b6b47c 100644 --- a/Assets/Log4NetSrc/Appender/AspNetTraceAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/AspNetTraceAppender.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.Web; diff --git a/Assets/Log4NetSrc/Appender/AspNetTraceAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/AspNetTraceAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/AspNetTraceAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/AspNetTraceAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs b/Assets/Log4Net/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs diff --git a/Assets/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/BufferingAppenderSkeleton.cs.meta diff --git a/Assets/Log4NetSrc/Appender/BufferingForwardingAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/BufferingForwardingAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/BufferingForwardingAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/BufferingForwardingAppender.cs diff --git a/Assets/Log4NetSrc/Appender/BufferingForwardingAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/BufferingForwardingAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/BufferingForwardingAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/BufferingForwardingAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/ColoredConsoleAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/ColoredConsoleAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/ColoredConsoleAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/ColoredConsoleAppender.cs index b35e749..3ad2822 100644 --- a/Assets/Log4NetSrc/Appender/ColoredConsoleAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/ColoredConsoleAppender.cs @@ -268,7 +268,7 @@ public void AddMapping(LevelColors mapping) #if NET_4_0 [System.Security.SecuritySafeCritical] #endif -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif override protected void Append(log4net.Core.LoggingEvent loggingEvent) @@ -439,7 +439,7 @@ override protected bool RequiresLayout #if NET_4_0 [System.Security.SecuritySafeCritical] #endif -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode=true)] #endif public override void ActivateOptions() diff --git a/Assets/Log4NetSrc/Appender/ColoredConsoleAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/ColoredConsoleAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/ColoredConsoleAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/ColoredConsoleAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/ConsoleAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/ConsoleAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/ConsoleAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/ConsoleAppender.cs diff --git a/Assets/Log4NetSrc/Appender/ConsoleAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/ConsoleAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/ConsoleAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/ConsoleAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/DebugAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/DebugAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/DebugAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/DebugAppender.cs index a057fd9..e9e4132 100644 --- a/Assets/Log4NetSrc/Appender/DebugAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/DebugAppender.cs @@ -18,7 +18,7 @@ #endregion #define DEBUG -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 using log4net.Layout; using log4net.Core; diff --git a/Assets/Log4NetSrc/Appender/DebugAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/DebugAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/DebugAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/DebugAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/EventLogAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/EventLogAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/EventLogAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/EventLogAppender.cs index 70ec0a8..e1a972c 100644 --- a/Assets/Log4NetSrc/Appender/EventLogAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/EventLogAppender.cs @@ -22,7 +22,7 @@ // .NET Compact Framework 1.0 has no support for EventLog #if !NETCF // SSCLI 1.0 has no support for EventLog -#if !SSCLI && !UNITY_4_3 +#if !SSCLI && !UNITY_4_3 && !UNITY_5 using System; using System.Diagnostics; diff --git a/Assets/Log4NetSrc/Appender/EventLogAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/EventLogAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/EventLogAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/EventLogAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/FileAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/FileAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/FileAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/FileAppender.cs diff --git a/Assets/Log4NetSrc/Appender/FileAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/FileAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/FileAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/FileAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/ForwardingAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/ForwardingAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/ForwardingAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/ForwardingAppender.cs diff --git a/Assets/Log4NetSrc/Appender/ForwardingAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/ForwardingAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/ForwardingAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/ForwardingAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/IAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/IAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/IAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/IAppender.cs diff --git a/Assets/Log4NetSrc/Appender/IAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/IAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/IAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/IAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/IBulkAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/IBulkAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/IBulkAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/IBulkAppender.cs diff --git a/Assets/Log4NetSrc/Appender/IBulkAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/IBulkAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/IBulkAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/IBulkAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/LocalSyslogAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/LocalSyslogAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/LocalSyslogAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/LocalSyslogAppender.cs index 3a925f4..4b209f9 100644 --- a/Assets/Log4NetSrc/Appender/LocalSyslogAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/LocalSyslogAppender.cs @@ -381,7 +381,7 @@ public override void ActivateOptions() #if NET_4_0 [System.Security.SecuritySafeCritical] #endif -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif protected override void Append(LoggingEvent loggingEvent) diff --git a/Assets/Log4NetSrc/Appender/LocalSyslogAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/LocalSyslogAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/LocalSyslogAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/LocalSyslogAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs index 04b174f..b3f8aec 100644 --- a/Assets/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs @@ -21,7 +21,7 @@ // http://msdn.microsoft.com/en-us/library/system.console.foregroundcolor.aspx // Disable for unsupported targets #if !NETCF -#if !SSCLI && !UNITY_4_3 +#if !SSCLI && !UNITY_4_3 && !UNITY_5 #if !CLI_1_0 #if !MONO_1_0 #if !NET_1_0 diff --git a/Assets/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/ManagedColoredConsoleAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/MemoryAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/MemoryAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/MemoryAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/MemoryAppender.cs diff --git a/Assets/Log4NetSrc/Appender/MemoryAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/MemoryAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/MemoryAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/MemoryAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/NetSendAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/NetSendAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/NetSendAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/NetSendAppender.cs index 75938f2..3c0088c 100644 --- a/Assets/Log4NetSrc/Appender/NetSendAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/NetSendAppender.cs @@ -307,7 +307,7 @@ public override void ActivateOptions() #if NET_4_0 [System.Security.SecuritySafeCritical] #endif -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif protected override void Append(LoggingEvent loggingEvent) diff --git a/Assets/Log4NetSrc/Appender/NetSendAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/NetSendAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/NetSendAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/NetSendAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/OutputDebugStringAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/OutputDebugStringAppender.cs similarity index 98% rename from Assets/Log4NetSrc/Appender/OutputDebugStringAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/OutputDebugStringAppender.cs index bd97c8e..e62d7ff 100644 --- a/Assets/Log4NetSrc/Appender/OutputDebugStringAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/OutputDebugStringAppender.cs @@ -77,7 +77,7 @@ public OutputDebugStringAppender() /// #if NET_4_0 [System.Security.SecuritySafeCritical] -#elif !NETCF && !UNITY_4_3 +#elif !NETCF && !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif override protected void Append(LoggingEvent loggingEvent) diff --git a/Assets/Log4NetSrc/Appender/OutputDebugStringAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/OutputDebugStringAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/OutputDebugStringAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/OutputDebugStringAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/RemoteSyslogAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/RemoteSyslogAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/RemoteSyslogAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/RemoteSyslogAppender.cs index ca7be9d..0812f60 100644 --- a/Assets/Log4NetSrc/Appender/RemoteSyslogAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/RemoteSyslogAppender.cs @@ -16,7 +16,7 @@ // limitations under the License. // #endregion -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 using System; using log4net.Core; diff --git a/Assets/Log4NetSrc/Appender/RemoteSyslogAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/RemoteSyslogAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/RemoteSyslogAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/RemoteSyslogAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/RemotingAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/RemotingAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/RemotingAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/RemotingAppender.cs diff --git a/Assets/Log4NetSrc/Appender/RemotingAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/RemotingAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/RemotingAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/RemotingAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/RollingFileAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/RollingFileAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/RollingFileAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/RollingFileAppender.cs diff --git a/Assets/Log4NetSrc/Appender/RollingFileAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/RollingFileAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/RollingFileAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/RollingFileAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/SmtpAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/SmtpAppender.cs similarity index 95% rename from Assets/Log4NetSrc/Appender/SmtpAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/SmtpAppender.cs index fa6446e..3676260 100644 --- a/Assets/Log4NetSrc/Appender/SmtpAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/SmtpAppender.cs @@ -25,7 +25,7 @@ using System.IO; using System.Text; -#if NET_2_0 || UNITY_4_3 +#if NET_2_0 || UNITY_4_3 || UNITY_5 using System.Net.Mail; #else using System.Web.Mail; @@ -324,7 +324,7 @@ public MailPriority Priority set { m_mailPriority = value; } } -#if NET_2_0 || UNITY_4_3 +#if NET_2_0 || UNITY_4_3 || UNITY_5 /// /// Enable or disable use of SSL when sending e-mail message /// @@ -444,13 +444,13 @@ override protected bool RequiresLayout /// the body text to include in the mail virtual protected void SendEmail(string messageBody) { -#if NET_2_0 || UNITY_4_3 - // .NET 2.0 has a new API for SMTP email System.Net.Mail - // This API supports credentials and multiple hosts correctly. - // The old API is deprecated. +#if NET_2_0 || UNITY_4_3 || UNITY_5 + // .NET 2.0 has a new API for SMTP email System.Net.Mail + // This API supports credentials and multiple hosts correctly. + // The old API is deprecated. - // Create and configure the smtp client - SmtpClient smtpClient = new SmtpClient(); + // Create and configure the smtp client + SmtpClient smtpClient = new SmtpClient(); if (!String.IsNullOrEmpty(m_smtpHost)) { smtpClient.Host = m_smtpHost; @@ -461,18 +461,18 @@ virtual protected void SendEmail(string messageBody) if (m_authentication == SmtpAuthentication.Basic) { - // Perform basic authentication -#if UNITY_4_3 - smtpClient.Credentials = (System.Net.ICredentialsByHost)new System.Net.NetworkCredential(m_username, m_password); + // Perform basic authentication +#if UNITY_4_3 || UNITY_5 + smtpClient.Credentials = (System.Net.ICredentialsByHost)new System.Net.NetworkCredential(m_username, m_password); #else smtpClient.Credentials = new System.Net.NetworkCredential(m_username, m_password); #endif } else if (m_authentication == SmtpAuthentication.Ntlm) { - // Perform integrated authentication (NTLM) -#if UNITY_4_3 - smtpClient.Credentials = (System.Net.ICredentialsByHost)System.Net.CredentialCache.DefaultNetworkCredentials; + // Perform integrated authentication (NTLM) +#if UNITY_4_3 || UNITY_5 + smtpClient.Credentials = (System.Net.ICredentialsByHost)System.Net.CredentialCache.DefaultNetworkCredentials; #else smtpClient.Credentials = System.Net.CredentialCache.DefaultNetworkCredentials; #endif @@ -612,7 +612,7 @@ virtual protected void SendEmail(string messageBody) private MailPriority m_mailPriority = MailPriority.Normal; -#if NET_2_0 || UNITY_4_3 +#if NET_2_0 || UNITY_4_3 || UNITY_5 private bool m_enableSsl = false; private string m_replyTo; #endif diff --git a/Assets/Log4NetSrc/Appender/SmtpAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/SmtpAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/SmtpAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/SmtpAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/SmtpPickupDirAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/SmtpPickupDirAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/SmtpPickupDirAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/SmtpPickupDirAppender.cs diff --git a/Assets/Log4NetSrc/Appender/SmtpPickupDirAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/SmtpPickupDirAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/SmtpPickupDirAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/SmtpPickupDirAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/TelnetAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/TelnetAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/TelnetAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/TelnetAppender.cs index fa455fb..d19c9c8 100644 --- a/Assets/Log4NetSrc/Appender/TelnetAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/TelnetAppender.cs @@ -17,7 +17,7 @@ // #endregion -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 using System; using System.Collections; using System.Globalization; diff --git a/Assets/Log4NetSrc/Appender/TelnetAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/TelnetAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/TelnetAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/TelnetAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/TextWriterAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/TextWriterAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/TextWriterAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/TextWriterAppender.cs diff --git a/Assets/Log4NetSrc/Appender/TextWriterAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/TextWriterAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/TextWriterAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/TextWriterAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/TraceAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/TraceAppender.cs similarity index 100% rename from Assets/Log4NetSrc/Appender/TraceAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/TraceAppender.cs diff --git a/Assets/Log4NetSrc/Appender/TraceAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/TraceAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/TraceAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/TraceAppender.cs.meta diff --git a/Assets/Log4NetSrc/Appender/UdpAppender.cs b/Assets/Log4Net/Log4NetSrc/Appender/UdpAppender.cs similarity index 99% rename from Assets/Log4NetSrc/Appender/UdpAppender.cs rename to Assets/Log4Net/Log4NetSrc/Appender/UdpAppender.cs index e3f424c..2a91f8b 100644 --- a/Assets/Log4NetSrc/Appender/UdpAppender.cs +++ b/Assets/Log4Net/Log4NetSrc/Appender/UdpAppender.cs @@ -16,7 +16,7 @@ // limitations under the License. // #endregion -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 using System; using System.Globalization; using System.Net; diff --git a/Assets/Log4NetSrc/Appender/UdpAppender.cs.meta b/Assets/Log4Net/Log4NetSrc/Appender/UdpAppender.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Appender/UdpAppender.cs.meta rename to Assets/Log4Net/Log4NetSrc/Appender/UdpAppender.cs.meta diff --git a/Assets/Log4NetSrc/Config.meta b/Assets/Log4Net/Log4NetSrc/Config.meta similarity index 100% rename from Assets/Log4NetSrc/Config.meta rename to Assets/Log4Net/Log4NetSrc/Config.meta diff --git a/Assets/Log4NetSrc/Config/AliasDomainAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/AliasDomainAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/AliasDomainAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/AliasDomainAttribute.cs diff --git a/Assets/Log4NetSrc/Config/AliasDomainAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/AliasDomainAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/AliasDomainAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/AliasDomainAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/AliasRepositoryAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/AliasRepositoryAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/AliasRepositoryAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/AliasRepositoryAttribute.cs diff --git a/Assets/Log4NetSrc/Config/AliasRepositoryAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/AliasRepositoryAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/AliasRepositoryAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/AliasRepositoryAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/BasicConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Config/BasicConfigurator.cs similarity index 100% rename from Assets/Log4NetSrc/Config/BasicConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Config/BasicConfigurator.cs diff --git a/Assets/Log4NetSrc/Config/BasicConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/BasicConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/BasicConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/BasicConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Config/ConfiguratorAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/ConfiguratorAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/ConfiguratorAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/ConfiguratorAttribute.cs diff --git a/Assets/Log4NetSrc/Config/ConfiguratorAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/ConfiguratorAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/ConfiguratorAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/ConfiguratorAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/DOMConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Config/DOMConfigurator.cs similarity index 100% rename from Assets/Log4NetSrc/Config/DOMConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Config/DOMConfigurator.cs diff --git a/Assets/Log4NetSrc/Config/DOMConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/DOMConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/DOMConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/DOMConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Config/DOMConfiguratorAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/DOMConfiguratorAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/DOMConfiguratorAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/DOMConfiguratorAttribute.cs diff --git a/Assets/Log4NetSrc/Config/DOMConfiguratorAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/DOMConfiguratorAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/DOMConfiguratorAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/DOMConfiguratorAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/DomainAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/DomainAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/DomainAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/DomainAttribute.cs diff --git a/Assets/Log4NetSrc/Config/DomainAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/DomainAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/DomainAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/DomainAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs b/Assets/Log4Net/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs similarity index 98% rename from Assets/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs rename to Assets/Log4Net/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs index 2812b4d..bf92675 100644 --- a/Assets/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs +++ b/Assets/Log4Net/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs @@ -18,7 +18,7 @@ #endregion // .NET Compact Framework 1.0 has no support for application .config files -#if !NETCF && !UNITY_4_3 +#if !NETCF && !UNITY_4_3 && !UNITY_5 using System.Configuration; using System.Xml; diff --git a/Assets/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/Log4NetConfigurationSectionHandler.cs.meta diff --git a/Assets/Log4NetSrc/Config/PluginAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/PluginAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/PluginAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/PluginAttribute.cs diff --git a/Assets/Log4NetSrc/Config/PluginAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/PluginAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/PluginAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/PluginAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/RepositoryAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/RepositoryAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/RepositoryAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/RepositoryAttribute.cs diff --git a/Assets/Log4NetSrc/Config/RepositoryAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/RepositoryAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/RepositoryAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/RepositoryAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/SecurityContextProviderAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/SecurityContextProviderAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/SecurityContextProviderAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/SecurityContextProviderAttribute.cs diff --git a/Assets/Log4NetSrc/Config/SecurityContextProviderAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/SecurityContextProviderAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/SecurityContextProviderAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/SecurityContextProviderAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Config/XmlConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Config/XmlConfigurator.cs similarity index 96% rename from Assets/Log4NetSrc/Config/XmlConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Config/XmlConfigurator.cs index c45a1ac..efb9999 100644 --- a/Assets/Log4NetSrc/Config/XmlConfigurator.cs +++ b/Assets/Log4Net/Log4NetSrc/Config/XmlConfigurator.cs @@ -52,31 +52,31 @@ private XmlConfigurator() { } - #endregion Protected Instance Constructors + #endregion Protected Instance Constructors - #region Configure static methods + #region Configure static methods #if !NETCF - /// - /// Automatically configures the log4net system based on the - /// application's configuration settings. - /// - /// - /// - /// Each application has a configuration file. This has the - /// same name as the application with '.config' appended. - /// This file is XML and calling this function prompts the - /// configurator to look in that file for a section called - /// log4net that contains the configuration data. - /// - /// - /// To use this method to configure log4net you must specify - /// the section - /// handler for the log4net configuration section. See the - /// for an example. - /// - /// - /// + /// + /// Automatically configures the log4net system based on the + /// application's configuration settings. + /// + /// + /// + /// Each application has a configuration file. This has the + /// same name as the application with '.config' appended. + /// This file is XML and calling this function prompts the + /// configurator to look in that file for a section called + /// log4net that contains the configuration data. + /// + /// + /// To use this method to configure log4net you must specify + /// the section + /// handler for the log4net configuration section. See the + /// for an example. + /// + /// + /// #else /// /// Automatically configures the log4net system based on the @@ -91,6 +91,9 @@ private XmlConfigurator() /// log4net that contains the configuration data. /// /// +#endif +#if UNITY_5 + [Obsolete("This won't work in unity, please give an XML config file", true)] #endif static public ICollection Configure() { @@ -162,9 +165,9 @@ static private void InternalConfigure(ILoggerRepository repository) LogLog.Debug(declaringType, "Application config file location unknown"); } -#if NETCF || UNITY_4_3 - // No config file reading stuff. Just go straight for the file - Configure(repository, new FileInfo(SystemInfo.ConfigurationFileLocation)); +#if NETCF || UNITY_4_3 || UNITY_5 + // No config file reading stuff. Just go straight for the file + Configure(repository, new FileInfo(SystemInfo.ConfigurationFileLocation)); #else try { @@ -725,9 +728,9 @@ static private void InternalConfigure(ILoggerRepository repository, Stream confi #if (NETCF) // Create a text reader for the file stream XmlTextReader xmlReader = new XmlTextReader(configStream); -#elif NET_2_0 || UNITY_4_3 - // Allow the DTD to specify entity includes - XmlReaderSettings settings = new XmlReaderSettings(); +#elif NET_2_0 || UNITY_4_3 || UNITY_5 + // Allow the DTD to specify entity includes + XmlReaderSettings settings = new XmlReaderSettings(); // .NET 4.0 warning CS0618: 'System.Xml.XmlReaderSettings.ProhibitDtd' // is obsolete: 'Use XmlReaderSettings.DtdProcessing property instead.' #if !NET_4_0 diff --git a/Assets/Log4NetSrc/Config/XmlConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/XmlConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/XmlConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/XmlConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Config/XmlConfiguratorAttribute.cs b/Assets/Log4Net/Log4NetSrc/Config/XmlConfiguratorAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Config/XmlConfiguratorAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Config/XmlConfiguratorAttribute.cs diff --git a/Assets/Log4NetSrc/Config/XmlConfiguratorAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Config/XmlConfiguratorAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Config/XmlConfiguratorAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Config/XmlConfiguratorAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Core.meta b/Assets/Log4Net/Log4NetSrc/Core.meta similarity index 100% rename from Assets/Log4NetSrc/Core.meta rename to Assets/Log4Net/Log4NetSrc/Core.meta diff --git a/Assets/Log4NetSrc/Core/CompactRepositorySelector.cs b/Assets/Log4Net/Log4NetSrc/Core/CompactRepositorySelector.cs similarity index 100% rename from Assets/Log4NetSrc/Core/CompactRepositorySelector.cs rename to Assets/Log4Net/Log4NetSrc/Core/CompactRepositorySelector.cs diff --git a/Assets/Log4NetSrc/Core/CompactRepositorySelector.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/CompactRepositorySelector.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/CompactRepositorySelector.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/CompactRepositorySelector.cs.meta diff --git a/Assets/Log4NetSrc/Core/DefaultRepositorySelector.cs b/Assets/Log4Net/Log4NetSrc/Core/DefaultRepositorySelector.cs similarity index 100% rename from Assets/Log4NetSrc/Core/DefaultRepositorySelector.cs rename to Assets/Log4Net/Log4NetSrc/Core/DefaultRepositorySelector.cs diff --git a/Assets/Log4NetSrc/Core/DefaultRepositorySelector.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/DefaultRepositorySelector.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/DefaultRepositorySelector.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/DefaultRepositorySelector.cs.meta diff --git a/Assets/Log4NetSrc/Core/ErrorCode.cs b/Assets/Log4Net/Log4NetSrc/Core/ErrorCode.cs similarity index 100% rename from Assets/Log4NetSrc/Core/ErrorCode.cs rename to Assets/Log4Net/Log4NetSrc/Core/ErrorCode.cs diff --git a/Assets/Log4NetSrc/Core/ErrorCode.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/ErrorCode.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/ErrorCode.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/ErrorCode.cs.meta diff --git a/Assets/Log4NetSrc/Core/ExceptionEvaluator.cs b/Assets/Log4Net/Log4NetSrc/Core/ExceptionEvaluator.cs similarity index 100% rename from Assets/Log4NetSrc/Core/ExceptionEvaluator.cs rename to Assets/Log4Net/Log4NetSrc/Core/ExceptionEvaluator.cs diff --git a/Assets/Log4NetSrc/Core/ExceptionEvaluator.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/ExceptionEvaluator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/ExceptionEvaluator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/ExceptionEvaluator.cs.meta diff --git a/Assets/Log4NetSrc/Core/IAppenderAttachable.cs b/Assets/Log4Net/Log4NetSrc/Core/IAppenderAttachable.cs similarity index 100% rename from Assets/Log4NetSrc/Core/IAppenderAttachable.cs rename to Assets/Log4Net/Log4NetSrc/Core/IAppenderAttachable.cs diff --git a/Assets/Log4NetSrc/Core/IAppenderAttachable.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/IAppenderAttachable.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/IAppenderAttachable.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/IAppenderAttachable.cs.meta diff --git a/Assets/Log4NetSrc/Core/IErrorHandler.cs b/Assets/Log4Net/Log4NetSrc/Core/IErrorHandler.cs similarity index 100% rename from Assets/Log4NetSrc/Core/IErrorHandler.cs rename to Assets/Log4Net/Log4NetSrc/Core/IErrorHandler.cs diff --git a/Assets/Log4NetSrc/Core/IErrorHandler.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/IErrorHandler.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/IErrorHandler.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/IErrorHandler.cs.meta diff --git a/Assets/Log4NetSrc/Core/IFixingRequired.cs b/Assets/Log4Net/Log4NetSrc/Core/IFixingRequired.cs similarity index 97% rename from Assets/Log4NetSrc/Core/IFixingRequired.cs rename to Assets/Log4Net/Log4NetSrc/Core/IFixingRequired.cs index 9f05b14..a8d8d55 100644 --- a/Assets/Log4NetSrc/Core/IFixingRequired.cs +++ b/Assets/Log4Net/Log4NetSrc/Core/IFixingRequired.cs @@ -28,7 +28,7 @@ namespace log4net.Core /// /// Interface that indicates that the object requires fixing before it /// can be taken outside the context of the appender's - /// method. + /// method. /// /// /// When objects that implement this interface are stored diff --git a/Assets/Log4NetSrc/Core/IFixingRequired.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/IFixingRequired.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/IFixingRequired.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/IFixingRequired.cs.meta diff --git a/Assets/Log4NetSrc/Core/ILogger.cs b/Assets/Log4Net/Log4NetSrc/Core/ILogger.cs similarity index 100% rename from Assets/Log4NetSrc/Core/ILogger.cs rename to Assets/Log4Net/Log4NetSrc/Core/ILogger.cs diff --git a/Assets/Log4NetSrc/Core/ILogger.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/ILogger.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/ILogger.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/ILogger.cs.meta diff --git a/Assets/Log4NetSrc/Core/ILoggerWrapper.cs b/Assets/Log4Net/Log4NetSrc/Core/ILoggerWrapper.cs similarity index 100% rename from Assets/Log4NetSrc/Core/ILoggerWrapper.cs rename to Assets/Log4Net/Log4NetSrc/Core/ILoggerWrapper.cs diff --git a/Assets/Log4NetSrc/Core/ILoggerWrapper.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/ILoggerWrapper.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/ILoggerWrapper.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/ILoggerWrapper.cs.meta diff --git a/Assets/Log4NetSrc/Core/IOptionHandler.cs b/Assets/Log4Net/Log4NetSrc/Core/IOptionHandler.cs similarity index 100% rename from Assets/Log4NetSrc/Core/IOptionHandler.cs rename to Assets/Log4Net/Log4NetSrc/Core/IOptionHandler.cs diff --git a/Assets/Log4NetSrc/Core/IOptionHandler.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/IOptionHandler.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/IOptionHandler.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/IOptionHandler.cs.meta diff --git a/Assets/Log4NetSrc/Core/IRepositorySelector.cs b/Assets/Log4Net/Log4NetSrc/Core/IRepositorySelector.cs similarity index 100% rename from Assets/Log4NetSrc/Core/IRepositorySelector.cs rename to Assets/Log4Net/Log4NetSrc/Core/IRepositorySelector.cs diff --git a/Assets/Log4NetSrc/Core/IRepositorySelector.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/IRepositorySelector.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/IRepositorySelector.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/IRepositorySelector.cs.meta diff --git a/Assets/Log4NetSrc/Core/ITriggeringEventEvaluator.cs b/Assets/Log4Net/Log4NetSrc/Core/ITriggeringEventEvaluator.cs similarity index 100% rename from Assets/Log4NetSrc/Core/ITriggeringEventEvaluator.cs rename to Assets/Log4Net/Log4NetSrc/Core/ITriggeringEventEvaluator.cs diff --git a/Assets/Log4NetSrc/Core/ITriggeringEventEvaluator.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/ITriggeringEventEvaluator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/ITriggeringEventEvaluator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/ITriggeringEventEvaluator.cs.meta diff --git a/Assets/Log4NetSrc/Core/Level.cs b/Assets/Log4Net/Log4NetSrc/Core/Level.cs similarity index 100% rename from Assets/Log4NetSrc/Core/Level.cs rename to Assets/Log4Net/Log4NetSrc/Core/Level.cs diff --git a/Assets/Log4NetSrc/Core/Level.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/Level.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/Level.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/Level.cs.meta diff --git a/Assets/Log4NetSrc/Core/LevelCollection.cs b/Assets/Log4Net/Log4NetSrc/Core/LevelCollection.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LevelCollection.cs rename to Assets/Log4Net/Log4NetSrc/Core/LevelCollection.cs diff --git a/Assets/Log4NetSrc/Core/LevelCollection.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LevelCollection.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LevelCollection.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LevelCollection.cs.meta diff --git a/Assets/Log4NetSrc/Core/LevelEvaluator.cs b/Assets/Log4Net/Log4NetSrc/Core/LevelEvaluator.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LevelEvaluator.cs rename to Assets/Log4Net/Log4NetSrc/Core/LevelEvaluator.cs diff --git a/Assets/Log4NetSrc/Core/LevelEvaluator.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LevelEvaluator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LevelEvaluator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LevelEvaluator.cs.meta diff --git a/Assets/Log4NetSrc/Core/LevelMap.cs b/Assets/Log4Net/Log4NetSrc/Core/LevelMap.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LevelMap.cs rename to Assets/Log4Net/Log4NetSrc/Core/LevelMap.cs diff --git a/Assets/Log4NetSrc/Core/LevelMap.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LevelMap.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LevelMap.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LevelMap.cs.meta diff --git a/Assets/Log4NetSrc/Core/LocationInfo.cs b/Assets/Log4Net/Log4NetSrc/Core/LocationInfo.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LocationInfo.cs rename to Assets/Log4Net/Log4NetSrc/Core/LocationInfo.cs diff --git a/Assets/Log4NetSrc/Core/LocationInfo.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LocationInfo.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LocationInfo.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LocationInfo.cs.meta diff --git a/Assets/Log4NetSrc/Core/LogException.cs b/Assets/Log4Net/Log4NetSrc/Core/LogException.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LogException.cs rename to Assets/Log4Net/Log4NetSrc/Core/LogException.cs diff --git a/Assets/Log4NetSrc/Core/LogException.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LogException.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LogException.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LogException.cs.meta diff --git a/Assets/Log4NetSrc/Core/LogImpl.cs b/Assets/Log4Net/Log4NetSrc/Core/LogImpl.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LogImpl.cs rename to Assets/Log4Net/Log4NetSrc/Core/LogImpl.cs diff --git a/Assets/Log4NetSrc/Core/LogImpl.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LogImpl.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LogImpl.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LogImpl.cs.meta diff --git a/Assets/Log4NetSrc/Core/LoggerManager.cs b/Assets/Log4Net/Log4NetSrc/Core/LoggerManager.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LoggerManager.cs rename to Assets/Log4Net/Log4NetSrc/Core/LoggerManager.cs diff --git a/Assets/Log4NetSrc/Core/LoggerManager.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LoggerManager.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LoggerManager.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LoggerManager.cs.meta diff --git a/Assets/Log4NetSrc/Core/LoggerWrapperImpl.cs b/Assets/Log4Net/Log4NetSrc/Core/LoggerWrapperImpl.cs similarity index 100% rename from Assets/Log4NetSrc/Core/LoggerWrapperImpl.cs rename to Assets/Log4Net/Log4NetSrc/Core/LoggerWrapperImpl.cs diff --git a/Assets/Log4NetSrc/Core/LoggerWrapperImpl.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LoggerWrapperImpl.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LoggerWrapperImpl.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LoggerWrapperImpl.cs.meta diff --git a/Assets/Log4NetSrc/Core/LoggingEvent.cs b/Assets/Log4Net/Log4NetSrc/Core/LoggingEvent.cs similarity index 99% rename from Assets/Log4NetSrc/Core/LoggingEvent.cs rename to Assets/Log4Net/Log4NetSrc/Core/LoggingEvent.cs index 27056a9..7569eb9 100644 --- a/Assets/Log4NetSrc/Core/LoggingEvent.cs +++ b/Assets/Log4Net/Log4NetSrc/Core/LoggingEvent.cs @@ -1018,13 +1018,13 @@ public FixFlags Fix /// /// /// The method must be called during the - /// method call if this event + /// method call if this event /// is to be used outside that method. /// /// #if NET_4_0 [System.Security.SecurityCritical] -#elif !UNITY_4_3 +#elif !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] #endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) diff --git a/Assets/Log4NetSrc/Core/LoggingEvent.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/LoggingEvent.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/LoggingEvent.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/LoggingEvent.cs.meta diff --git a/Assets/Log4NetSrc/Core/MethodItem.cs b/Assets/Log4Net/Log4NetSrc/Core/MethodItem.cs similarity index 100% rename from Assets/Log4NetSrc/Core/MethodItem.cs rename to Assets/Log4Net/Log4NetSrc/Core/MethodItem.cs diff --git a/Assets/Log4NetSrc/Core/MethodItem.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/MethodItem.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/MethodItem.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/MethodItem.cs.meta diff --git a/Assets/Log4NetSrc/Core/SecurityContext.cs b/Assets/Log4Net/Log4NetSrc/Core/SecurityContext.cs similarity index 100% rename from Assets/Log4NetSrc/Core/SecurityContext.cs rename to Assets/Log4Net/Log4NetSrc/Core/SecurityContext.cs diff --git a/Assets/Log4NetSrc/Core/SecurityContext.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/SecurityContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/SecurityContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/SecurityContext.cs.meta diff --git a/Assets/Log4NetSrc/Core/SecurityContextProvider.cs b/Assets/Log4Net/Log4NetSrc/Core/SecurityContextProvider.cs similarity index 100% rename from Assets/Log4NetSrc/Core/SecurityContextProvider.cs rename to Assets/Log4Net/Log4NetSrc/Core/SecurityContextProvider.cs diff --git a/Assets/Log4NetSrc/Core/SecurityContextProvider.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/SecurityContextProvider.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/SecurityContextProvider.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/SecurityContextProvider.cs.meta diff --git a/Assets/Log4NetSrc/Core/StackFrameItem.cs b/Assets/Log4Net/Log4NetSrc/Core/StackFrameItem.cs similarity index 100% rename from Assets/Log4NetSrc/Core/StackFrameItem.cs rename to Assets/Log4Net/Log4NetSrc/Core/StackFrameItem.cs diff --git a/Assets/Log4NetSrc/Core/StackFrameItem.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/StackFrameItem.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/StackFrameItem.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/StackFrameItem.cs.meta diff --git a/Assets/Log4NetSrc/Core/TimeEvaluator.cs b/Assets/Log4Net/Log4NetSrc/Core/TimeEvaluator.cs similarity index 100% rename from Assets/Log4NetSrc/Core/TimeEvaluator.cs rename to Assets/Log4Net/Log4NetSrc/Core/TimeEvaluator.cs diff --git a/Assets/Log4NetSrc/Core/TimeEvaluator.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/TimeEvaluator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/TimeEvaluator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/TimeEvaluator.cs.meta diff --git a/Assets/Log4NetSrc/Core/WrapperMap.cs b/Assets/Log4Net/Log4NetSrc/Core/WrapperMap.cs similarity index 100% rename from Assets/Log4NetSrc/Core/WrapperMap.cs rename to Assets/Log4Net/Log4NetSrc/Core/WrapperMap.cs diff --git a/Assets/Log4NetSrc/Core/WrapperMap.cs.meta b/Assets/Log4Net/Log4NetSrc/Core/WrapperMap.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Core/WrapperMap.cs.meta rename to Assets/Log4Net/Log4NetSrc/Core/WrapperMap.cs.meta diff --git a/Assets/Log4NetSrc/DateFormatter.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter.meta diff --git a/Assets/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs b/Assets/Log4Net/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs rename to Assets/Log4Net/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs diff --git a/Assets/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter/AbsoluteTimeDateFormatter.cs.meta diff --git a/Assets/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs b/Assets/Log4Net/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs rename to Assets/Log4Net/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs diff --git a/Assets/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter/DateTimeDateFormatter.cs.meta diff --git a/Assets/Log4NetSrc/DateFormatter/IDateFormatter.cs b/Assets/Log4Net/Log4NetSrc/DateFormatter/IDateFormatter.cs similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/IDateFormatter.cs rename to Assets/Log4Net/Log4NetSrc/DateFormatter/IDateFormatter.cs diff --git a/Assets/Log4NetSrc/DateFormatter/IDateFormatter.cs.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter/IDateFormatter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/IDateFormatter.cs.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter/IDateFormatter.cs.meta diff --git a/Assets/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs b/Assets/Log4Net/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs rename to Assets/Log4Net/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs diff --git a/Assets/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter/Iso8601DateFormatter.cs.meta diff --git a/Assets/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs b/Assets/Log4Net/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs rename to Assets/Log4Net/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs diff --git a/Assets/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs.meta b/Assets/Log4Net/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs.meta rename to Assets/Log4Net/Log4NetSrc/DateFormatter/SimpleDateFormatter.cs.meta diff --git a/Assets/Log4NetSrc/Filter.meta b/Assets/Log4Net/Log4NetSrc/Filter.meta similarity index 100% rename from Assets/Log4NetSrc/Filter.meta rename to Assets/Log4Net/Log4NetSrc/Filter.meta diff --git a/Assets/Log4NetSrc/Filter/DenyAllFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/DenyAllFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/DenyAllFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/DenyAllFilter.cs diff --git a/Assets/Log4NetSrc/Filter/DenyAllFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/DenyAllFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/DenyAllFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/DenyAllFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/FilterDecision.cs b/Assets/Log4Net/Log4NetSrc/Filter/FilterDecision.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/FilterDecision.cs rename to Assets/Log4Net/Log4NetSrc/Filter/FilterDecision.cs diff --git a/Assets/Log4NetSrc/Filter/FilterDecision.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/FilterDecision.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/FilterDecision.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/FilterDecision.cs.meta diff --git a/Assets/Log4NetSrc/Filter/FilterSkeleton.cs b/Assets/Log4Net/Log4NetSrc/Filter/FilterSkeleton.cs similarity index 98% rename from Assets/Log4NetSrc/Filter/FilterSkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Filter/FilterSkeleton.cs index 9cc24d8..b1711f0 100644 --- a/Assets/Log4NetSrc/Filter/FilterSkeleton.cs +++ b/Assets/Log4Net/Log4NetSrc/Filter/FilterSkeleton.cs @@ -29,7 +29,7 @@ namespace log4net.Filter /// /// Users should extend this class to implement customized logging /// event filtering. Note that and - /// , the parent class of all standard + /// , the parent class of all standard /// appenders, have built-in filtering rules. It is suggested that you /// first use and understand the built-in rules before rushing to write /// your own custom filters. diff --git a/Assets/Log4NetSrc/Filter/FilterSkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/FilterSkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/FilterSkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/FilterSkeleton.cs.meta diff --git a/Assets/Log4NetSrc/Filter/IFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/IFilter.cs similarity index 97% rename from Assets/Log4NetSrc/Filter/IFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/IFilter.cs index 8c597a7..6a10f41 100644 --- a/Assets/Log4NetSrc/Filter/IFilter.cs +++ b/Assets/Log4Net/Log4NetSrc/Filter/IFilter.cs @@ -30,7 +30,7 @@ namespace log4net.Filter /// /// Users should implement this interface to implement customized logging /// event filtering. Note that and - /// , the parent class of all standard + /// , the parent class of all standard /// appenders, have built-in filtering rules. It is suggested that you /// first use and understand the built-in rules before rushing to write /// your own custom filters. diff --git a/Assets/Log4NetSrc/Filter/IFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/IFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/IFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/IFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/LevelMatchFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/LevelMatchFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/LevelMatchFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/LevelMatchFilter.cs diff --git a/Assets/Log4NetSrc/Filter/LevelMatchFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/LevelMatchFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/LevelMatchFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/LevelMatchFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/LevelRangeFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/LevelRangeFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/LevelRangeFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/LevelRangeFilter.cs diff --git a/Assets/Log4NetSrc/Filter/LevelRangeFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/LevelRangeFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/LevelRangeFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/LevelRangeFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/LoggerMatchFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/LoggerMatchFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/LoggerMatchFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/LoggerMatchFilter.cs diff --git a/Assets/Log4NetSrc/Filter/LoggerMatchFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/LoggerMatchFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/LoggerMatchFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/LoggerMatchFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/MdcFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/MdcFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/MdcFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/MdcFilter.cs diff --git a/Assets/Log4NetSrc/Filter/MdcFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/MdcFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/MdcFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/MdcFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/NdcFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/NdcFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/NdcFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/NdcFilter.cs diff --git a/Assets/Log4NetSrc/Filter/NdcFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/NdcFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/NdcFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/NdcFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/PropertyFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/PropertyFilter.cs similarity index 100% rename from Assets/Log4NetSrc/Filter/PropertyFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/PropertyFilter.cs diff --git a/Assets/Log4NetSrc/Filter/PropertyFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/PropertyFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/PropertyFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/PropertyFilter.cs.meta diff --git a/Assets/Log4NetSrc/Filter/StringMatchFilter.cs b/Assets/Log4Net/Log4NetSrc/Filter/StringMatchFilter.cs similarity index 99% rename from Assets/Log4NetSrc/Filter/StringMatchFilter.cs rename to Assets/Log4Net/Log4NetSrc/Filter/StringMatchFilter.cs index ed2b943..11452b2 100644 --- a/Assets/Log4NetSrc/Filter/StringMatchFilter.cs +++ b/Assets/Log4Net/Log4NetSrc/Filter/StringMatchFilter.cs @@ -95,7 +95,7 @@ override public void ActivateOptions() { if (m_stringRegexToMatch != null) { - #if !UNITY_4_3 + #if !UNITY_4_3 && !UNITY_5 m_regexToMatch = new Regex(m_stringRegexToMatch, RegexOptions.Compiled); #endif } diff --git a/Assets/Log4NetSrc/Filter/StringMatchFilter.cs.meta b/Assets/Log4Net/Log4NetSrc/Filter/StringMatchFilter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Filter/StringMatchFilter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Filter/StringMatchFilter.cs.meta diff --git a/Assets/Log4NetSrc/GlobalContext.cs b/Assets/Log4Net/Log4NetSrc/GlobalContext.cs similarity index 100% rename from Assets/Log4NetSrc/GlobalContext.cs rename to Assets/Log4Net/Log4NetSrc/GlobalContext.cs diff --git a/Assets/Log4NetSrc/GlobalContext.cs.meta b/Assets/Log4Net/Log4NetSrc/GlobalContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/GlobalContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/GlobalContext.cs.meta diff --git a/Assets/Log4NetSrc/ILog.cs b/Assets/Log4Net/Log4NetSrc/ILog.cs similarity index 100% rename from Assets/Log4NetSrc/ILog.cs rename to Assets/Log4Net/Log4NetSrc/ILog.cs diff --git a/Assets/Log4NetSrc/ILog.cs.meta b/Assets/Log4Net/Log4NetSrc/ILog.cs.meta similarity index 100% rename from Assets/Log4NetSrc/ILog.cs.meta rename to Assets/Log4Net/Log4NetSrc/ILog.cs.meta diff --git a/Assets/Log4NetSrc/Layout.meta b/Assets/Log4Net/Log4NetSrc/Layout.meta similarity index 100% rename from Assets/Log4NetSrc/Layout.meta rename to Assets/Log4Net/Log4NetSrc/Layout.meta diff --git a/Assets/Log4NetSrc/Layout/DynamicPatternLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/DynamicPatternLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/DynamicPatternLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/DynamicPatternLayout.cs diff --git a/Assets/Log4NetSrc/Layout/DynamicPatternLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/DynamicPatternLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/DynamicPatternLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/DynamicPatternLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/ExceptionLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/ExceptionLayout.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/ExceptionLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/ExceptionLayout.cs index 06c4509..e503451 100644 --- a/Assets/Log4NetSrc/Layout/ExceptionLayout.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/ExceptionLayout.cs @@ -35,7 +35,7 @@ namespace log4net.Layout /// /// /// This Layout should only be used with appenders that utilize multiple - /// layouts (e.g. ). + /// layouts (e.g. ). /// /// /// Nicko Cadell diff --git a/Assets/Log4NetSrc/Layout/ExceptionLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/ExceptionLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/ExceptionLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/ExceptionLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/ILayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/ILayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/ILayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/ILayout.cs diff --git a/Assets/Log4NetSrc/Layout/ILayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/ILayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/ILayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/ILayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/IRawLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/IRawLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/IRawLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/IRawLayout.cs diff --git a/Assets/Log4NetSrc/Layout/IRawLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/IRawLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/IRawLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/IRawLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs diff --git a/Assets/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Layout2RawLayoutAdapter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/LayoutSkeleton.cs b/Assets/Log4Net/Log4NetSrc/Layout/LayoutSkeleton.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/LayoutSkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Layout/LayoutSkeleton.cs diff --git a/Assets/Log4NetSrc/Layout/LayoutSkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/LayoutSkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/LayoutSkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/LayoutSkeleton.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AppDomainPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs index 8ee8f57..4591468 100644 --- a/Assets/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.IO; using System.Web; diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetCachePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs index 9619349..277ddc9 100644 --- a/Assets/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.IO; using System.Web; diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetContextPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs index 282aea4..673a236 100644 --- a/Assets/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.IO; using System.Web; diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs index b59556d..ff43846 100644 --- a/Assets/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.IO; using System.Web; diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetRequestPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs similarity index 97% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs index e7e403c..a8f5a42 100644 --- a/Assets/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs @@ -19,7 +19,7 @@ // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 using System.IO; using System.Web; diff --git a/Assets/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/AspNetSessionPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/DatePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/ExceptionPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/FileLocationPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/FullLocationPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/IdentityPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LevelPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LineLocationPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/LoggerPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/MessagePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/MethodLocationPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/NamedPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/NdcPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/PatternLayoutConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/PropertyPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/RelativeTimePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTraceDetailPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/StackTracePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/ThreadPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/TypeNamePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/UserNamePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs diff --git a/Assets/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/Pattern/UtcDatePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/PatternLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/PatternLayout.cs similarity index 99% rename from Assets/Log4NetSrc/Layout/PatternLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/PatternLayout.cs index a4e9563..4afe1aa 100644 --- a/Assets/Log4NetSrc/Layout/PatternLayout.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/PatternLayout.cs @@ -861,7 +861,7 @@ static PatternLayout() // .NET Compact Framework 1.0 has no support for ASP.NET // SSCLI 1.0 has no support for ASP.NET -#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 +#if !NETCF && !SSCLI && !CLIENT_PROFILE && !UNITY_4_3 && !UNITY_5 s_globalRulesRegistry.Add("aspnet-cache", typeof(AspNetCachePatternConverter)); s_globalRulesRegistry.Add("aspnet-context", typeof(AspNetContextPatternConverter)); s_globalRulesRegistry.Add("aspnet-request", typeof(AspNetRequestPatternConverter)); diff --git a/Assets/Log4NetSrc/Layout/PatternLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/PatternLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/PatternLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/PatternLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/RawLayoutConverter.cs b/Assets/Log4Net/Log4NetSrc/Layout/RawLayoutConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/RawLayoutConverter.cs rename to Assets/Log4Net/Log4NetSrc/Layout/RawLayoutConverter.cs diff --git a/Assets/Log4NetSrc/Layout/RawLayoutConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/RawLayoutConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/RawLayoutConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/RawLayoutConverter.cs.meta diff --git a/Assets/Log4NetSrc/Layout/RawPropertyLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/RawPropertyLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/RawPropertyLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/RawPropertyLayout.cs diff --git a/Assets/Log4NetSrc/Layout/RawPropertyLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/RawPropertyLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/RawPropertyLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/RawPropertyLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/RawTimeStampLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/RawTimeStampLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/RawTimeStampLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/RawTimeStampLayout.cs diff --git a/Assets/Log4NetSrc/Layout/RawTimeStampLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/RawTimeStampLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/RawTimeStampLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/RawTimeStampLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs diff --git a/Assets/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/RawUtcTimeStampLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/SimpleLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/SimpleLayout.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/SimpleLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/SimpleLayout.cs diff --git a/Assets/Log4NetSrc/Layout/SimpleLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/SimpleLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/SimpleLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/SimpleLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/XMLLayout.cs b/Assets/Log4Net/Log4NetSrc/Layout/XMLLayout.cs similarity index 92% rename from Assets/Log4NetSrc/Layout/XMLLayout.cs rename to Assets/Log4Net/Log4NetSrc/Layout/XMLLayout.cs index f1f8c81..0fd1335 100644 --- a/Assets/Log4NetSrc/Layout/XMLLayout.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/XMLLayout.cs @@ -220,8 +220,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) writer.WriteStartElement(m_elmEvent); writer.WriteAttributeString(ATTR_LOGGER, loggingEvent.LoggerName); -#if NET_2_0 || NETCF_2_0 || MONO_2_0 || UNITY_4_3 - writer.WriteAttributeString(ATTR_TIMESTAMP, XmlConvert.ToString(loggingEvent.TimeStamp, XmlDateTimeSerializationMode.Local)); +#if NET_2_0 || NETCF_2_0 || MONO_2_0 || UNITY_4_3 || UNITY_5 + writer.WriteAttributeString(ATTR_TIMESTAMP, XmlConvert.ToString(loggingEvent.TimeStamp, XmlDateTimeSerializationMode.Local)); #else writer.WriteAttributeString(ATTR_TIMESTAMP, XmlConvert.ToString(loggingEvent.TimeStamp)); #endif @@ -246,8 +246,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) writer.WriteStartElement(m_elmMessage); if (!this.Base64EncodeMessage) { -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage, this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage, this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage, this.InvalidCharReplacement); #endif @@ -256,8 +256,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { byte[] messageBytes = Encoding.UTF8.GetBytes(loggingEvent.RenderedMessage); string base64Message = Convert.ToBase64String(messageBytes, 0, messageBytes.Length); -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, base64Message,this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, base64Message,this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, base64Message,this.InvalidCharReplacement); #endif @@ -273,8 +273,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) foreach(System.Collections.DictionaryEntry entry in properties) { writer.WriteStartElement(m_elmData); -#if UNITY_4_3 - writer.WriteAttributeString(ATTR_NAME, TransformLog4Net.MaskXmlInvalidCharacters((string)entry.Key,this.InvalidCharReplacement)); +#if UNITY_4_3 || UNITY_5 + writer.WriteAttributeString(ATTR_NAME, TransformLog4Net.MaskXmlInvalidCharacters((string)entry.Key,this.InvalidCharReplacement)); #else writer.WriteAttributeString(ATTR_NAME, Transform.MaskXmlInvalidCharacters((string)entry.Key,this.InvalidCharReplacement)); #endif @@ -283,8 +283,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) string valueStr =null; if (!this.Base64EncodeProperties) { -#if UNITY_4_3 - valueStr = TransformLog4Net.MaskXmlInvalidCharacters(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value),this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + valueStr = TransformLog4Net.MaskXmlInvalidCharacters(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value),this.InvalidCharReplacement); #else valueStr = Transform.MaskXmlInvalidCharacters(loggingEvent.Repository.RendererMap.FindAndRender(entry.Value),this.InvalidCharReplacement); #endif @@ -306,8 +306,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { // Append the stack trace line writer.WriteStartElement(m_elmException); -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); #endif diff --git a/Assets/Log4NetSrc/Layout/XMLLayout.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/XMLLayout.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/XMLLayout.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/XMLLayout.cs.meta diff --git a/Assets/Log4NetSrc/Layout/XMLLayoutBase.cs b/Assets/Log4Net/Log4NetSrc/Layout/XMLLayoutBase.cs similarity index 100% rename from Assets/Log4NetSrc/Layout/XMLLayoutBase.cs rename to Assets/Log4Net/Log4NetSrc/Layout/XMLLayoutBase.cs diff --git a/Assets/Log4NetSrc/Layout/XMLLayoutBase.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/XMLLayoutBase.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/XMLLayoutBase.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/XMLLayoutBase.cs.meta diff --git a/Assets/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs b/Assets/Log4Net/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs similarity index 95% rename from Assets/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs rename to Assets/Log4Net/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs index 3f91a50..4d8d42f 100644 --- a/Assets/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs +++ b/Assets/Log4Net/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs @@ -188,8 +188,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) // Append the message text writer.WriteStartElement("log4j:message"); -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage,this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage,this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, loggingEvent.RenderedMessage,this.InvalidCharReplacement); #endif @@ -204,8 +204,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { // Append the NDC text writer.WriteStartElement("log4j:NDC"); -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, valueStr,this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, valueStr,this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, valueStr,this.InvalidCharReplacement); #endif @@ -237,8 +237,8 @@ override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent) { // Append the stack trace line writer.WriteStartElement("log4j:throwable"); -#if UNITY_4_3 - TransformLog4Net.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); +#if UNITY_4_3 || UNITY_5 + TransformLog4Net.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); #else Transform.WriteEscapedXmlString(writer, exceptionStr,this.InvalidCharReplacement); #endif diff --git a/Assets/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs.meta b/Assets/Log4Net/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs.meta rename to Assets/Log4Net/Log4NetSrc/Layout/XmlLayoutSchemaLog4j.cs.meta diff --git a/Assets/Log4NetSrc/LogManager.cs b/Assets/Log4Net/Log4NetSrc/LogManager.cs similarity index 100% rename from Assets/Log4NetSrc/LogManager.cs rename to Assets/Log4Net/Log4NetSrc/LogManager.cs diff --git a/Assets/Log4NetSrc/LogManager.cs.meta b/Assets/Log4Net/Log4NetSrc/LogManager.cs.meta similarity index 100% rename from Assets/Log4NetSrc/LogManager.cs.meta rename to Assets/Log4Net/Log4NetSrc/LogManager.cs.meta diff --git a/Assets/Log4NetSrc/LogicalThreadContext.cs b/Assets/Log4Net/Log4NetSrc/LogicalThreadContext.cs similarity index 100% rename from Assets/Log4NetSrc/LogicalThreadContext.cs rename to Assets/Log4Net/Log4NetSrc/LogicalThreadContext.cs diff --git a/Assets/Log4NetSrc/LogicalThreadContext.cs.meta b/Assets/Log4Net/Log4NetSrc/LogicalThreadContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/LogicalThreadContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/LogicalThreadContext.cs.meta diff --git a/Assets/Log4NetSrc/MDC.cs b/Assets/Log4Net/Log4NetSrc/MDC.cs similarity index 100% rename from Assets/Log4NetSrc/MDC.cs rename to Assets/Log4Net/Log4NetSrc/MDC.cs diff --git a/Assets/Log4NetSrc/MDC.cs.meta b/Assets/Log4Net/Log4NetSrc/MDC.cs.meta similarity index 100% rename from Assets/Log4NetSrc/MDC.cs.meta rename to Assets/Log4Net/Log4NetSrc/MDC.cs.meta diff --git a/Assets/Log4NetSrc/NDC.cs b/Assets/Log4Net/Log4NetSrc/NDC.cs similarity index 100% rename from Assets/Log4NetSrc/NDC.cs rename to Assets/Log4Net/Log4NetSrc/NDC.cs diff --git a/Assets/Log4NetSrc/NDC.cs.meta b/Assets/Log4Net/Log4NetSrc/NDC.cs.meta similarity index 100% rename from Assets/Log4NetSrc/NDC.cs.meta rename to Assets/Log4Net/Log4NetSrc/NDC.cs.meta diff --git a/Assets/Log4NetSrc/ObjectRenderer.meta b/Assets/Log4Net/Log4NetSrc/ObjectRenderer.meta similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer.meta rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer.meta diff --git a/Assets/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs diff --git a/Assets/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs.meta b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs.meta similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs.meta rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/DefaultRenderer.cs.meta diff --git a/Assets/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs diff --git a/Assets/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs.meta b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs.meta similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs.meta rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/IObjectRenderer.cs.meta diff --git a/Assets/Log4NetSrc/ObjectRenderer/RendererMap.cs b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/RendererMap.cs similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/RendererMap.cs rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/RendererMap.cs diff --git a/Assets/Log4NetSrc/ObjectRenderer/RendererMap.cs.meta b/Assets/Log4Net/Log4NetSrc/ObjectRenderer/RendererMap.cs.meta similarity index 100% rename from Assets/Log4NetSrc/ObjectRenderer/RendererMap.cs.meta rename to Assets/Log4Net/Log4NetSrc/ObjectRenderer/RendererMap.cs.meta diff --git a/Assets/Log4NetSrc/Plugin.meta b/Assets/Log4Net/Log4NetSrc/Plugin.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin.meta rename to Assets/Log4Net/Log4NetSrc/Plugin.meta diff --git a/Assets/Log4NetSrc/Plugin/IPlugin.cs b/Assets/Log4Net/Log4NetSrc/Plugin/IPlugin.cs similarity index 100% rename from Assets/Log4NetSrc/Plugin/IPlugin.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/IPlugin.cs diff --git a/Assets/Log4NetSrc/Plugin/IPlugin.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/IPlugin.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/IPlugin.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/IPlugin.cs.meta diff --git a/Assets/Log4NetSrc/Plugin/IPluginFactory.cs b/Assets/Log4Net/Log4NetSrc/Plugin/IPluginFactory.cs similarity index 100% rename from Assets/Log4NetSrc/Plugin/IPluginFactory.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/IPluginFactory.cs diff --git a/Assets/Log4NetSrc/Plugin/IPluginFactory.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/IPluginFactory.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/IPluginFactory.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/IPluginFactory.cs.meta diff --git a/Assets/Log4NetSrc/Plugin/PluginCollection.cs b/Assets/Log4Net/Log4NetSrc/Plugin/PluginCollection.cs similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginCollection.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginCollection.cs diff --git a/Assets/Log4NetSrc/Plugin/PluginCollection.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/PluginCollection.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginCollection.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginCollection.cs.meta diff --git a/Assets/Log4NetSrc/Plugin/PluginMap.cs b/Assets/Log4Net/Log4NetSrc/Plugin/PluginMap.cs similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginMap.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginMap.cs diff --git a/Assets/Log4NetSrc/Plugin/PluginMap.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/PluginMap.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginMap.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginMap.cs.meta diff --git a/Assets/Log4NetSrc/Plugin/PluginSkeleton.cs b/Assets/Log4Net/Log4NetSrc/Plugin/PluginSkeleton.cs similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginSkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginSkeleton.cs diff --git a/Assets/Log4NetSrc/Plugin/PluginSkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/PluginSkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/PluginSkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/PluginSkeleton.cs.meta diff --git a/Assets/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs b/Assets/Log4Net/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs similarity index 98% rename from Assets/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs rename to Assets/Log4Net/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs index b158ce7..4f99f2e 100644 --- a/Assets/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs +++ b/Assets/Log4Net/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs @@ -31,13 +31,13 @@ namespace log4net.Plugin { /// - /// Plugin that listens for events from the + /// Plugin that listens for events from the /// /// /// /// This plugin publishes an instance of /// on a specified . This listens for logging events delivered from - /// a remote . + /// a remote . /// /// /// When an event is received it is relogged within the attached repository diff --git a/Assets/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs.meta b/Assets/Log4Net/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs.meta rename to Assets/Log4Net/Log4NetSrc/Plugin/RemoteLoggingServerPlugin.cs.meta diff --git a/Assets/Log4NetSrc/Repository.meta b/Assets/Log4Net/Log4NetSrc/Repository.meta similarity index 100% rename from Assets/Log4NetSrc/Repository.meta rename to Assets/Log4Net/Log4NetSrc/Repository.meta diff --git a/Assets/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs b/Assets/Log4Net/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs rename to Assets/Log4Net/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs diff --git a/Assets/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/ConfigurationChangedEventArgs.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/DefaultLoggerFactory.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Hierarchy.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ILoggerFactory.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/Logger.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Logger.cs similarity index 99% rename from Assets/Log4NetSrc/Repository/Hierarchy/Logger.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Logger.cs index bc5a50b..634fce1 100644 --- a/Assets/Log4NetSrc/Repository/Hierarchy/Logger.cs +++ b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Logger.cs @@ -428,7 +428,7 @@ virtual public void Log(Type callerStackBoundaryDeclaringType, Level level, obje ForcedLog((callerStackBoundaryDeclaringType != null) ? callerStackBoundaryDeclaringType : declaringType, level, message, exception); } } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch (Exception ex) { log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex); @@ -467,7 +467,7 @@ virtual public void Log(LoggingEvent logEvent) } } } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch (Exception ex) { log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex); @@ -509,7 +509,7 @@ virtual public bool IsEnabledFor(Level level) return level >= this.EffectiveLevel; } } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch (Exception ex) { log4net.Util.LogLog.Error(declaringType, "Exception while logging", ex); diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/Logger.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Logger.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/Logger.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/Logger.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/LoggerKey.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/ProvisionNode.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/RootLogger.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/RootLogger.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/RootLogger.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/RootLogger.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/RootLogger.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/RootLogger.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/RootLogger.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/RootLogger.cs.meta diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs diff --git a/Assets/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/Hierarchy/XmlHierarchyConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs similarity index 91% rename from Assets/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs index 7fdbb70..fb5e9d6 100644 --- a/Assets/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs +++ b/Assets/Log4Net/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs @@ -25,7 +25,7 @@ namespace log4net.Repository /// /// /// Interface used by basic configurator to configure a - /// with a default . + /// with a default . /// /// /// A should implement this interface to support @@ -46,7 +46,7 @@ public interface IBasicRepositoryConfigurator /// specified appender. /// /// - void Configure(Appender.IAppender appender); + void Configure(global::log4net.Appender.IAppender appender); /// /// Initialize the repository using the specified appenders @@ -58,6 +58,6 @@ public interface IBasicRepositoryConfigurator /// specified appenders. /// /// - void Configure(params Appender.IAppender[] appenders); + void Configure(params global::log4net.Appender.IAppender[] appenders); } } diff --git a/Assets/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/IBasicRepositoryConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Repository/ILoggerRepository.cs b/Assets/Log4Net/Log4NetSrc/Repository/ILoggerRepository.cs similarity index 99% rename from Assets/Log4NetSrc/Repository/ILoggerRepository.cs rename to Assets/Log4Net/Log4NetSrc/Repository/ILoggerRepository.cs index 30ef5b3..96a5243 100644 --- a/Assets/Log4NetSrc/Repository/ILoggerRepository.cs +++ b/Assets/Log4Net/Log4NetSrc/Repository/ILoggerRepository.cs @@ -344,6 +344,6 @@ public interface ILoggerRepository /// Returns all the Appenders that are configured as an Array. /// /// - log4net.Appender.IAppender[] GetAppenders(); + global::log4net.Appender.IAppender[] GetAppenders(); } } diff --git a/Assets/Log4NetSrc/Repository/ILoggerRepository.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/ILoggerRepository.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/ILoggerRepository.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/ILoggerRepository.cs.meta diff --git a/Assets/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs b/Assets/Log4Net/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs similarity index 100% rename from Assets/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs rename to Assets/Log4Net/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs diff --git a/Assets/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/IXmlRepositoryConfigurator.cs.meta diff --git a/Assets/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs b/Assets/Log4Net/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs similarity index 99% rename from Assets/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs rename to Assets/Log4Net/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs index d566331..a477b37 100644 --- a/Assets/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs +++ b/Assets/Log4Net/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs @@ -418,7 +418,7 @@ public PropertiesDictionary Properties /// Returns all the Appenders that are configured as an Array. /// /// - abstract public log4net.Appender.IAppender[] GetAppenders(); + abstract public global::log4net.Appender.IAppender[] GetAppenders(); #endregion diff --git a/Assets/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs.meta b/Assets/Log4Net/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs.meta rename to Assets/Log4Net/Log4NetSrc/Repository/LoggerRepositorySkeleton.cs.meta diff --git a/Assets/Log4NetSrc/ThreadContext.cs b/Assets/Log4Net/Log4NetSrc/ThreadContext.cs similarity index 100% rename from Assets/Log4NetSrc/ThreadContext.cs rename to Assets/Log4Net/Log4NetSrc/ThreadContext.cs diff --git a/Assets/Log4NetSrc/ThreadContext.cs.meta b/Assets/Log4Net/Log4NetSrc/ThreadContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/ThreadContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/ThreadContext.cs.meta diff --git a/Assets/Log4NetSrc/Util.meta b/Assets/Log4Net/Log4NetSrc/Util.meta similarity index 100% rename from Assets/Log4NetSrc/Util.meta rename to Assets/Log4Net/Log4NetSrc/Util.meta diff --git a/Assets/Log4NetSrc/Util/AppenderAttachedImpl.cs b/Assets/Log4Net/Log4NetSrc/Util/AppenderAttachedImpl.cs similarity index 100% rename from Assets/Log4NetSrc/Util/AppenderAttachedImpl.cs rename to Assets/Log4Net/Log4NetSrc/Util/AppenderAttachedImpl.cs diff --git a/Assets/Log4NetSrc/Util/AppenderAttachedImpl.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/AppenderAttachedImpl.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/AppenderAttachedImpl.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/AppenderAttachedImpl.cs.meta diff --git a/Assets/Log4NetSrc/Util/CompositeProperties.cs b/Assets/Log4Net/Log4NetSrc/Util/CompositeProperties.cs similarity index 100% rename from Assets/Log4NetSrc/Util/CompositeProperties.cs rename to Assets/Log4Net/Log4NetSrc/Util/CompositeProperties.cs diff --git a/Assets/Log4NetSrc/Util/CompositeProperties.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/CompositeProperties.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/CompositeProperties.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/CompositeProperties.cs.meta diff --git a/Assets/Log4NetSrc/Util/ContextPropertiesBase.cs b/Assets/Log4Net/Log4NetSrc/Util/ContextPropertiesBase.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ContextPropertiesBase.cs rename to Assets/Log4Net/Log4NetSrc/Util/ContextPropertiesBase.cs diff --git a/Assets/Log4NetSrc/Util/ContextPropertiesBase.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ContextPropertiesBase.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ContextPropertiesBase.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ContextPropertiesBase.cs.meta diff --git a/Assets/Log4NetSrc/Util/ConverterInfo.cs b/Assets/Log4Net/Log4NetSrc/Util/ConverterInfo.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ConverterInfo.cs rename to Assets/Log4Net/Log4NetSrc/Util/ConverterInfo.cs diff --git a/Assets/Log4NetSrc/Util/ConverterInfo.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ConverterInfo.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ConverterInfo.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ConverterInfo.cs.meta diff --git a/Assets/Log4NetSrc/Util/CountingQuietTextWriter.cs b/Assets/Log4Net/Log4NetSrc/Util/CountingQuietTextWriter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/CountingQuietTextWriter.cs rename to Assets/Log4Net/Log4NetSrc/Util/CountingQuietTextWriter.cs diff --git a/Assets/Log4NetSrc/Util/CountingQuietTextWriter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/CountingQuietTextWriter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/CountingQuietTextWriter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/CountingQuietTextWriter.cs.meta diff --git a/Assets/Log4NetSrc/Util/CyclicBuffer.cs b/Assets/Log4Net/Log4NetSrc/Util/CyclicBuffer.cs similarity index 100% rename from Assets/Log4NetSrc/Util/CyclicBuffer.cs rename to Assets/Log4Net/Log4NetSrc/Util/CyclicBuffer.cs diff --git a/Assets/Log4NetSrc/Util/CyclicBuffer.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/CyclicBuffer.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/CyclicBuffer.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/CyclicBuffer.cs.meta diff --git a/Assets/Log4NetSrc/Util/EmptyCollection.cs b/Assets/Log4Net/Log4NetSrc/Util/EmptyCollection.cs similarity index 100% rename from Assets/Log4NetSrc/Util/EmptyCollection.cs rename to Assets/Log4Net/Log4NetSrc/Util/EmptyCollection.cs diff --git a/Assets/Log4NetSrc/Util/EmptyCollection.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/EmptyCollection.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/EmptyCollection.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/EmptyCollection.cs.meta diff --git a/Assets/Log4NetSrc/Util/EmptyDictionary.cs b/Assets/Log4Net/Log4NetSrc/Util/EmptyDictionary.cs similarity index 100% rename from Assets/Log4NetSrc/Util/EmptyDictionary.cs rename to Assets/Log4Net/Log4NetSrc/Util/EmptyDictionary.cs diff --git a/Assets/Log4NetSrc/Util/EmptyDictionary.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/EmptyDictionary.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/EmptyDictionary.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/EmptyDictionary.cs.meta diff --git a/Assets/Log4NetSrc/Util/FormattingInfo.cs b/Assets/Log4Net/Log4NetSrc/Util/FormattingInfo.cs similarity index 100% rename from Assets/Log4NetSrc/Util/FormattingInfo.cs rename to Assets/Log4Net/Log4NetSrc/Util/FormattingInfo.cs diff --git a/Assets/Log4NetSrc/Util/FormattingInfo.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/FormattingInfo.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/FormattingInfo.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/FormattingInfo.cs.meta diff --git a/Assets/Log4NetSrc/Util/GlobalContextProperties.cs b/Assets/Log4Net/Log4NetSrc/Util/GlobalContextProperties.cs similarity index 100% rename from Assets/Log4NetSrc/Util/GlobalContextProperties.cs rename to Assets/Log4Net/Log4NetSrc/Util/GlobalContextProperties.cs diff --git a/Assets/Log4NetSrc/Util/GlobalContextProperties.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/GlobalContextProperties.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/GlobalContextProperties.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/GlobalContextProperties.cs.meta diff --git a/Assets/Log4NetSrc/Util/ILogExtensions.cs b/Assets/Log4Net/Log4NetSrc/Util/ILogExtensions.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ILogExtensions.cs rename to Assets/Log4Net/Log4NetSrc/Util/ILogExtensions.cs diff --git a/Assets/Log4NetSrc/Util/ILogExtensions.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ILogExtensions.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ILogExtensions.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ILogExtensions.cs.meta diff --git a/Assets/Log4NetSrc/Util/LevelMapping.cs b/Assets/Log4Net/Log4NetSrc/Util/LevelMapping.cs similarity index 100% rename from Assets/Log4NetSrc/Util/LevelMapping.cs rename to Assets/Log4Net/Log4NetSrc/Util/LevelMapping.cs diff --git a/Assets/Log4NetSrc/Util/LevelMapping.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/LevelMapping.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/LevelMapping.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/LevelMapping.cs.meta diff --git a/Assets/Log4NetSrc/Util/LevelMappingEntry.cs b/Assets/Log4Net/Log4NetSrc/Util/LevelMappingEntry.cs similarity index 100% rename from Assets/Log4NetSrc/Util/LevelMappingEntry.cs rename to Assets/Log4Net/Log4NetSrc/Util/LevelMappingEntry.cs diff --git a/Assets/Log4NetSrc/Util/LevelMappingEntry.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/LevelMappingEntry.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/LevelMappingEntry.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/LevelMappingEntry.cs.meta diff --git a/Assets/Log4NetSrc/Util/LogLog.cs b/Assets/Log4Net/Log4NetSrc/Util/LogLog.cs similarity index 100% rename from Assets/Log4NetSrc/Util/LogLog.cs rename to Assets/Log4Net/Log4NetSrc/Util/LogLog.cs diff --git a/Assets/Log4NetSrc/Util/LogLog.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/LogLog.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/LogLog.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/LogLog.cs.meta diff --git a/Assets/Log4NetSrc/Util/LogicalThreadContextProperties.cs b/Assets/Log4Net/Log4NetSrc/Util/LogicalThreadContextProperties.cs similarity index 100% rename from Assets/Log4NetSrc/Util/LogicalThreadContextProperties.cs rename to Assets/Log4Net/Log4NetSrc/Util/LogicalThreadContextProperties.cs diff --git a/Assets/Log4NetSrc/Util/LogicalThreadContextProperties.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/LogicalThreadContextProperties.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/LogicalThreadContextProperties.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/LogicalThreadContextProperties.cs.meta diff --git a/Assets/Log4NetSrc/Util/NativeError.cs b/Assets/Log4Net/Log4NetSrc/Util/NativeError.cs similarity index 99% rename from Assets/Log4NetSrc/Util/NativeError.cs rename to Assets/Log4Net/Log4NetSrc/Util/NativeError.cs index f690a87..2904228 100644 --- a/Assets/Log4NetSrc/Util/NativeError.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/NativeError.cs @@ -116,7 +116,7 @@ public string Message /// #if NET_4_0 [System.Security.SecuritySafeCritical] -#elif !NETCF && !UNITY_4_3 +#elif !NETCF && !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode=true)] #endif public static NativeError GetLastError() @@ -159,7 +159,7 @@ public static NativeError GetError(int number) /// #if NET_4_0 [System.Security.SecuritySafeCritical] -#elif !NETCF && !UNITY_4_3 +#elif !NETCF && !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif public static string GetErrorMessage(int messageId) diff --git a/Assets/Log4NetSrc/Util/NativeError.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/NativeError.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/NativeError.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/NativeError.cs.meta diff --git a/Assets/Log4NetSrc/Util/NullDictionaryEnumerator.cs b/Assets/Log4Net/Log4NetSrc/Util/NullDictionaryEnumerator.cs similarity index 100% rename from Assets/Log4NetSrc/Util/NullDictionaryEnumerator.cs rename to Assets/Log4Net/Log4NetSrc/Util/NullDictionaryEnumerator.cs diff --git a/Assets/Log4NetSrc/Util/NullDictionaryEnumerator.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/NullDictionaryEnumerator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/NullDictionaryEnumerator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/NullDictionaryEnumerator.cs.meta diff --git a/Assets/Log4NetSrc/Util/NullEnumerator.cs b/Assets/Log4Net/Log4NetSrc/Util/NullEnumerator.cs similarity index 100% rename from Assets/Log4NetSrc/Util/NullEnumerator.cs rename to Assets/Log4Net/Log4NetSrc/Util/NullEnumerator.cs diff --git a/Assets/Log4NetSrc/Util/NullEnumerator.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/NullEnumerator.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/NullEnumerator.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/NullEnumerator.cs.meta diff --git a/Assets/Log4NetSrc/Util/NullSecurityContext.cs b/Assets/Log4Net/Log4NetSrc/Util/NullSecurityContext.cs similarity index 100% rename from Assets/Log4NetSrc/Util/NullSecurityContext.cs rename to Assets/Log4Net/Log4NetSrc/Util/NullSecurityContext.cs diff --git a/Assets/Log4NetSrc/Util/NullSecurityContext.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/NullSecurityContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/NullSecurityContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/NullSecurityContext.cs.meta diff --git a/Assets/Log4NetSrc/Util/OnlyOnceErrorHandler.cs b/Assets/Log4Net/Log4NetSrc/Util/OnlyOnceErrorHandler.cs similarity index 100% rename from Assets/Log4NetSrc/Util/OnlyOnceErrorHandler.cs rename to Assets/Log4Net/Log4NetSrc/Util/OnlyOnceErrorHandler.cs diff --git a/Assets/Log4NetSrc/Util/OnlyOnceErrorHandler.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/OnlyOnceErrorHandler.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/OnlyOnceErrorHandler.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/OnlyOnceErrorHandler.cs.meta diff --git a/Assets/Log4NetSrc/Util/OptionConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/OptionConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/OptionConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/OptionConverter.cs diff --git a/Assets/Log4NetSrc/Util/OptionConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/OptionConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/OptionConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/OptionConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternParser.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternParser.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternParser.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternParser.cs diff --git a/Assets/Log4NetSrc/Util/PatternParser.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternParser.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternParser.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternParser.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternString.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternString.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternString.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternString.cs diff --git a/Assets/Log4NetSrc/Util/PatternString.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternString.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternString.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternString.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/AppDomainPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/DatePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/EnvironmentPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/IdentityPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/LiteralPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/NewLinePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/ProcessIdPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/PropertyPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/RandomStringPatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UserNamePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs diff --git a/Assets/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PatternStringConverters/UtcDatePatternConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/PropertiesDictionary.cs b/Assets/Log4Net/Log4NetSrc/Util/PropertiesDictionary.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PropertiesDictionary.cs rename to Assets/Log4Net/Log4NetSrc/Util/PropertiesDictionary.cs diff --git a/Assets/Log4NetSrc/Util/PropertiesDictionary.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PropertiesDictionary.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PropertiesDictionary.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PropertiesDictionary.cs.meta diff --git a/Assets/Log4NetSrc/Util/PropertyEntry.cs b/Assets/Log4Net/Log4NetSrc/Util/PropertyEntry.cs similarity index 100% rename from Assets/Log4NetSrc/Util/PropertyEntry.cs rename to Assets/Log4Net/Log4NetSrc/Util/PropertyEntry.cs diff --git a/Assets/Log4NetSrc/Util/PropertyEntry.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/PropertyEntry.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/PropertyEntry.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/PropertyEntry.cs.meta diff --git a/Assets/Log4NetSrc/Util/ProtectCloseTextWriter.cs b/Assets/Log4Net/Log4NetSrc/Util/ProtectCloseTextWriter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ProtectCloseTextWriter.cs rename to Assets/Log4Net/Log4NetSrc/Util/ProtectCloseTextWriter.cs diff --git a/Assets/Log4NetSrc/Util/ProtectCloseTextWriter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ProtectCloseTextWriter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ProtectCloseTextWriter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ProtectCloseTextWriter.cs.meta diff --git a/Assets/Log4NetSrc/Util/QuietTextWriter.cs b/Assets/Log4Net/Log4NetSrc/Util/QuietTextWriter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/QuietTextWriter.cs rename to Assets/Log4Net/Log4NetSrc/Util/QuietTextWriter.cs diff --git a/Assets/Log4NetSrc/Util/QuietTextWriter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/QuietTextWriter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/QuietTextWriter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/QuietTextWriter.cs.meta diff --git a/Assets/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs b/Assets/Log4Net/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs similarity index 99% rename from Assets/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs rename to Assets/Log4Net/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs index 4d4d94b..e5bd146 100644 --- a/Assets/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs @@ -205,7 +205,7 @@ protected Hashtable InnerHashtable /// #if NET_4_0 [System.Security.SecurityCritical] -#elif !UNITY_4_3 +#elif !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.Demand, SerializationFormatter=true)] #endif public virtual void GetObjectData(SerializationInfo info, StreamingContext context) diff --git a/Assets/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ReadOnlyPropertiesDictionary.cs.meta diff --git a/Assets/Log4NetSrc/Util/ReaderWriterLock.cs b/Assets/Log4Net/Log4NetSrc/Util/ReaderWriterLock.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ReaderWriterLock.cs rename to Assets/Log4Net/Log4NetSrc/Util/ReaderWriterLock.cs diff --git a/Assets/Log4NetSrc/Util/ReaderWriterLock.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ReaderWriterLock.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ReaderWriterLock.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ReaderWriterLock.cs.meta diff --git a/Assets/Log4NetSrc/Util/ReusableStringWriter.cs b/Assets/Log4Net/Log4NetSrc/Util/ReusableStringWriter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ReusableStringWriter.cs rename to Assets/Log4Net/Log4NetSrc/Util/ReusableStringWriter.cs diff --git a/Assets/Log4NetSrc/Util/ReusableStringWriter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ReusableStringWriter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ReusableStringWriter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ReusableStringWriter.cs.meta diff --git a/Assets/Log4NetSrc/Util/SystemInfo.cs b/Assets/Log4Net/Log4NetSrc/Util/SystemInfo.cs similarity index 98% rename from Assets/Log4NetSrc/Util/SystemInfo.cs rename to Assets/Log4Net/Log4NetSrc/Util/SystemInfo.cs index 5c4b049..df9f8cb 100644 --- a/Assets/Log4NetSrc/Util/SystemInfo.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/SystemInfo.cs @@ -225,8 +225,8 @@ public static int CurrentThreadId { #if NETCF_1_0 return System.Threading.Thread.CurrentThread.GetHashCode(); -#elif NET_2_0 || NETCF_2_0 || MONO_2_0 || UNITY_4_3 - return System.Threading.Thread.CurrentThread.ManagedThreadId; +#elif NET_2_0 || NETCF_2_0 || MONO_2_0 || UNITY_4_3 || UNITY_5 + return System.Threading.Thread.CurrentThread.ManagedThreadId; #else return AppDomain.GetCurrentThreadId(); #endif @@ -263,7 +263,7 @@ public static string HostName // Lookup the host name s_hostName = System.Net.Dns.GetHostName(); } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch (System.Net.Sockets.SocketException) { LogLog.Debug(declaringType, "Socket exception occurred while getting the dns hostname. Error Ignored."); @@ -938,15 +938,15 @@ public static string GetAppSetting(string key) { try { -#if NETCF || UNITY_4_3 - // Configuration APIs are not suported under the Compact Framework +#if NETCF || UNITY_4_3 || UNITY_5 + // Configuration APIs are not suported under the Compact Framework #elif NET_2_0 return ConfigurationManager.AppSettings[key]; #else return ConfigurationSettings.AppSettings[key]; #endif - } - catch(Exception ex) + } + catch (Exception ex) { // If an exception is thrown here then it looks like the config file does not parse correctly. LogLog.Error(declaringType, "Exception while reading ConfigurationSettings. Check your .config file is well formed XML.", ex); @@ -1017,8 +1017,8 @@ public static Hashtable CreateCaseInsensitiveHashtable() { #if NETCF_1_0 return new Hashtable(CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default); -#elif NETCF_2_0 || NET_2_0 || MONO_2_0 || UNITY_4_3 - return new Hashtable(StringComparer.OrdinalIgnoreCase); +#elif NETCF_2_0 || NET_2_0 || MONO_2_0 || UNITY_4_3 || UNITY_5 + return new Hashtable(StringComparer.OrdinalIgnoreCase); #else return System.Collections.Specialized.CollectionsUtil.CreateCaseInsensitiveHashtable(); #endif diff --git a/Assets/Log4NetSrc/Util/SystemInfo.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/SystemInfo.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/SystemInfo.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/SystemInfo.cs.meta diff --git a/Assets/Log4NetSrc/Util/SystemStringFormat.cs b/Assets/Log4Net/Log4NetSrc/Util/SystemStringFormat.cs similarity index 98% rename from Assets/Log4NetSrc/Util/SystemStringFormat.cs rename to Assets/Log4Net/Log4NetSrc/Util/SystemStringFormat.cs index 9b61931..f349152 100644 --- a/Assets/Log4NetSrc/Util/SystemStringFormat.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/SystemStringFormat.cs @@ -104,7 +104,7 @@ private static string StringFormat(IFormatProvider provider, string format, para // Try to format the string return String.Format(provider, format, args); } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch(Exception ex) { log4net.Util.LogLog.Warn(declaringType, "Exception while rendering format ["+format+"]", ex); @@ -145,7 +145,7 @@ private static string StringFormatError(Exception formatException, string format return buf.ToString(); } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch(Exception ex) { log4net.Util.LogLog.Error(declaringType, "INTERNAL ERROR during StringFormat error handling", ex); @@ -210,7 +210,7 @@ private static void RenderObject(Object obj, StringBuilder buffer) { buffer.Append(obj); } -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 catch(Exception ex) { buffer.Append(""); diff --git a/Assets/Log4NetSrc/Util/SystemStringFormat.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/SystemStringFormat.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/SystemStringFormat.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/SystemStringFormat.cs.meta diff --git a/Assets/Log4NetSrc/Util/TextWriterAdapter.cs b/Assets/Log4Net/Log4NetSrc/Util/TextWriterAdapter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TextWriterAdapter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TextWriterAdapter.cs diff --git a/Assets/Log4NetSrc/Util/TextWriterAdapter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TextWriterAdapter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TextWriterAdapter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TextWriterAdapter.cs.meta diff --git a/Assets/Log4NetSrc/Util/ThreadContextProperties.cs b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextProperties.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextProperties.cs rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextProperties.cs diff --git a/Assets/Log4NetSrc/Util/ThreadContextProperties.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextProperties.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextProperties.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextProperties.cs.meta diff --git a/Assets/Log4NetSrc/Util/ThreadContextStack.cs b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextStack.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextStack.cs rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextStack.cs diff --git a/Assets/Log4NetSrc/Util/ThreadContextStack.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextStack.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextStack.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextStack.cs.meta diff --git a/Assets/Log4NetSrc/Util/ThreadContextStacks.cs b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextStacks.cs similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextStacks.cs rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextStacks.cs diff --git a/Assets/Log4NetSrc/Util/ThreadContextStacks.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/ThreadContextStacks.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/ThreadContextStacks.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/ThreadContextStacks.cs.meta diff --git a/Assets/Log4NetSrc/Util/TransformLog4Net.cs b/Assets/Log4Net/Log4NetSrc/Util/TransformLog4Net.cs similarity index 98% rename from Assets/Log4NetSrc/Util/TransformLog4Net.cs rename to Assets/Log4Net/Log4NetSrc/Util/TransformLog4Net.cs index a6fda54..2983f42 100644 --- a/Assets/Log4NetSrc/Util/TransformLog4Net.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/TransformLog4Net.cs @@ -34,7 +34,7 @@ namespace log4net.Util /// /// Nicko Cadell /// Gert Driesen -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 public sealed class Transform #else public sealed class TransformLog4Net @@ -50,7 +50,7 @@ public sealed class TransformLog4Net /// Uses a private access modifier to prevent instantiation of this class. /// /// -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 private Transform() #else private TransformLog4Net() @@ -143,7 +143,7 @@ public static void WriteEscapedXmlString(XmlWriter writer, string textData, stri /// public static string MaskXmlInvalidCharacters(string textData, string mask) { -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 return INVALIDCHARS.Replace(textData, mask); #else return textData; @@ -203,7 +203,7 @@ private static int CountSubstrings(string text, string substring) private const string CDATA_END = "]]>"; private const string CDATA_UNESCAPABLE_TOKEN = "]]"; -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 /// /// Characters illegal in XML 1.0 /// diff --git a/Assets/Log4NetSrc/Util/TransformLog4Net.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TransformLog4Net.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TransformLog4Net.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TransformLog4Net.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/BooleanConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConversionNotSupportedException.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/ConverterRegistry.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/EncodingConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertFrom.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IConvertTo.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertTo.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/IConvertTo.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertTo.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IConvertTo.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertTo.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/IConvertTo.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IConvertTo.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs similarity index 95% rename from Assets/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs index 412e157..328223f 100644 --- a/Assets/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs @@ -77,11 +77,11 @@ public object ConvertFrom(object source) { try { -#if NET_2_0 || NETCF_2_0 || UNITY_4_3 +#if NET_2_0 || NETCF_2_0 || UNITY_4_3 || UNITY_5 #if !NETCF_2_0 - // Try an explicit parse of string representation of an IPAddress (v4 or v6) - IPAddress result; + // Try an explicit parse of string representation of an IPAddress (v4 or v6) + IPAddress result; if (IPAddress.TryParse(str, out result)) { return result; @@ -139,7 +139,7 @@ public object ConvertFrom(object source) /// /// Valid characters in an IPv4 or IPv6 address string. (Does not support subnets) /// -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 private static readonly char[] validIpAddressChars = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f','A','B','C','D','E','F','x','X','.',':','%'}; #endif } diff --git a/Assets/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/IPAddressConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternLayoutConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/PatternStringConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/TypeConverter.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverter.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/TypeConverter.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverter.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/TypeConverter.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverter.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/TypeConverter.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverter.cs.meta diff --git a/Assets/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs diff --git a/Assets/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/TypeConverters/TypeConverterAttribute.cs.meta diff --git a/Assets/Log4NetSrc/Util/WindowsSecurityContext.cs b/Assets/Log4Net/Log4NetSrc/Util/WindowsSecurityContext.cs similarity index 99% rename from Assets/Log4NetSrc/Util/WindowsSecurityContext.cs rename to Assets/Log4Net/Log4NetSrc/Util/WindowsSecurityContext.cs index ce98680..fe0a2e7 100644 --- a/Assets/Log4NetSrc/Util/WindowsSecurityContext.cs +++ b/Assets/Log4Net/Log4NetSrc/Util/WindowsSecurityContext.cs @@ -278,7 +278,7 @@ public override IDisposable Impersonate(object state) #if NET_4_0 [System.Security.SecuritySafeCritical] #endif -#if !UNITY_4_3 +#if !UNITY_4_3 && !UNITY_5 [System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)] #endif private static WindowsIdentity LogonUser(string userName, string domainName, string password) diff --git a/Assets/Log4NetSrc/Util/WindowsSecurityContext.cs.meta b/Assets/Log4Net/Log4NetSrc/Util/WindowsSecurityContext.cs.meta similarity index 100% rename from Assets/Log4NetSrc/Util/WindowsSecurityContext.cs.meta rename to Assets/Log4Net/Log4NetSrc/Util/WindowsSecurityContext.cs.meta diff --git a/Assets/Log4Net/Log4NetUnityImpl.meta b/Assets/Log4Net/Log4NetUnityImpl.meta new file mode 100644 index 0000000..13f294a --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e73069b980a5c8d4c84cf4c6a92bedc6 +folderAsset: yes +timeCreated: 1461442721 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/Editor.meta b/Assets/Log4Net/Log4NetUnityImpl/Editor.meta new file mode 100644 index 0000000..f1bf49c --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e95af597afa2d5d4e88158ce59a707fe +folderAsset: yes +timeCreated: 1461528457 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs b/Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs new file mode 100644 index 0000000..8fcaa18 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs @@ -0,0 +1,89 @@ +using System.IO; +using log4net.Config; +using UnityEngine; +using NUnit.Framework; +using Assert = UnityEngine.Assertions.Assert; + +namespace log4net.Unity.Tests +{ + public class Log4NetTest + { + private bool m_receivedLogMessage; + private bool m_atExpectedLevel; + private LogType m_expectedType; + private I_IUnityLog m_log; + + [Test] + public void TestLog4NetConfig() + { + const string log4Netconfig = "Log4NetConfig"; + TextAsset textAsset = Resources.Load(log4Netconfig); + Assert.IsNotNull(textAsset, string.Format("Could not load log4net config at {0}", log4Netconfig)); + using (Stream stream = GenerateStreamFromString(textAsset.text)) + { + XmlConfigurator.Configure(stream); + } + + m_expectedType = LogType.Log; + + m_receivedLogMessage = false; + m_log.Debug("Debug"); + Assert.IsTrue(m_receivedLogMessage, "Did not receive log message"); + Assert.IsTrue(m_atExpectedLevel, "Log message was recieved at an unexpected level"); + + m_receivedLogMessage = false; + m_log.Info("Info"); + Assert.IsTrue(m_receivedLogMessage); + Assert.IsTrue(m_atExpectedLevel); + + m_expectedType = LogType.Warning; + + m_receivedLogMessage = false; + m_log.Warn("Warn"); + Assert.IsTrue(m_receivedLogMessage); + Assert.IsTrue(m_atExpectedLevel); + + m_expectedType = LogType.Error; + + m_receivedLogMessage = false; + m_log.Error("Error"); + Assert.IsTrue(m_receivedLogMessage); + Assert.IsTrue(m_atExpectedLevel); + + m_receivedLogMessage = false; + m_log.Fatal("Fatal"); + Assert.IsTrue(m_receivedLogMessage); + Assert.IsTrue(m_atExpectedLevel); + } + + [SetUp] + public void OnSetUp() + { + m_log = UnityLogManager.GetLogger(typeof(Log4NetTest)); + Application.logMessageReceived += OnLogCallback; + } + + private void OnLogCallback(string condition, string stacktrace, LogType type) + { + m_receivedLogMessage = true; + m_atExpectedLevel = type == m_expectedType; + } + + [TearDown] + public void OnTearDown() + { + LogManager.Shutdown(); + Application.logMessageReceived -= OnLogCallback; + } + + public Stream GenerateStreamFromString(string s) + { + MemoryStream stream = new MemoryStream(); + StreamWriter writer = new StreamWriter(stream); + writer.Write(s); + writer.Flush(); + stream.Position = 0; + return stream; + } + } +} \ No newline at end of file diff --git a/Assets/Log4NetSrc/Log4netAssemblyInfo.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs.meta similarity index 52% rename from Assets/Log4NetSrc/Log4netAssemblyInfo.cs.meta rename to Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs.meta index 6eb0652..26988a6 100644 --- a/Assets/Log4NetSrc/Log4netAssemblyInfo.cs.meta +++ b/Assets/Log4Net/Log4NetUnityImpl/Editor/Log4NetTest.cs.meta @@ -1,8 +1,12 @@ fileFormatVersion: 2 -guid: a3593b3a8184b0a4e8d071f2437e3d5a +guid: db42343baed1dc348936d80dc3ca666b +timeCreated: 1461442861 +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs b/Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs new file mode 100644 index 0000000..3b449fe --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs @@ -0,0 +1,20 @@ +using System; +using log4net; +using Object = UnityEngine.Object; + +namespace log4net.Unity +{ + public interface I_IUnityLog : ILog + { + void Debug(string message, Object unityObject, Exception exception); + void Debug(string message, Object unityObject); + void Info(string message, Object unityObject, Exception exception); + void Info(string message, Object unityObject); + void Warn(string message, Object unityObject, Exception exception); + void Warn(string message, Object unityObject); + void Error(string message, Object unityObject, Exception exception); + void Error(string message, Object unityObject); + void Fatal(string message, Object unityObject, Exception exception); + void Fatal(string message, Object unityObject); + } +} \ No newline at end of file diff --git a/Assets/Log4NetSrc/AssemblyInfo.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs.meta similarity index 52% rename from Assets/Log4NetSrc/AssemblyInfo.cs.meta rename to Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs.meta index f87aa26..81fcf42 100644 --- a/Assets/Log4NetSrc/AssemblyInfo.cs.meta +++ b/Assets/Log4Net/Log4NetUnityImpl/I_IUnityLog.cs.meta @@ -1,8 +1,12 @@ fileFormatVersion: 2 -guid: 44a5d06cbf5a6ea4ab58804f842b61e9 +guid: bc11be02e28f46245a55d965950156d6 +timeCreated: 1461528442 +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/Resources.meta b/Assets/Log4Net/Log4NetUnityImpl/Resources.meta new file mode 100644 index 0000000..f1d6b8c --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/Resources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 606cbabd2e561b242927666e391b2c42 +folderAsset: yes +timeCreated: 1461443586 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml b/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml new file mode 100644 index 0000000..bd08071 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml.meta b/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml.meta new file mode 100644 index 0000000..c101c16 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/Resources/Log4NetConfig.xml.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 504aa32a46fc45341bb60ea6a587fd49 +timeCreated: 1461510768 +licenseType: Free +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs b/Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs new file mode 100644 index 0000000..ae98473 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs @@ -0,0 +1,40 @@ +using JetBrains.Annotations; +using log4net.Appender; +using log4net.Core; +using UnityEngine; +using Object = UnityEngine.Object; + +namespace log4net.Unity +{ + [UsedImplicitly] + public class UnityLogAppender : AppenderSkeleton + { + protected override void Append(LoggingEvent loggingEvent) + { + UnityObjectPair unityObjectPair = loggingEvent.MessageObject as UnityObjectPair; + Object unityObject = (null == unityObjectPair) ? null : unityObjectPair.UnityObject; + string renderLoggingEvent = loggingEvent.RenderedMessage; + if (Layout != null) + { + renderLoggingEvent = RenderLoggingEvent(loggingEvent); + } + Level level = loggingEvent.Level; + if (level < Level.Warn) + { + Debug.Log(renderLoggingEvent, unityObject); + } + else if (level < Level.Error) + { + Debug.LogWarning(renderLoggingEvent, unityObject); + } + else if (level < Level.Off) + { + Debug.LogError(renderLoggingEvent, unityObject); + } + if (null != loggingEvent.ExceptionObject) + { + Debug.LogException(loggingEvent.ExceptionObject, unityObject); + } + } + } +} diff --git a/Assets/Log4NetSrc/AssemblyVersionInfo.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs.meta similarity index 52% rename from Assets/Log4NetSrc/AssemblyVersionInfo.cs.meta rename to Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs.meta index d2d72d0..490efac 100644 --- a/Assets/Log4NetSrc/AssemblyVersionInfo.cs.meta +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogAppender.cs.meta @@ -1,8 +1,12 @@ fileFormatVersion: 2 -guid: 8b40a117962806f4cb075ebb6d62d7ff +guid: ea927aa85de21994da6f652248bdb554 +timeCreated: 1461510404 +licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs b/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs new file mode 100644 index 0000000..8513d3b --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs @@ -0,0 +1,18 @@ +using System; +using System.Reflection; +using log4net.Core; + +namespace log4net.Unity +{ + public static class UnityLogManager + { + public static I_IUnityLog GetLogger(Type type) + { + return GetLogger(Assembly.GetCallingAssembly(), type.FullName); + } + public static I_IUnityLog GetLogger(Assembly repositoryAssembly, string name) + { + return new UnityLogWrapper(LoggerManager.GetLogger(repositoryAssembly, name)); + } + } +} \ No newline at end of file diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs.meta new file mode 100644 index 0000000..00c0ac0 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 413a09559247e9341a783df27460c346 +timeCreated: 1461528442 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs b/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs new file mode 100644 index 0000000..29aed9a --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs @@ -0,0 +1,56 @@ +using System; +using log4net.Appender; +using log4net.Core; +using Object = UnityEngine.Object; + +namespace log4net.Unity +{ + public class UnityLogWrapper : LogImpl, I_IUnityLog + { + public UnityLogWrapper(ILogger log) + : base(log) + { + } + + public void Debug(string message, Object unityObject, Exception exception) + { + Debug(new UnityObjectPair(message, unityObject), exception); + } + public void Debug(string message, Object unityObject) + { + Debug(new UnityObjectPair(message, unityObject)); + } + public void Info(string message, Object unityObject, Exception exception) + { + Info(new UnityObjectPair(message, unityObject), exception); + } + public void Info(string message, Object unityObject) + { + Info(new UnityObjectPair(message, unityObject)); + } + public void Warn(string message, Object unityObject, Exception exception) + { + Warn(new UnityObjectPair(message, unityObject), exception); + } + public void Warn(string message, Object unityObject) + { + Warn(new UnityObjectPair(message, unityObject)); + } + public void Error(string message, Object unityObject, Exception exception) + { + Error(new UnityObjectPair(message, unityObject), exception); + } + public void Error(string message, Object unityObject) + { + Error(new UnityObjectPair(message, unityObject)); + } + public void Fatal(string message, Object unityObject, Exception exception) + { + Fatal(new UnityObjectPair(message, unityObject), exception); + } + public void Fatal(string message, Object unityObject) + { + Fatal(new UnityObjectPair(message, unityObject)); + } + } +} \ No newline at end of file diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs.meta new file mode 100644 index 0000000..7dda492 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityLogWrapper.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c95223657e2c3354ea4bbda73f0042f5 +timeCreated: 1461528442 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs b/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs new file mode 100644 index 0000000..0dd93e3 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs @@ -0,0 +1,42 @@ +using System.IO; +using log4net.ObjectRenderer; +using UnityEngine; +using SystemInfo = log4net.Util.SystemInfo; + +namespace log4net.Unity +{ + public class UnityObjectPair : IObjectRenderer + { + private readonly string m_message; + private readonly Object m_unityObject; + + public UnityObjectPair(string message, Object unityObject) + { + m_message = message; + m_unityObject = unityObject; + } + + public Object UnityObject + { + get { return m_unityObject; } + } + + public void RenderObject(RendererMap rendererMap, object obj, TextWriter writer) + { + if (obj == null) + { + writer.Write(SystemInfo.NullText); + return; + } + UnityObjectPair unityObjectPair = obj as UnityObjectPair; + + if (unityObjectPair == null) + { + rendererMap.FindAndRender(obj, writer); + return; + } + + writer.Write(unityObjectPair.m_message ?? SystemInfo.NullText); + } + } +} \ No newline at end of file diff --git a/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs.meta b/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs.meta new file mode 100644 index 0000000..8f62091 --- /dev/null +++ b/Assets/Log4Net/Log4NetUnityImpl/UnityObjectPair.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 4eb12a10a9099f14d9d17e4d14fbfb93 +timeCreated: 1461529831 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Log4NetSrc/AssemblyInfo.cs b/Assets/Log4NetSrc/AssemblyInfo.cs deleted file mode 100644 index 2048cac..0000000 --- a/Assets/Log4NetSrc/AssemblyInfo.cs +++ /dev/null @@ -1,141 +0,0 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -using System.Reflection; -using System.Runtime.CompilerServices; - -#if (!SSCLI) -// -// log4net makes use of static methods which cannot be made com visible -// -[assembly: System.Runtime.InteropServices.ComVisible(false)] -#endif - -// -// log4net is CLS compliant -// -#if !UNITY_4_3 -[assembly: System.CLSCompliant(true)] -#endif - -#if (!NETCF) -// -// If log4net is strongly named it still allows partially trusted callers -// -[assembly: System.Security.AllowPartiallyTrustedCallers] -#endif - -#if (NET_4_0) -// -// Allows partial trust applications (e.g. ASP.NET shared hosting) on .NET 4.0 to work -// given our implementation of ISerializable. -// -[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] -#endif - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// - -#if (CLI_1_0) -[assembly: AssemblyTitle("Apache log4net for CLI 1.0 Compatible Frameworks")] -#elif (NET_1_0) -[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.0")] -#elif (NET_1_1) -[assembly: AssemblyTitle("Apache log4net for .NET Framework 1.1")] -#elif (NET_4_0) -#if CLIENT_PROFILE -[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0 Client Profile")] -#else -[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.0")] -#endif // Client Profile -#elif (NET_2_0) -#if CLIENT_PROFILE -[assembly: AssemblyTitle("Apache log4net for .NET Framework 3.5 Client Profile")] -#else -[assembly: AssemblyTitle("Apache log4net for .NET Framework 2.0")] -#endif // Client Profile -#elif (NETCF_1_0) -[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 1.0")] -#elif (NETCF_2_0) -[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework 2.0")] -#elif (MONO_1_0) -[assembly: AssemblyTitle("Apache log4net for Mono 1.0")] -#elif (MONO_2_0) -[assembly: AssemblyTitle("Apache log4net for Mono 2.0")] -#elif (SSCLI_1_0) -[assembly: AssemblyTitle("Apache log4net for Shared Source CLI 1.0")] -#elif (CLI_1_0) -[assembly: AssemblyTitle("Apache log4net for CLI Compatible Frameworks")] -#elif (NET) -[assembly: AssemblyTitle("Apache log4net for .NET Framework")] -#elif (NETCF) -[assembly: AssemblyTitle("Apache log4net for .NET Compact Framework")] -#elif (MONO) -[assembly: AssemblyTitle("Apache log4net for Mono")] -#elif (SSCLI) -[assembly: AssemblyTitle("Apache log4net for Shared Source CLI")] -#else -[assembly: AssemblyTitle("Apache log4net")] -#endif - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Retail")] -#endif - -[assembly: AssemblyProduct("log4net")] -[assembly: AssemblyDefaultAlias("log4net")] -[assembly: AssemblyCulture("")] - -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project output directory which is -// %Project Directory%\obj\. For example, if your KeyFile is -// located in the project directory, you would specify the AssemblyKeyFile -// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// -#if STRONG && (CLI_1_0 || NET_1_0 || NET_1_1 || NETCF_1_0 || SSCLI) -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile(@"..\..\..\log4net.snk")] -#endif -// We do not use a CSP key for strong naming -// [assembly: AssemblyKeyName("")] - diff --git a/Assets/Log4NetSrc/AssemblyVersionInfo.cs b/Assets/Log4NetSrc/AssemblyVersionInfo.cs deleted file mode 100644 index 56e0d06..0000000 --- a/Assets/Log4NetSrc/AssemblyVersionInfo.cs +++ /dev/null @@ -1,46 +0,0 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: System.Reflection.AssemblyVersion("1.2.13.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.2")] - -#if !NETCF -#if !SSCLI -[assembly: System.Reflection.AssemblyFileVersion("1.2.13.0")] -#endif -#endif - -// -// Shared assembly settings -// - -[assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")] -[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2013 The Apache Software Foundation.")] -[assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")] diff --git a/Assets/Log4NetSrc/Log4netAssemblyInfo.cs b/Assets/Log4NetSrc/Log4netAssemblyInfo.cs deleted file mode 100644 index 08ee5b3..0000000 --- a/Assets/Log4NetSrc/Log4netAssemblyInfo.cs +++ /dev/null @@ -1,88 +0,0 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -namespace log4net { - - /// - /// Provides information about the environment the assembly has - /// been built for. - /// - public sealed class AssemblyInfo { - /// Version of the assembly - public const string Version = "1.2.13"; - - /// Version of the framework targeted -#if NET_1_1 - public const decimal TargetFrameworkVersion = 1.1M; -#elif NET_4_0 - public const decimal TargetFrameworkVersion = 4.0M; -#elif NET_2_0 || NETCF_2_0 || MONO_2_0 -#if !CLIENT_PROFILE - public const decimal TargetFrameworkVersion = 2.0M; -#else - public const decimal TargetFrameworkVersion = 3.5M; -#endif // Client Profile -#else - public const decimal TargetFrameworkVersion = 1.0M; -#endif - - /// Type of framework targeted -#if CLI - public const string TargetFramework = "CLI Compatible Frameworks"; -#elif NET - public const string TargetFramework = ".NET Framework"; -#elif NETCF - public const string TargetFramework = ".NET Compact Framework"; -#elif MONO - public const string TargetFramework = "Mono"; -#elif SSCLI - public const string TargetFramework = "Shared Source CLI"; -#else - public const string TargetFramework = "Unknown"; -#endif - - /// Does it target a client profile? -#if !CLIENT_PROFILE - public const bool ClientProfile = false; -#else - public const bool ClientProfile = true; -#endif - - /// - /// Identifies the version and target for this assembly. - /// - public static string Info { - get { - return string.Format("Apache log4net version {0} compiled for {1}{2} {3}", - Version, TargetFramework, - /* Can't use - ClientProfile && true ? " Client Profile" : - or the compiler whines about unreachable expressions - */ -#if !CLIENT_PROFILE - string.Empty, -#else - " Client Profile", -#endif - TargetFrameworkVersion); - } - } - } - -} diff --git a/Assets/Log4NetSrc/assembly.meta b/Assets/Log4NetSrc/assembly.meta deleted file mode 100644 index a6a0f46..0000000 --- a/Assets/Log4NetSrc/assembly.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: e017ef85a3cd03e44be2c9869299f9a6 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Log4NetSrc/assembly/bin.xml b/Assets/Log4NetSrc/assembly/bin.xml deleted file mode 100644 index c52bf0d..0000000 --- a/Assets/Log4NetSrc/assembly/bin.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - bin - - zip - tar.gz - - apache-log4j-${project.version} - true - - - - *.txt - *.sample - *.xml - INSTALL - KEYS - LICENSE - NOTICE - contribs/** - examples/** - src/assembly/** - src/changes/** - src/main/** - src/ntdll/** - src/performance/** - src/site/** - tests/README - tests/*.xml - tests/*.sample - tests/*.bat - tests/input/** - tests/resources/** - tests/src/** - tests/witness/** - - - - - - target/log4j-${project.version}.jar - - - target/NTEventLogAppender.dll - 0755 - - - diff --git a/Assets/Log4NetSrc/assembly/bin.xml.meta b/Assets/Log4NetSrc/assembly/bin.xml.meta deleted file mode 100644 index 48e7adf..0000000 --- a/Assets/Log4NetSrc/assembly/bin.xml.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: e42a971983183b04a8becc71ba46afd4 -TextScriptImporter: - userData: diff --git a/Assets/Log4NetSrc/changes.meta b/Assets/Log4NetSrc/changes.meta deleted file mode 100644 index 6c60989..0000000 --- a/Assets/Log4NetSrc/changes.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: b8f97b73aca851e48aa503321ca3a359 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/Log4NetSrc/changes/changes.xml b/Assets/Log4NetSrc/changes/changes.xml deleted file mode 100644 index 96e9f02..0000000 --- a/Assets/Log4NetSrc/changes/changes.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Apache log4net - - - - - - \ No newline at end of file diff --git a/Assets/Log4NetSrc/changes/changes.xml.meta b/Assets/Log4NetSrc/changes/changes.xml.meta deleted file mode 100644 index e7ff329..0000000 --- a/Assets/Log4NetSrc/changes/changes.xml.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: e6e5a733df3ccc94fb9faef39a8d0d86 -TextScriptImporter: - userData: diff --git a/Assets/UnityTests.meta b/Assets/UnityTests.meta deleted file mode 100644 index 4401fb3..0000000 --- a/Assets/UnityTests.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: b13cdad41905bfa478abab01bee7717f -folderAsset: yes -DefaultImporter: - userData: diff --git a/DllRelease/Log4NetUnity.dll b/DllRelease/Log4NetUnity.dll deleted file mode 100644 index 40210c4..0000000 Binary files a/DllRelease/Log4NetUnity.dll and /dev/null differ diff --git a/DllRelease/log4net.dll b/DllRelease/log4net.dll new file mode 100644 index 0000000..f07a323 Binary files /dev/null and b/DllRelease/log4net.dll differ diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..e44fa7e Binary files /dev/null and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 91be959..4ce9444 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..a69113f Binary files /dev/null and b/ProjectSettings/NavMeshAreas.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6adf2c8..58de9cd 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..96d6c53 --- /dev/null +++ b/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 5.4.0b15 +m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset new file mode 100644 index 0000000..7b547ee Binary files /dev/null and b/ProjectSettings/UnityAdsSettings.asset differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..3e2d883 Binary files /dev/null and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/README.md b/README.md index f9245bc..a58bfad 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,28 @@ An adaptation of Log4Net that works with Unity The priority is to make this work for all rather than specific versions of Unity -Made for Net 2.0 Subset and Unity Free +Made for Net 2.0 Subset -Log4Net Appenders that do not work in this adaption: +

Installation

+Place the Assets/Log4Net folder anywhere in your project + +

Usage

+To use, you will nead to use the XmlConfigurator class to load an xml file to configure the system. + +There is a UnityLogManager for doing unity related things with the logging (like passing objects). + +To find out more about using log4net, please read the website, it has plenty of info: +https://logging.apache.org/log4net/release/manual/configuration.html + +

Release Notes

+ - Updated to work with Unity 5 + +

Log4Net Appenders that do not work in this adaption

AdoNetAppender AspNetTraceAppender DebugAppender EventLogAppender ManagedColoredConsoleAppender -TelnetAppender (Pro-Only) UdpAppender -RemoteSyslogAppender \ No newline at end of file +RemoteSyslogAppender