From 19a4a8979556b0763e1b6ef5241bb3d33a4c546b Mon Sep 17 00:00:00 2001 From: quantumnightmare Date: Thu, 3 May 2018 13:26:04 +1200 Subject: [PATCH 1/2] Updated Author and year --- src/NLog.Raygun/NLog.Raygun.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NLog.Raygun/NLog.Raygun.csproj b/src/NLog.Raygun/NLog.Raygun.csproj index f108020..3213ffc 100644 --- a/src/NLog.Raygun/NLog.Raygun.csproj +++ b/src/NLog.Raygun/NLog.Raygun.csproj @@ -7,9 +7,9 @@ NLog.Raygun NLog.Raygun Raygun - Ken Burkhardt + Ken Burkhardt, Raygun A custom NLog target that will push exceptions to Raygun - Copyright © 2015 + Copyright © Raygun 2015-2018 NLog;Raygun;Log;Logging https://github.com/MindscapeHQ/NLog.Raygun From dfa40832807976b69f3ba62ec23b0d6a4d8e11eb Mon Sep 17 00:00:00 2001 From: quantumnightmare Date: Thu, 3 May 2018 13:26:37 +1200 Subject: [PATCH 2/2] Updated test projects to use NLog 4.0.0 as per NLog.Raygun dependency --- .../NLog.Raygun.TestApp.csproj | 17 +- src/NLog.Raygun.TestApp/NLog.xsd | 423 +++++------------- src/NLog.Raygun.TestApp/packages.config | 6 +- .../NLog.Raygun.WebTestApp.csproj | 6 +- src/NLog.Raygun.WebTestApp/NLog.xsd | 423 +++++------------- src/NLog.Raygun.WebTestApp/packages.config | 6 +- 6 files changed, 226 insertions(+), 655 deletions(-) diff --git a/src/NLog.Raygun.TestApp/NLog.Raygun.TestApp.csproj b/src/NLog.Raygun.TestApp/NLog.Raygun.TestApp.csproj index 8078686..0cc9585 100644 --- a/src/NLog.Raygun.TestApp/NLog.Raygun.TestApp.csproj +++ b/src/NLog.Raygun.TestApp/NLog.Raygun.TestApp.csproj @@ -37,9 +37,8 @@ false - - False - ..\packages\NLog.3.2.1\lib\net40\NLog.dll + + ..\packages\NLog.4.0.0\lib\net45\NLog.dll @@ -59,12 +58,6 @@ Designer - - - {F5744BD5-98C2-4082-9D04-9D28536D5DBB} - NLog.Raygun - - @@ -72,6 +65,12 @@ + + + {f5744bd5-98c2-4082-9d04-9d28536d5dbb} + NLog.Raygun + + diff --git a/src/NLog.Raygun.TestApp/NLog.xsd b/src/NLog.Raygun.TestApp/NLog.xsd index 710f925..195ba15 100644 --- a/src/NLog.Raygun.TestApp/NLog.xsd +++ b/src/NLog.Raygun.TestApp/NLog.xsd @@ -126,6 +126,11 @@ Ignore further rules if this one matches. + + + Enable or disable logging rule. Disabled rules are ignored. + + @@ -147,6 +152,15 @@ + + + + + + + + + @@ -226,58 +240,6 @@ - - - - - - - - - - - - Name of the target. - - - - - Maximum number of log events that the buffer can keep. - - - - - Number of log events to be buffered. - - - - - Indicates whether buffer should grow as needed. - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - @@ -540,6 +502,7 @@ + @@ -567,6 +530,11 @@ Indicates whether to use default row highlighting rules. + + + The encoding for writing messages to the . + + Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). @@ -667,6 +635,7 @@ + @@ -693,6 +662,11 @@ Indicates whether to send the log messages to the standard error instead of the standard output. + + + The encoding for writing messages to the . + + @@ -709,7 +683,6 @@ - @@ -762,11 +735,6 @@ Indicates whether to keep the database connection open between the log events. - - - Indicates whether to use database transactions. Some data providers require this. - - Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. @@ -917,7 +885,8 @@ - + + @@ -949,11 +918,16 @@ Name of the machine on which Event Log service is running. - + Value to be used as the event Source. + + + Optional entrytype. When not set, or when not convertable to then determined by + + @@ -986,30 +960,32 @@ - + + - + - + + - - + + @@ -1036,11 +1012,16 @@ File encoding. - + Line ending mode. + + + Maximum number of archive files that should be kept. + + Way file archives are numbered. @@ -1061,9 +1042,9 @@ Size in bytes above which log files will be automatically archived. - + - Maximum number of archive files that should be kept. + Indicates whether to compress archive files into the zip archive format. @@ -1081,11 +1062,6 @@ Indicates whether to replace file contents on each write instead of appending log message at the end. - - - Indicates whether to delete old log file on startup. - - Name of the file to write to. @@ -1103,7 +1079,12 @@ - Indicates whether to create directories if they don't exist. + Indicates whether to create directories if they do not exist. + + + + + Indicates whether to delete old log file on startup. @@ -1121,6 +1102,11 @@ Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + + + Maximum number of log filenames that should be stored as existing. + + Indicates whether to keep log file open instead of opening and closing it on each logging event. @@ -1141,9 +1127,9 @@ Delay in milliseconds to wait before attempting to write to the file again. - + - Log file buffer size in bytes. + Indicates whether to automatically flush the file buffers after each log message. @@ -1151,23 +1137,14 @@ 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 to automatically flush the file buffers after each log message. + Log file buffer size in bytes. - - - - - - - - - @@ -1226,50 +1203,6 @@ - - - - - - - - - - - - - - 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. - - - - - Whether new log entry are added to the start or the end of the control - - - - - @@ -1356,6 +1289,7 @@ + @@ -1376,6 +1310,11 @@ Name of the endpoint configuration in WCF configuration file. + + + Indicates whether to use a WCF service contract that is one way (fire and forget) or two way (request-reply) + + Client ID. @@ -1402,7 +1341,7 @@ - Layout that should be use to calcuate the value for the parameter. + Layout that should be use to calculate the value for the parameter. @@ -1589,32 +1528,6 @@ - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Message box title. - - - - - @@ -2108,165 +2021,6 @@ - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Indicates whether scroll bar will be moved automatically to show most recent log entries. - - - - - Name of RichTextBox to which Nlog will write. - - - - - 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. - - - - - Initial height of the form with rich text box. - - - - - Maximum number of lines the rich text box will store (or 0 to disable this feature). - - - - - Indicates whether the created form will be initially minimized. - - - - - Indicates whether the created window will be a tool window. - - - - - Initial width of the form with rich text box. - - - - - Indicates whether to use default coloring rules. - - - - - - - - - - - - - - - - - - - - - - - - Condition that must be met in order to set the specified font color. - - - - - Background color. - - - - - Font color. - - - - - Font style of matched text. - - - - - - - - - - - - - - - - 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. - - - @@ -2320,6 +2074,7 @@ + @@ -2332,6 +2087,11 @@ Name of the target. + + + Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. + + Encoding. @@ -2339,12 +2099,12 @@ - Web service method name. + Web service method name. Only used with Soap. - Web service namespace. + Web service namespace. Only used with Soap. @@ -2459,6 +2219,31 @@ + + + + + + + + + + + + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + + diff --git a/src/NLog.Raygun.TestApp/packages.config b/src/NLog.Raygun.TestApp/packages.config index 48a2c39..5b3d025 100644 --- a/src/NLog.Raygun.TestApp/packages.config +++ b/src/NLog.Raygun.TestApp/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/src/NLog.Raygun.WebTestApp/NLog.Raygun.WebTestApp.csproj b/src/NLog.Raygun.WebTestApp/NLog.Raygun.WebTestApp.csproj index c046b35..d1db88e 100644 --- a/src/NLog.Raygun.WebTestApp/NLog.Raygun.WebTestApp.csproj +++ b/src/NLog.Raygun.WebTestApp/NLog.Raygun.WebTestApp.csproj @@ -22,6 +22,8 @@ ..\ true + + true @@ -42,8 +44,8 @@ - - ..\packages\NLog.3.2.1\lib\net45\NLog.dll + + ..\packages\NLog.4.0.0\lib\net45\NLog.dll diff --git a/src/NLog.Raygun.WebTestApp/NLog.xsd b/src/NLog.Raygun.WebTestApp/NLog.xsd index 710f925..195ba15 100644 --- a/src/NLog.Raygun.WebTestApp/NLog.xsd +++ b/src/NLog.Raygun.WebTestApp/NLog.xsd @@ -126,6 +126,11 @@ Ignore further rules if this one matches. + + + Enable or disable logging rule. Disabled rules are ignored. + + @@ -147,6 +152,15 @@ + + + + + + + + + @@ -226,58 +240,6 @@ - - - - - - - - - - - - Name of the target. - - - - - Maximum number of log events that the buffer can keep. - - - - - Number of log events to be buffered. - - - - - Indicates whether buffer should grow as needed. - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - @@ -540,6 +502,7 @@ + @@ -567,6 +530,11 @@ Indicates whether to use default row highlighting rules. + + + The encoding for writing messages to the . + + Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). @@ -667,6 +635,7 @@ + @@ -693,6 +662,11 @@ Indicates whether to send the log messages to the standard error instead of the standard output. + + + The encoding for writing messages to the . + + @@ -709,7 +683,6 @@ - @@ -762,11 +735,6 @@ Indicates whether to keep the database connection open between the log events. - - - Indicates whether to use database transactions. Some data providers require this. - - Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used. @@ -917,7 +885,8 @@ - + + @@ -949,11 +918,16 @@ Name of the machine on which Event Log service is running. - + Value to be used as the event Source. + + + Optional entrytype. When not set, or when not convertable to then determined by + + @@ -986,30 +960,32 @@ - + + - + - + + - - + + @@ -1036,11 +1012,16 @@ File encoding. - + Line ending mode. + + + Maximum number of archive files that should be kept. + + Way file archives are numbered. @@ -1061,9 +1042,9 @@ Size in bytes above which log files will be automatically archived. - + - Maximum number of archive files that should be kept. + Indicates whether to compress archive files into the zip archive format. @@ -1081,11 +1062,6 @@ Indicates whether to replace file contents on each write instead of appending log message at the end. - - - Indicates whether to delete old log file on startup. - - Name of the file to write to. @@ -1103,7 +1079,12 @@ - Indicates whether to create directories if they don't exist. + Indicates whether to create directories if they do not exist. + + + + + Indicates whether to delete old log file on startup. @@ -1121,6 +1102,11 @@ Indicates whether concurrent writes to the log file by multiple processes on different network hosts. + + + Maximum number of log filenames that should be stored as existing. + + Indicates whether to keep log file open instead of opening and closing it on each logging event. @@ -1141,9 +1127,9 @@ Delay in milliseconds to wait before attempting to write to the file again. - + - Log file buffer size in bytes. + Indicates whether to automatically flush the file buffers after each log message. @@ -1151,23 +1137,14 @@ 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 to automatically flush the file buffers after each log message. + Log file buffer size in bytes. - - - - - - - - - @@ -1226,50 +1203,6 @@ - - - - - - - - - - - - - - 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. - - - - - Whether new log entry are added to the start or the end of the control - - - - - @@ -1356,6 +1289,7 @@ + @@ -1376,6 +1310,11 @@ Name of the endpoint configuration in WCF configuration file. + + + Indicates whether to use a WCF service contract that is one way (fire and forget) or two way (request-reply) + + Client ID. @@ -1402,7 +1341,7 @@ - Layout that should be use to calcuate the value for the parameter. + Layout that should be use to calculate the value for the parameter. @@ -1589,32 +1528,6 @@ - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Message box title. - - - - - @@ -2108,165 +2021,6 @@ - - - - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Indicates whether scroll bar will be moved automatically to show most recent log entries. - - - - - Name of RichTextBox to which Nlog will write. - - - - - 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. - - - - - Initial height of the form with rich text box. - - - - - Maximum number of lines the rich text box will store (or 0 to disable this feature). - - - - - Indicates whether the created form will be initially minimized. - - - - - Indicates whether the created window will be a tool window. - - - - - Initial width of the form with rich text box. - - - - - Indicates whether to use default coloring rules. - - - - - - - - - - - - - - - - - - - - - - - - Condition that must be met in order to set the specified font color. - - - - - Background color. - - - - - Font color. - - - - - Font style of matched text. - - - - - - - - - - - - - - - - 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. - - - @@ -2320,6 +2074,7 @@ + @@ -2332,6 +2087,11 @@ Name of the target. + + + Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. + + Encoding. @@ -2339,12 +2099,12 @@ - Web service method name. + Web service method name. Only used with Soap. - Web service namespace. + Web service namespace. Only used with Soap. @@ -2459,6 +2219,31 @@ + + + + + + + + + + + + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + + diff --git a/src/NLog.Raygun.WebTestApp/packages.config b/src/NLog.Raygun.WebTestApp/packages.config index f5fecd5..25a4176 100644 --- a/src/NLog.Raygun.WebTestApp/packages.config +++ b/src/NLog.Raygun.WebTestApp/packages.config @@ -25,9 +25,9 @@ - - - + + +