From 844fa9d5e6f79d63a6c9cb9d31ec5fd1a4bcc463 Mon Sep 17 00:00:00 2001 From: kayone Date: Mon, 11 Nov 2013 00:17:29 -0800 Subject: [PATCH] update NLog, Restsharp, json.net --- src/NzbDrone.Api/NzbDrone.Api.csproj | 6 +- src/NzbDrone.Api/packages.config | 4 +- .../NzbDrone.Host.Test.csproj | 4 +- src/NzbDrone.App.Test/packages.config | 2 +- .../NzbDrone.Common.Test.csproj | 4 +- src/NzbDrone.Common.Test/packages.config | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 6 +- src/NzbDrone.Common/packages.config | 4 +- src/NzbDrone.Console/NzbDrone.Console.csproj | 6 +- src/NzbDrone.Console/packages.config | 4 +- .../NzbDrone.Core.Test.csproj | 6 +- src/NzbDrone.Core.Test/packages.config | 4 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 10 +- src/NzbDrone.Core/packages.config | 6 +- src/NzbDrone.Host/NLog.xsd | 2599 +++++++++-------- src/NzbDrone.Host/NzbDrone.Host.csproj | 6 +- src/NzbDrone.Host/packages.config | 6 +- .../NzbDrone.Integration.Test.csproj | 11 +- src/NzbDrone.Integration.Test/packages.config | 6 +- .../NzbDrone.Libraries.Test.csproj | 2 +- src/NzbDrone.Libraries.Test/packages.config | 2 +- src/NzbDrone.SignalR/NzbDrone.SignalR.csproj | 5 +- src/NzbDrone.SignalR/packages.config | 2 +- .../NzbDrone.Test.Common.csproj | 6 +- src/NzbDrone.Test.Common/packages.config | 4 +- .../NzbDrone.Update.Test.csproj | 4 +- src/NzbDrone.Update.Test/packages.config | 2 +- src/NzbDrone.Update/NLog.xsd | 2599 +++++++++-------- src/NzbDrone.Update/NzbDrone.Update.csproj | 6 +- src/NzbDrone.Update/packages.config | 6 +- src/NzbDrone/NzbDrone.csproj | 6 +- src/NzbDrone/packages.config | 4 +- 32 files changed, 2720 insertions(+), 2624 deletions(-) diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index d97184e75..307ade4b0 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -56,11 +56,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll ..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index b722cefda..2fc701d06 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index 3581eb9cb..2b3db8178 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -44,9 +44,9 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index 6f925b437..c88b100c8 100644 --- a/src/NzbDrone.App.Test/packages.config +++ b/src/NzbDrone.App.Test/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index 1ec40855c..dcdca41b2 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -41,9 +41,9 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 01e492eef..80b884496 100644 --- a/src/NzbDrone.Common.Test/packages.config +++ b/src/NzbDrone.Common.Test/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 869176ecb..6a6cc35f4 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -46,11 +46,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index 7252d18f7..4e193d0ba 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 956b066b2..aa2350931 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -81,11 +81,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 268430b6b..4c6a0521b 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 66bd95291..6b50fda46 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -79,11 +79,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index b751901cd..234ffd26d 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -8,8 +8,8 @@ - - + + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 9007ad74e..a2002f474 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -83,11 +83,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll ..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll @@ -96,9 +96,9 @@ False ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll - + False - ..\packages\RestSharp.104.2.0\lib\net4\RestSharp.dll + ..\packages\RestSharp.104.3.3\lib\net4\RestSharp.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index b0bc75532..1c01c0a9f 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -4,9 +4,9 @@ - - + + - + \ No newline at end of file diff --git a/src/NzbDrone.Host/NLog.xsd b/src/NzbDrone.Host/NLog.xsd index 2203f4ede..49dd62049 100644 --- a/src/NzbDrone.Host/NLog.xsd +++ b/src/NzbDrone.Host/NLog.xsd @@ -224,6 +224,84 @@ + + + + + + + + + + + + Name of the target. + + + + + Indicates whether buffer should grow as needed. + + + + + Number of log events to be buffered. + + + + + Maximum number of log events that the buffer can keep. + + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to add <!-- --> comments around all written texts. + + + + + Layout used to format log messages. + + + + + @@ -289,8 +367,8 @@ - + @@ -302,14 +380,14 @@ Indicates whether to use sliding timeout. - + - Number of log events to be buffered. + Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. - + - Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. + Number of log events to be buffered. @@ -321,21 +399,22 @@ - - + + - + + - - - - + + + + @@ -347,11 +426,6 @@ Indicates whether to append newline at the end of log message. - - - Instance of that is used to format log messages. - - Action that should be taken if the message is larger than maxMessageSize. @@ -367,9 +441,9 @@ Encoding to be used. - + - Size of the connection cache (number of connections which are kept alive). + Instance of that is used to format log messages. @@ -377,14 +451,24 @@ Network address. + + + Size of the connection cache (number of connections which are kept alive). + + Indicates whether to keep connection open whenever possible. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Maximum queue size. + + + + + Indicates whether to include dictionary contents. @@ -397,9 +481,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include NLog-specific extensions to log4j schema. @@ -407,14 +491,14 @@ Indicates whether to include stack contents. - + - Indicates whether to include NLog-specific extensions to log4j schema. + NDC item separator. - + - Indicates whether to include dictionary contents. + Indicates whether to include source info (file name and line number) in the information sent over the network. @@ -443,26 +527,24 @@ - + - - + + + + + Name of the target. - - - Text to be rendered. - - Footer. @@ -473,102 +555,233 @@ Header. - - - Indicates whether to send the log messages to the standard error instead of the standard output. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. - - - - - Name of the database provider. - - - - - Indicates whether to use database transactions. Some data providers require this. - - - - - Name of the connection string (as specified in <connectionStrings> configuration section. - - - - - Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. - - - - - Indicates whether to keep the database connection open between the log events. - - - - - Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. - - - - - Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. - - - + - Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + Text to be rendered. - + - Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. + Indicates whether to use default row highlighting rules. - + - Text of the SQL command to be run on each log level. + Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Condition that must be met in order to set the specified foreground and background color. + + + + + Background color. + + + + + Foreground color. + + + + + + + + + + + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + + + Background color. + + + + + Foreground color. + + + + + + + + + + + + + + + + Name of the target. + + + + + Footer. + + + + + Header. + + + + + Text to be rendered. + + + + + Indicates whether to send the log messages to the standard error instead of the standard output. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name of the target. + + + + + Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. + + + + + Name of the database provider. + + + + + Indicates whether to use database transactions. Some data providers require this. + + + + + Indicates whether to keep the database connection open between the log events. + + + + + Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. + + + + + Name of the connection string (as specified in <connectionStrings> configuration section. + + + + + Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. + + + + + Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + + + + + Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. + + + + + Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. + + + + + Text of the SQL command to be run on each log level. + + + + + + + + + + @@ -634,11 +847,13 @@ - + + + @@ -646,64 +861,55 @@ Name of the target. + + + Footer. + + + + + Header. + + - Layout used to format log messages. + Text to be rendered. - + - + - + Name of the target. - + - Indicates whether to return to the first target after any successful write. + Layout used to format log messages. - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -712,17 +918,92 @@ - Text to be rendered. + Layout used to format log messages. - + - Header. + Name of the machine on which Event Log service is running. - + - Footer. + Value to be used as the event Source. + + + + + Name of the Event Log to write to. This can be System, Application or any user-defined name. + + + + + Layout that renders event Category. + + + + + Layout that renders event ID. + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to return to the first target after any successful write. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name of the target. @@ -735,14 +1016,29 @@ Line ending mode. - + - Size in bytes above which log files will be automatically archived. + Footer. - + - Maximum number of archive files that should be kept. + Text to be rendered. + + + + + Header. + + + + + Indicates whether to automatically archive log files every time the specified time passes. + + + + + Size in bytes above which log files will be automatically archived. @@ -750,19 +1046,19 @@ Name of the file to be used for an archive. - + - Way file archives are numbered. + Maximum number of archive files that should be kept. - + - Indicates whether to automatically archive log files every time the specified time passes. + Way file archives are numbered. - + - Indicates whether to replace file contents on each write instead of appending log message at the end. + Gets ors set a value indicating whether a managed file stream is forced, instead of used the native implementation. @@ -770,11 +1066,6 @@ File attributes (Windows only). - - - Name of the file to write to. - - Indicates whether to delete old log file on startup. @@ -790,9 +1081,14 @@ Indicates whether to create directories if they don't exist. - + - Indicates whether concurrent writes to the log file by multiple processes on the same host. + Indicates whether to replace file contents on each write instead of appending log message at the end. + + + + + Name of the file to write to. @@ -800,14 +1096,14 @@ Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. - + - Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). + Log file buffer size in bytes. - + - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + Number of times the write is appended on the file before NLog discards the log message. @@ -815,19 +1111,24 @@ Delay in milliseconds to wait before attempting to write to the file again. - + - Number of times the write is appended on the file before NLog discards the log message. + Indicates whether to automatically flush the file buffers after each log message. - + - Log file buffer size in bytes. + Indicates whether concurrent writes to the log file by multiple processes on the same host. - + - Indicates whether to automatically flush the file buffers after each log message. + Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). + + + + + Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -847,12 +1148,6 @@ - - - - - - @@ -863,9 +1158,15 @@ + + + + + + - + @@ -881,7 +1182,6 @@ - @@ -904,12 +1204,16 @@ - + + + + + @@ -921,257 +1225,327 @@ Layout used to format log messages. - - - - - - - - - - - - + - Name of the target. + Name of the Form on which the control is located. - + - Layout used to format log messages. + Name of control to which NLog will log write log text. - + - Message box title. + Indicates whether log text should be appended to the text of the control instead of overwriting it. + + + + + Whether new log entry are added to the start or the end of the control - + - + - - - + + + + + + + Name of the target. - + - Method name. The method must be public and static. + User account password. - + - Class name. + Indicates whether to revert to the credentials of the process instead of impersonating another user. + + + + + Username to change context to. + + + + + Logon Type. + + + + + Windows domain name to change context to. + + + + + Required impersonation level. + + + + + Type of the logon provider. - - - - - - - - - Layout that should be use to calcuate the value for the parameter. - - - - - Name of the parameter. - - - - - Type of the parameter. - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + Name of the target. - - - Action that should be taken if the message is larger than maxMessageSize. - - - - - Indicates whether to append newline at the end of log message. - - - - - Layout used to format log messages. - - - + - Maximum message size in bytes. + Name of the endpoint configuration in WCF configuration file. - + - Encoding to be used. + Endpoint address. - + - Size of the connection cache (number of connections which are kept alive). + Indicates whether to use binary message encoding. - + - Indicates whether to keep connection open whenever possible. + Client ID. - + - Network address. + Indicates whether to include per-event properties in the payload sent to the server. - + + + + + + + + + Layout that should be use to calcuate the value for the parameter. + + + + + Name of the parameter. + + + + + Type of the parameter. + + + + - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + Name of the target. - + - Indicates whether to append newline at the end of log message. + Indicates whether to send message as HTML instead of plain text. + + + + + Encoding to be used for sending e-mail. + + + + + Indicates whether to add new lines between log entries. - Instance of that is used to format log messages. + Text to be rendered. - + - Action that should be taken if the message is larger than maxMessageSize. + Header. - + - Maximum message size in bytes. + Footer. - + - Encoding to be used. + Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Size of the connection cache (number of connections which are kept alive). + CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Network address. + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Indicates whether to keep connection open whenever possible. + Mail subject. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Mail message body (repeated for each log message send in one mail). - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Sender's email address (e.g. joe@domain.com). - + - AppInfo field. By default it's the friendly name of the current AppDomain. + Indicates whether NewLine characters in the body should be replaced with tags. - + - NDC item separator. + Priority used for sending mails. - + - Indicates whether to include stack contents. + Indicates whether the default Settings from System.Net.MailSettings should be used. - + - Indicates whether to include NLog-specific extensions to log4j schema. + SMTP Server to be used for sending. - + - Indicates whether to include dictionary contents. + Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + Port number that SMTP Server is listening on. + + + + + SMTP Authentication mode. + + + + + Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. - + + + + + + + + - @@ -1179,11 +1553,6 @@ Name of the target. - - - Indicates whether to perform layout calculation. - - Layout used to format log messages. @@ -1192,12 +1561,13 @@ - + + @@ -1209,596 +1579,699 @@ Layout used to format log messages. + + + Message box title. + + - + - + - - + + + + + + + + Name of the target. - + - Default filter to be applied when no specific rule matches. + Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - - - - - - - Condition to be tested. - - - - - Resulting filter to be applied when the condition matches. - - - - - - - - - - + - Name of the target. + Indicates whether to check if a queue exists before writing to it. - - - - - - - - - - - + - Name of the target. + Layout used to format log messages. - + - Number of times to repeat each log message. + Encoding to be used when writing text to the queue. - - - - - - - - - - - - + - Name of the target. + Name of the queue to write to. - + - Time to wait between retries in milliseconds. + Indicates whether to use recoverable messages (with guaranteed delivery). - + - Number of retries that should be attempted on the wrapped target in case of a failure. + Indicates whether to create the queue if it doesn't exists. + + + + + Label to associate with each message. - + - + + + + Name of the target. + + + Method name. The method must be public and static. + + + + + Class name. + + - + - + + + + + + + + + + Name of the target. + + + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + + + + Maximum message size in bytes. + + + + + Layout used to format log messages. + + + + + Encoding to be used. + + + + + Indicates whether to keep connection open whenever possible. + + + + + Size of the connection cache (number of connections which are kept alive). + + + + + Network address. + + + + + Maximum queue size. + + - + - - + + + - - - + + + + + + + + + + + + + Name of the target. - + - Web service URL. + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + + + + Maximum message size in bytes. - Encoding. + Encoding to be used. - + - Protocol to be used when calling web service. + Instance of that is used to format log messages. - + - Web service namespace. + Network address. - + - Web service method name. + Size of the connection cache (number of connections which are kept alive). - - - - - - - - - - - - - - - - - - - - - - - - - - + - Body layout (can be repeated multiple times). + Indicates whether to keep connection open whenever possible. - + - Footer layout. + Maximum queue size. - + - Header layout. + Indicates whether to include dictionary contents. - + - Quoting mode. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Quote Character. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - Indicates whether CVS should include header. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). + Indicates whether to include stack contents. - + - Column delimiter. + NDC item separator. + + + + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - - - - - - - - - - - - - - - - - - - - - - - - Layout of the column. - - - - - Name of the column. - - - - - - - - - - - - Layout text. - - - - - - + - + + + - - - + - Body layout (can be repeated multiple times). + Name of the target. - + - Header layout. + Indicates whether to perform layout calculation. - + - Footer layout. + Layout used to format log messages. - - - - - - - - + - + - - + + - + - Condition expression. + Name of the target. - + - Action to be taken when filter matches. + Layout used to format log messages. - - - - - - - - - - + - + - - - - + + + + + + + - - - Layout to be used to filter log messages. - - - + - Substring to be matched. + Name of the target. - + - Action to be taken when filter matches. + Name of the performance counter. - + - Indicates whether to ignore case when comparing strings. + Performance counter type. - - - - - - - - - - - - - + - Indicates whether to ignore case when comparing strings. + Performance counter instance name. - + - Layout to be used to filter log messages. + Indicates whether performance counter should be automatically created. - + - Action to be taken when filter matches. + Name of the performance counter category. - + - String to compare the layout to. + Counter help text. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - - - Layout to be used to filter log messages. - - - + - Substring to be matched. + Name of the target. - + - Action to be taken when filter matches. + Default filter to be applied when no specific rule matches. - + + + + + + + + + + + Condition to be tested. + + + + + Resulting filter to be applied when the condition matches. + + + + + + + + + + - Indicates whether to ignore case when comparing strings. + Name of the target. - + - + - - - - + + - + - Indicates whether to ignore case when comparing strings. + Name of the target. - + - Layout to be used to filter log messages. + Number of times to repeat each log message. - + + + + + + + + + + + + - Action to be taken when filter matches. + Name of the target. - + - String to compare the layout to. + Time to wait between retries in milliseconds. + + + + + Number of retries that should be attempted on the wrapped target in case of a failure. - + - - - - - - + + + + + + + + + + + Name of the target. - - - Indicates whether to use the XML format when serializing message. - - - + - Encoding to be used when writing text to the queue. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether the created form will be initially minimized. - + - Indicates whether to use recoverable messages (with guaranteed delivery). + Maximum number of lines the rich text box will store (or 0 to disable this feature). - + - Indicates whether to create the queue if it doesn't exists. + Initial width of the form with rich text box. - + - Label to associate with each message. + Indicates whether the created window will be a tool window. - + - Name of the queue to write to. + Name of RichTextBox to which Nlog will write. - - - - - - - - - - - - - + - Name of the target. + Indicates whether scroll bar will be moved automatically to show most recent log entries. - + - Maximum number of log events that the buffer can keep. + Initial height of the form with rich text box. - + - Indicates whether buffer should grow as needed. + Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. - + - Number of log events to be buffered. + Indicates whether to use default coloring rules. - + + + + + + + + + + + + + + + + + + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + + + Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. + + + + + Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. + + + + + Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. + + + + + + + + + + + + + Condition that must be met in order to set the specified font color. + + + + + Background color. + + + + + Font color. + + + + + Font style of matched text. + + + + - + - Name of the target. - + + + + + + + + + + - Layout used to format log messages. + Name of the target. - + - @@ -1806,11 +2279,6 @@ Name of the target. - - - Indicates whether to add <!-- --> comments around all written texts. - - Layout used to format log messages. @@ -1819,764 +2287,349 @@ - + - - - - - - - + + + + + + Name of the target. - + - Text to be rendered. + Web service URL. - + - Header. + Web service namespace. - + - Footer. + Protocol to be used when calling web service. - + - Indicates whether to use default row highlighting rules. + Web service method name. - + - Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). + Encoding. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified foreground and background color. - - - - - Foreground color. - - - - - - - - - - - - - - - Background color. - - - - - Foreground color. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - - - Name of the target. - - - - - Footer. - - - - - Text to be rendered. - - - - - Header. - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Name of the machine on which Event Log service is running. - - - - - Value to be used as the event Source. - - - - - Layout that renders event Category. - - - - - Layout that renders event ID. - - - - - Name of the Event Log to write to. This can be System, Application or any user-defined name. - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Indicates whether log text should be appended to the text of the control instead of overwriting it. - - - - - Name of control to which NLog will log write log text. - - - - - Name of the Form on which the control is located. - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Username to change context to. - - - - - User account password. - - - - - Indicates whether to revert to the credentials of the process instead of impersonating another user. - - - - - Required impersonation level. - - - - - Windows domain name to change context to. - - - - - Logon Type. - - - - - Type of the logon provider. - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + - + - - - - - - - - - - - - - - - - + + + + + + - + - Name of the target. + Body layout (can be repeated multiple times). - Header. + Header layout. - Footer. - - - - - Text to be rendered. - - - - - Indicates whether to send message as HTML instead of plain text. - - - - - Indicates whether to add new lines between log entries. - - - - - Encoding to be used for sending e-mail. - - - - - Mail subject. - - - - - Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - Sender's email address (e.g. joe@domain.com). - - - - - Mail message body (repeated for each log message send in one mail). - - - - - Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). + Footer layout. - + - Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. + Quote Character. - + - Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). + Quoting mode. - + - SMTP Authentication mode. + Indicates whether CVS should include header. - + - SMTP Server to be used for sending. + Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). - + - Port number that SMTP Server is listening on. + Column delimiter. - + - - - + + + - - - - - - - - - - - - - - - Name of the target. - - - - - Performance counter instance name. - - - - - Counter help text. - - - - - Performance counter type. - - - - - Indicates whether performance counter should be automatically created. - - - - - Name of the performance counter category. - - - - - Name of the performance counter. - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + Layout of the column. + + + + + Name of the column. + + + + - + - - - - - - - - - - - - - - - - Name of the target. - - + + + - Layout used to format log messages. + Body layout (can be repeated multiple times). - + - Initial height of the form with rich text box. + Header layout. - + - Indicates whether scroll bar will be moved automatically to show most recent log entries. + Footer layout. - + + + + + + + + + + + + + + + + + - Maximum number of lines the rich text box will store (or 0 to disable this feature). + Layout text. - + + + + + + + + + + + - Indicates whether the created form will be initially minimized. + Condition expression. - + - Indicates whether the created window will be a tool window. + Action to be taken when filter matches. - + + + + + + + + + + + + + + + + + + + + + + - Name of RichTextBox to which Nlog will write. + Layout to be used to filter log messages. - + - Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. + Substring to be matched. - + - Initial width of the form with rich text box. + Action to be taken when filter matches. - + - Indicates whether to use default coloring rules. + Indicates whether to ignore case when comparing strings. - - - - - - - - - - - - - - - - - - - - - - Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. - - - - - Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified font color. - - - - - Font color. - - - - - Font style of matched text. - - - - + - + - + + + - + - Name of the target. + Indicates whether to ignore case when comparing strings. - Layout used to format log messages. + Layout to be used to filter log messages. + + + + + Action to be taken when filter matches. + + + + + String to compare the layout to. - + - + - - - - - - - + + + + - + - Name of the target. + Layout to be used to filter log messages. - + - Name of the endpoint configuration in WCF configuration file. + Substring to be matched. - + - Endpoint address. + Action to be taken when filter matches. - + - Indicates whether to use binary message encoding. + Indicates whether to ignore case when comparing strings. - + + + + + + + + + + + + + - Client ID. + Indicates whether to ignore case when comparing strings. - + - Indicates whether to include per-event properties in the payload sent to the server. + Layout to be used to filter log messages. + + + + + Action to be taken when filter matches. + + + + + String to compare the layout to. diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index a4f5110b4..db0cb8e07 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -99,11 +99,7 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll - - - False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll False diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 71d3d7141..41e52db65 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -7,9 +7,7 @@ - - - - + + \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index 10f5c46d0..36e05e556 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -70,10 +70,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + + False + ..\packages\NLog.2.1.0\lib\net40\NLog.dll ..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -82,9 +83,9 @@ False ..\packages\Owin.1.0\lib\net40\Owin.dll - + False - ..\packages\RestSharp.104.2.0\lib\net4\RestSharp.dll + ..\packages\RestSharp.104.3.3\lib\net4\RestSharp.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 8c6e73b29..990270545 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -9,9 +9,9 @@ - - + + - + \ No newline at end of file diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj index 14c492823..673eafe98 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -39,7 +39,7 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll ..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/src/NzbDrone.Libraries.Test/packages.config b/src/NzbDrone.Libraries.Test/packages.config index 0a78ede96..48393462a 100644 --- a/src/NzbDrone.Libraries.Test/packages.config +++ b/src/NzbDrone.Libraries.Test/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj index c3110ef29..efbda7398 100644 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj @@ -36,8 +36,9 @@ ..\packages\Microsoft.AspNet.SignalR.Core.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Core.dll - - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + + False + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll diff --git a/src/NzbDrone.SignalR/packages.config b/src/NzbDrone.SignalR/packages.config index f82b57a29..a5b443e7a 100644 --- a/src/NzbDrone.SignalR/packages.config +++ b/src/NzbDrone.SignalR/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index dd6ffc0fe..277bbae61 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -54,11 +54,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index 6880e0bf8..2ab611796 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -3,8 +3,8 @@ - - + + \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 3dbc57b35..6e39cd8ab 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -50,9 +50,9 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index 6f925b437..c88b100c8 100644 --- a/src/NzbDrone.Update.Test/packages.config +++ b/src/NzbDrone.Update.Test/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Update/NLog.xsd b/src/NzbDrone.Update/NLog.xsd index 2203f4ede..49dd62049 100644 --- a/src/NzbDrone.Update/NLog.xsd +++ b/src/NzbDrone.Update/NLog.xsd @@ -224,6 +224,84 @@ + + + + + + + + + + + + Name of the target. + + + + + Indicates whether buffer should grow as needed. + + + + + Number of log events to be buffered. + + + + + Maximum number of log events that the buffer can keep. + + + + + + + + + + + + + + + Name of the target. + + + + + Layout used to format log messages. + + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to add <!-- --> comments around all written texts. + + + + + Layout used to format log messages. + + + + + @@ -289,8 +367,8 @@ - + @@ -302,14 +380,14 @@ Indicates whether to use sliding timeout. - + - Number of log events to be buffered. + Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. - + - Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes. + Number of log events to be buffered. @@ -321,21 +399,22 @@ - - + + - + + - - - - + + + + @@ -347,11 +426,6 @@ Indicates whether to append newline at the end of log message. - - - Instance of that is used to format log messages. - - Action that should be taken if the message is larger than maxMessageSize. @@ -367,9 +441,9 @@ Encoding to be used. - + - Size of the connection cache (number of connections which are kept alive). + Instance of that is used to format log messages. @@ -377,14 +451,24 @@ Network address. + + + Size of the connection cache (number of connections which are kept alive). + + Indicates whether to keep connection open whenever possible. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Maximum queue size. + + + + + Indicates whether to include dictionary contents. @@ -397,9 +481,9 @@ AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. + Indicates whether to include NLog-specific extensions to log4j schema. @@ -407,14 +491,14 @@ Indicates whether to include stack contents. - + - Indicates whether to include NLog-specific extensions to log4j schema. + NDC item separator. - + - Indicates whether to include dictionary contents. + Indicates whether to include source info (file name and line number) in the information sent over the network. @@ -443,26 +527,24 @@ - + - - + + + + + Name of the target. - - - Text to be rendered. - - Footer. @@ -473,102 +555,233 @@ Header. - - - Indicates whether to send the log messages to the standard error instead of the standard output. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. - - - - - Name of the database provider. - - - - - Indicates whether to use database transactions. Some data providers require this. - - - - - Name of the connection string (as specified in <connectionStrings> configuration section. - - - - - Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. - - - - - Indicates whether to keep the database connection open between the log events. - - - - - Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. - - - - - Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. - - - + - Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + Text to be rendered. - + - Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. + Indicates whether to use default row highlighting rules. - + - Text of the SQL command to be run on each log level. + Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Condition that must be met in order to set the specified foreground and background color. + + + + + Background color. + + + + + Foreground color. + + + + + + + + + + + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + + + Background color. + + + + + Foreground color. + + + + + + + + + + + + + + + + Name of the target. + + + + + Footer. + + + + + Header. + + + + + Text to be rendered. + + + + + Indicates whether to send the log messages to the standard error instead of the standard output. + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name of the target. + + + + + Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string. + + + + + Name of the database provider. + + + + + Indicates whether to use database transactions. Some data providers require this. + + + + + Indicates whether to keep the database connection open between the log events. + + + + + Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string. + + + + + Name of the connection string (as specified in <connectionStrings> configuration section. + + + + + Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase. + + + + + Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string. + + + + + Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string. + + + + + Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. + + + + + Text of the SQL command to be run on each log level. + + + + + + + + + + @@ -634,11 +847,13 @@ - + + + @@ -646,64 +861,55 @@ Name of the target. + + + Footer. + + + + + Header. + + - Layout used to format log messages. + Text to be rendered. - + - + - + Name of the target. - + - Indicates whether to return to the first target after any successful write. + Layout used to format log messages. - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -712,17 +918,92 @@ - Text to be rendered. + Layout used to format log messages. - + - Header. + Name of the machine on which Event Log service is running. - + - Footer. + Value to be used as the event Source. + + + + + Name of the Event Log to write to. This can be System, Application or any user-defined name. + + + + + Layout that renders event Category. + + + + + Layout that renders event ID. + + + + + + + + + + + + + + + Name of the target. + + + + + Indicates whether to return to the first target after any successful write. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Name of the target. @@ -735,14 +1016,29 @@ Line ending mode. - + - Size in bytes above which log files will be automatically archived. + Footer. - + - Maximum number of archive files that should be kept. + Text to be rendered. + + + + + Header. + + + + + Indicates whether to automatically archive log files every time the specified time passes. + + + + + Size in bytes above which log files will be automatically archived. @@ -750,19 +1046,19 @@ Name of the file to be used for an archive. - + - Way file archives are numbered. + Maximum number of archive files that should be kept. - + - Indicates whether to automatically archive log files every time the specified time passes. + Way file archives are numbered. - + - Indicates whether to replace file contents on each write instead of appending log message at the end. + Gets ors set a value indicating whether a managed file stream is forced, instead of used the native implementation. @@ -770,11 +1066,6 @@ File attributes (Windows only). - - - Name of the file to write to. - - Indicates whether to delete old log file on startup. @@ -790,9 +1081,14 @@ Indicates whether to create directories if they don't exist. - + - Indicates whether concurrent writes to the log file by multiple processes on the same host. + Indicates whether to replace file contents on each write instead of appending log message at the end. + + + + + Name of the file to write to. @@ -800,14 +1096,14 @@ Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity. - + - Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). + Log file buffer size in bytes. - + - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + Number of times the write is appended on the file before NLog discards the log message. @@ -815,19 +1111,24 @@ Delay in milliseconds to wait before attempting to write to the file again. - + - Number of times the write is appended on the file before NLog discards the log message. + Indicates whether to automatically flush the file buffers after each log message. - + - Log file buffer size in bytes. + Indicates whether concurrent writes to the log file by multiple processes on the same host. - + - Indicates whether to automatically flush the file buffers after each log message. + Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger). + + + + + Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -847,12 +1148,6 @@ - - - - - - @@ -863,9 +1158,15 @@ + + + + + + - + @@ -881,7 +1182,6 @@ - @@ -904,12 +1204,16 @@ - + + + + + @@ -921,257 +1225,327 @@ Layout used to format log messages. - - - - - - - - - - - - + - Name of the target. + Name of the Form on which the control is located. - + - Layout used to format log messages. + Name of control to which NLog will log write log text. - + - Message box title. + Indicates whether log text should be appended to the text of the control instead of overwriting it. + + + + + Whether new log entry are added to the start or the end of the control - + - + - - - + + + + + + + Name of the target. - + - Method name. The method must be public and static. + User account password. - + - Class name. + Indicates whether to revert to the credentials of the process instead of impersonating another user. + + + + + Username to change context to. + + + + + Logon Type. + + + + + Windows domain name to change context to. + + + + + Required impersonation level. + + + + + Type of the logon provider. - - - - - - - - - Layout that should be use to calcuate the value for the parameter. - - - - - Name of the parameter. - - - - - Type of the parameter. - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + Name of the target. - - - Action that should be taken if the message is larger than maxMessageSize. - - - - - Indicates whether to append newline at the end of log message. - - - - - Layout used to format log messages. - - - + - Maximum message size in bytes. + Name of the endpoint configuration in WCF configuration file. - + - Encoding to be used. + Endpoint address. - + - Size of the connection cache (number of connections which are kept alive). + Indicates whether to use binary message encoding. - + - Indicates whether to keep connection open whenever possible. + Client ID. - + - Network address. + Indicates whether to include per-event properties in the payload sent to the server. - + + + + + + + + + Layout that should be use to calcuate the value for the parameter. + + + + + Name of the parameter. + + + + + Type of the parameter. + + + + - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + Name of the target. - + - Indicates whether to append newline at the end of log message. + Indicates whether to send message as HTML instead of plain text. + + + + + Encoding to be used for sending e-mail. + + + + + Indicates whether to add new lines between log entries. - Instance of that is used to format log messages. + Text to be rendered. - + - Action that should be taken if the message is larger than maxMessageSize. + Header. - + - Maximum message size in bytes. + Footer. - + - Encoding to be used. + Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Size of the connection cache (number of connections which are kept alive). + CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Network address. + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Indicates whether to keep connection open whenever possible. + Mail subject. - + - Indicates whether to include source info (file name and line number) in the information sent over the network. + Mail message body (repeated for each log message send in one mail). - + - Indicates whether to include call site (class and method name) in the information sent over the network. + Sender's email address (e.g. joe@domain.com). - + - AppInfo field. By default it's the friendly name of the current AppDomain. + Indicates whether NewLine characters in the body should be replaced with tags. - + - NDC item separator. + Priority used for sending mails. - + - Indicates whether to include stack contents. + Indicates whether the default Settings from System.Net.MailSettings should be used. - + - Indicates whether to include NLog-specific extensions to log4j schema. + SMTP Server to be used for sending. - + - Indicates whether to include dictionary contents. + Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + Port number that SMTP Server is listening on. + + + + + SMTP Authentication mode. + + + + + Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). + + + + + Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. - + + + + + + + + - @@ -1179,11 +1553,6 @@ Name of the target. - - - Indicates whether to perform layout calculation. - - Layout used to format log messages. @@ -1192,12 +1561,13 @@ - + + @@ -1209,596 +1579,699 @@ Layout used to format log messages. + + + Message box title. + + - + - + - - + + + + + + + + Name of the target. - + - Default filter to be applied when no specific rule matches. + Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - - - - - - - Condition to be tested. - - - - - Resulting filter to be applied when the condition matches. - - - - - - - - - - + - Name of the target. + Indicates whether to check if a queue exists before writing to it. - - - - - - - - - - - + - Name of the target. + Layout used to format log messages. - + - Number of times to repeat each log message. + Encoding to be used when writing text to the queue. - - - - - - - - - - - - + - Name of the target. + Name of the queue to write to. - + - Time to wait between retries in milliseconds. + Indicates whether to use recoverable messages (with guaranteed delivery). - + - Number of retries that should be attempted on the wrapped target in case of a failure. + Indicates whether to create the queue if it doesn't exists. + + + + + Label to associate with each message. - + - + + + + Name of the target. + + + Method name. The method must be public and static. + + + + + Class name. + + - + - + + + + + + + + + + Name of the target. + + + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + + + + Maximum message size in bytes. + + + + + Layout used to format log messages. + + + + + Encoding to be used. + + + + + Indicates whether to keep connection open whenever possible. + + + + + Size of the connection cache (number of connections which are kept alive). + + + + + Network address. + + + + + Maximum queue size. + + - + - - + + + - - - + + + + + + + + + + + + + Name of the target. - + - Web service URL. + Indicates whether to append newline at the end of log message. + + + + + Action that should be taken if the message is larger than maxMessageSize. + + + + + Maximum message size in bytes. - Encoding. + Encoding to be used. - + - Protocol to be used when calling web service. + Instance of that is used to format log messages. - + - Web service namespace. + Network address. - + - Web service method name. + Size of the connection cache (number of connections which are kept alive). - - - - - - - - - - - - - - - - - - - - - - - - - - + - Body layout (can be repeated multiple times). + Indicates whether to keep connection open whenever possible. - + - Footer layout. + Maximum queue size. - + - Header layout. + Indicates whether to include dictionary contents. - + - Quoting mode. + Indicates whether to include call site (class and method name) in the information sent over the network. - + - Quote Character. + AppInfo field. By default it's the friendly name of the current AppDomain. - + - Indicates whether CVS should include header. + Indicates whether to include NLog-specific extensions to log4j schema. - + - Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). + Indicates whether to include stack contents. - + - Column delimiter. + NDC item separator. + + + + + Indicates whether to include source info (file name and line number) in the information sent over the network. - - - - - - - - - - - - - - - - - - - - - - - - - - Layout of the column. - - - - - Name of the column. - - - - - - - - - - - - Layout text. - - - - - - + - + + + - - - + - Body layout (can be repeated multiple times). + Name of the target. - + - Header layout. + Indicates whether to perform layout calculation. - + - Footer layout. + Layout used to format log messages. - - - - - - - - + - + - - + + - + - Condition expression. + Name of the target. - + - Action to be taken when filter matches. + Layout used to format log messages. - - - - - - - - - - + - + - - - - + + + + + + + - - - Layout to be used to filter log messages. - - - + - Substring to be matched. + Name of the target. - + - Action to be taken when filter matches. + Name of the performance counter. - + - Indicates whether to ignore case when comparing strings. + Performance counter type. - - - - - - - - - - - - - + - Indicates whether to ignore case when comparing strings. + Performance counter instance name. - + - Layout to be used to filter log messages. + Indicates whether performance counter should be automatically created. - + - Action to be taken when filter matches. + Name of the performance counter category. - + - String to compare the layout to. + Counter help text. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - - - Layout to be used to filter log messages. - - - + - Substring to be matched. + Name of the target. - + - Action to be taken when filter matches. + Default filter to be applied when no specific rule matches. - + + + + + + + + + + + Condition to be tested. + + + + + Resulting filter to be applied when the condition matches. + + + + + + + + + + - Indicates whether to ignore case when comparing strings. + Name of the target. - + - + - - - - + + - + - Indicates whether to ignore case when comparing strings. + Name of the target. - + - Layout to be used to filter log messages. + Number of times to repeat each log message. - + + + + + + + + + + + + - Action to be taken when filter matches. + Name of the target. - + - String to compare the layout to. + Time to wait between retries in milliseconds. + + + + + Number of retries that should be attempted on the wrapped target in case of a failure. - + - - - - - - + + + + + + + + + + + Name of the target. - - - Indicates whether to use the XML format when serializing message. - - - + - Encoding to be used when writing text to the queue. + Layout used to format log messages. - + - Layout used to format log messages. + Indicates whether the created form will be initially minimized. - + - Indicates whether to use recoverable messages (with guaranteed delivery). + Maximum number of lines the rich text box will store (or 0 to disable this feature). - + - Indicates whether to create the queue if it doesn't exists. + Initial width of the form with rich text box. - + - Label to associate with each message. + Indicates whether the created window will be a tool window. - + - Name of the queue to write to. + Name of RichTextBox to which Nlog will write. - - - - - - - - - - - - - + - Name of the target. + Indicates whether scroll bar will be moved automatically to show most recent log entries. - + - Maximum number of log events that the buffer can keep. + Initial height of the form with rich text box. - + - Indicates whether buffer should grow as needed. + Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. - + - Number of log events to be buffered. + Indicates whether to use default coloring rules. - + + + + + + + + + + + + + + + + + + + + + + Indicates whether to ignore case when comparing texts. + + + + + Regular expression to be matched. You must specify either text or regex. + + + + + Text to be matched. You must specify either text or regex. + + + + + Indicates whether to match whole words only. + + + + + Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. + + + + + Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. + + + + + Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. + + + + + + + + + + + + + Condition that must be met in order to set the specified font color. + + + + + Background color. + + + + + Font color. + + + + + Font style of matched text. + + + + - + - Name of the target. - + + + + + + + + + + - Layout used to format log messages. + Name of the target. - + - @@ -1806,11 +2279,6 @@ Name of the target. - - - Indicates whether to add <!-- --> comments around all written texts. - - Layout used to format log messages. @@ -1819,764 +2287,349 @@ - + - - - - - - - + + + + + + Name of the target. - + - Text to be rendered. + Web service URL. - + - Header. + Web service namespace. - + - Footer. + Protocol to be used when calling web service. - + - Indicates whether to use default row highlighting rules. + Web service method name. - + - Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). + Encoding. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified foreground and background color. - - - - - Foreground color. - - - - - - - - - - - - - - - Background color. - - - - - Foreground color. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - - - Name of the target. - - - - - Footer. - - - - - Text to be rendered. - - - - - Header. - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Name of the machine on which Event Log service is running. - - - - - Value to be used as the event Source. - - - - - Layout that renders event Category. - - - - - Layout that renders event ID. - - - - - Name of the Event Log to write to. This can be System, Application or any user-defined name. - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Indicates whether log text should be appended to the text of the control instead of overwriting it. - - - - - Name of control to which NLog will log write log text. - - - - - Name of the Form on which the control is located. - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Username to change context to. - - - - - User account password. - - - - - Indicates whether to revert to the credentials of the process instead of impersonating another user. - - - - - Required impersonation level. - - - - - Windows domain name to change context to. - - - - - Logon Type. - - - - - Type of the logon provider. - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + - + - - - - - - - - - - - - - - - - + + + + + + - + - Name of the target. + Body layout (can be repeated multiple times). - Header. + Header layout. - Footer. - - - - - Text to be rendered. - - - - - Indicates whether to send message as HTML instead of plain text. - - - - - Indicates whether to add new lines between log entries. - - - - - Encoding to be used for sending e-mail. - - - - - Mail subject. - - - - - Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - - - - - Sender's email address (e.g. joe@domain.com). - - - - - Mail message body (repeated for each log message send in one mail). - - - - - Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic"). + Footer layout. - + - Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server. + Quote Character. - + - Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic"). + Quoting mode. - + - SMTP Authentication mode. + Indicates whether CVS should include header. - + - SMTP Server to be used for sending. + Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom'). - + - Port number that SMTP Server is listening on. + Column delimiter. - + - - - + + + - - - - - - - - - - - - - - - Name of the target. - - - - - Performance counter instance name. - - - - - Counter help text. - - - - - Performance counter type. - - - - - Indicates whether performance counter should be automatically created. - - - - - Name of the performance counter category. - - - - - Name of the performance counter. - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + Layout of the column. + + + + + Name of the column. + + + + - + - - - - - - - - - - - - - - - - Name of the target. - - + + + - Layout used to format log messages. + Body layout (can be repeated multiple times). - + - Initial height of the form with rich text box. + Header layout. - + - Indicates whether scroll bar will be moved automatically to show most recent log entries. + Footer layout. - + + + + + + + + + + + + + + + + + - Maximum number of lines the rich text box will store (or 0 to disable this feature). + Layout text. - + + + + + + + + + + + - Indicates whether the created form will be initially minimized. + Condition expression. - + - Indicates whether the created window will be a tool window. + Action to be taken when filter matches. - + + + + + + + + + + + + + + + + + + + + + + - Name of RichTextBox to which Nlog will write. + Layout to be used to filter log messages. - + - Name of the Form on which the control is located. If there is no open form of a specified name than NLog will create a new one. + Substring to be matched. - + - Initial width of the form with rich text box. + Action to be taken when filter matches. - + - Indicates whether to use default coloring rules. + Indicates whether to ignore case when comparing strings. - - - - - - - - - - - - - - - - - - - - - - Background color. Names are identical with KnownColor enum extended with Empty value which means that background color won't be changed. - - - - - Font color. Names are identical with KnownColor enum extended with Empty value which means that font color won't be changed. - - - - - Indicates whether to ignore case when comparing texts. - - - - - Regular expression to be matched. You must specify either text or regex. - - - - - Font style of matched text. Possible values are the same as in FontStyle enum in System.Drawing. - - - - - Text to be matched. You must specify either text or regex. - - - - - Indicates whether to match whole words only. - - - - - - - - - - - - - Background color. - - - - - Condition that must be met in order to set the specified font color. - - - - - Font color. - - - - - Font style of matched text. - - - - + - + - + + + - + - Name of the target. + Indicates whether to ignore case when comparing strings. - Layout used to format log messages. + Layout to be used to filter log messages. + + + + + Action to be taken when filter matches. + + + + + String to compare the layout to. - + - + - - - - - - - + + + + - + - Name of the target. + Layout to be used to filter log messages. - + - Name of the endpoint configuration in WCF configuration file. + Substring to be matched. - + - Endpoint address. + Action to be taken when filter matches. - + - Indicates whether to use binary message encoding. + Indicates whether to ignore case when comparing strings. - + + + + + + + + + + + + + - Client ID. + Indicates whether to ignore case when comparing strings. - + - Indicates whether to include per-event properties in the payload sent to the server. + Layout to be used to filter log messages. + + + + + Action to be taken when filter matches. + + + + + String to compare the layout to. diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 3aa8ea3a4..a33f5fe1b 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -42,11 +42,7 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll - - - False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index f145903f2..b6253468b 100644 --- a/src/NzbDrone.Update/packages.config +++ b/src/NzbDrone.Update/packages.config @@ -1,7 +1,5 @@  - - - - + + \ No newline at end of file diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index 155fc5ccc..c6679ab6b 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -81,11 +81,11 @@ False - ..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - + False - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll False diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 268430b6b..4c6a0521b 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file