diff --git a/.vs/WebSCR/v15/sqlite3/storage.ide b/.vs/WebSCR/v15/sqlite3/storage.ide index 647c92f..fdf32f0 100644 Binary files a/.vs/WebSCR/v15/sqlite3/storage.ide and b/.vs/WebSCR/v15/sqlite3/storage.ide differ diff --git a/WebSCR/NLog.xsd b/WebSCR/NLog.xsd index 6b26042..4740d80 100644 --- a/WebSCR/NLog.xsd +++ b/WebSCR/NLog.xsd @@ -164,6 +164,7 @@ + @@ -1135,18 +1136,19 @@ + - + + - @@ -1154,7 +1156,6 @@ - @@ -1246,6 +1247,11 @@ Value indicationg whether file creation calls should be synchronized by a system global mutex. + + + Maximum number of log filenames that should be stored as existing. + + Indicates whether the footer should be written only when the file is archived. @@ -1271,11 +1277,6 @@ Indicates whether to create directories if they do not exist. - - - Indicates whether to enable log file(s) to be deleted. - - File attributes (Windows only). @@ -1291,6 +1292,16 @@ Indicates whether to replace file contents on each write instead of appending log message at the end. + + + Indicates whether to enable log file(s) to be deleted. + + + + + Number of times the write is appended on the file before NLog discards the log message. + + Indicates whether concurrent writes to the log file by multiple processes on the same host. @@ -1301,11 +1312,6 @@ Indicates whether to keep log file open instead of opening and closing it on each logging event. - - - Maximum number of log filenames that should be stored as existing. - - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -1341,11 +1347,6 @@ 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. - - @@ -2517,8 +2518,10 @@ + + @@ -2564,6 +2567,11 @@ Web service namespace. Only used with Soap. + + + Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in parameters) + + Protocol to be used when calling web service. @@ -2996,6 +3004,74 @@ + + + + + + + + + + + + + + + + + + Action to be taken when filter matches. + + + + + Layout to be used to filter log messages. + + + + + Default number of unique filter values to expect, will automatically increase if needed + + + + + Append FilterCount to the when an event is no longer filtered + + + + + Insert FilterCount value into when an event is no longer filtered + + + + + Max number of unique filter values to expect simultaneously + + + + + Max length of filter values, will truncate if above limit + + + + + Default buffer size for the internal buffers + + + + + Reuse internal buffers, and doesn't have to constantly allocate new buffers + + + + + How long before a filter expires, and logging is accepted again + + + + + diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index fb29142..ae3aa8b 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -75,10 +75,10 @@ ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.10\lib\net45\NLog.dll + ..\packages\NLog.4.4.12\lib\net45\NLog.dll - ..\packages\NLog.Web.4.5.0\lib\net35\NLog.Web.dll + ..\packages\NLog.Web.4.5.1\lib\net35\NLog.Web.dll ..\packages\StackExchange.Redis.1.2.3\lib\net45\StackExchange.Redis.dll @@ -381,14 +381,14 @@ - - Always - + + Always + Designer diff --git a/WebSCR/bin/NLog.Web.dll b/WebSCR/bin/NLog.Web.dll index 3edbda6..8629910 100644 Binary files a/WebSCR/bin/NLog.Web.dll and b/WebSCR/bin/NLog.Web.dll differ diff --git a/WebSCR/bin/NLog.dll b/WebSCR/bin/NLog.dll index f571d2c..b8c37c1 100644 Binary files a/WebSCR/bin/NLog.dll and b/WebSCR/bin/NLog.dll differ diff --git a/WebSCR/packages.config b/WebSCR/packages.config index 4ae6cba..c3d45f5 100644 --- a/WebSCR/packages.config +++ b/WebSCR/packages.config @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/packages/NLog.4.4.10/NLog.4.4.10.nupkg b/packages/NLog.4.4.10/NLog.4.4.10.nupkg deleted file mode 100644 index e69bf0e..0000000 Binary files a/packages/NLog.4.4.10/NLog.4.4.10.nupkg and /dev/null differ diff --git a/packages/NLog.4.4.10/lib/sl4/NLog.dll b/packages/NLog.4.4.10/lib/sl4/NLog.dll deleted file mode 100644 index db28642..0000000 Binary files a/packages/NLog.4.4.10/lib/sl4/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.10/lib/sl5/NLog.dll b/packages/NLog.4.4.10/lib/sl5/NLog.dll deleted file mode 100644 index 766acbd..0000000 Binary files a/packages/NLog.4.4.10/lib/sl5/NLog.dll and /dev/null differ diff --git a/packages/NLog.4.4.12/NLog.4.4.12.nupkg b/packages/NLog.4.4.12/NLog.4.4.12.nupkg new file mode 100644 index 0000000..59cf8f1 Binary files /dev/null and b/packages/NLog.4.4.12/NLog.4.4.12.nupkg differ diff --git a/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll b/packages/NLog.4.4.12/lib/MonoAndroid10/NLog.dll similarity index 75% rename from packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll rename to packages/NLog.4.4.12/lib/MonoAndroid10/NLog.dll index db059eb..b7b79f3 100644 Binary files a/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.dll and b/packages/NLog.4.4.12/lib/MonoAndroid10/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml b/packages/NLog.4.4.12/lib/MonoAndroid10/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml rename to packages/NLog.4.4.12/lib/MonoAndroid10/NLog.xml index d5831a3..68f875a 100644 --- a/packages/NLog.4.4.10/lib/MonoAndroid10/NLog.xml +++ b/packages/NLog.4.4.12/lib/MonoAndroid10/NLog.xml @@ -11868,6 +11868,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll b/packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.dll similarity index 65% rename from packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll rename to packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.dll index 16224f4..41f85dd 100644 Binary files a/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.dll and b/packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml b/packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml rename to packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.xml index 213b9e1..c16b2fe 100644 --- a/packages/NLog.4.4.10/lib/Xamarin.iOS10/NLog.xml +++ b/packages/NLog.4.4.12/lib/Xamarin.iOS10/NLog.xml @@ -11768,6 +11768,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.10/lib/net35/NLog.dll b/packages/NLog.4.4.12/lib/net35/NLog.dll similarity index 68% rename from packages/NLog.4.4.10/lib/net35/NLog.dll rename to packages/NLog.4.4.12/lib/net35/NLog.dll index 70d3126..c195b97 100644 Binary files a/packages/NLog.4.4.10/lib/net35/NLog.dll and b/packages/NLog.4.4.12/lib/net35/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/net35/NLog.xml b/packages/NLog.4.4.12/lib/net35/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/net35/NLog.xml rename to packages/NLog.4.4.12/lib/net35/NLog.xml index 0f4f521..b71a3a5 100644 --- a/packages/NLog.4.4.10/lib/net35/NLog.xml +++ b/packages/NLog.4.4.12/lib/net35/NLog.xml @@ -12392,6 +12392,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.10/lib/net40/NLog.dll b/packages/NLog.4.4.12/lib/net40/NLog.dll similarity index 64% rename from packages/NLog.4.4.10/lib/net40/NLog.dll rename to packages/NLog.4.4.12/lib/net40/NLog.dll index 717560f..eed03ba 100644 Binary files a/packages/NLog.4.4.10/lib/net40/NLog.dll and b/packages/NLog.4.4.12/lib/net40/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/net40/NLog.xml b/packages/NLog.4.4.12/lib/net40/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/net40/NLog.xml rename to packages/NLog.4.4.12/lib/net40/NLog.xml index d6344a8..1d7372b 100644 --- a/packages/NLog.4.4.10/lib/net40/NLog.xml +++ b/packages/NLog.4.4.12/lib/net40/NLog.xml @@ -12459,6 +12459,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.10/lib/net45/NLog.dll b/packages/NLog.4.4.12/lib/net45/NLog.dll similarity index 64% rename from packages/NLog.4.4.10/lib/net45/NLog.dll rename to packages/NLog.4.4.12/lib/net45/NLog.dll index f571d2c..b8c37c1 100644 Binary files a/packages/NLog.4.4.10/lib/net45/NLog.dll and b/packages/NLog.4.4.12/lib/net45/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/net45/NLog.xml b/packages/NLog.4.4.12/lib/net45/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/net45/NLog.xml rename to packages/NLog.4.4.12/lib/net45/NLog.xml index ecde8d5..fcae6b8 100644 --- a/packages/NLog.4.4.10/lib/net45/NLog.xml +++ b/packages/NLog.4.4.12/lib/net45/NLog.xml @@ -12584,6 +12584,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.12/lib/sl4/NLog.dll b/packages/NLog.4.4.12/lib/sl4/NLog.dll new file mode 100644 index 0000000..d24d80a Binary files /dev/null and b/packages/NLog.4.4.12/lib/sl4/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/sl4/NLog.xml b/packages/NLog.4.4.12/lib/sl4/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/sl4/NLog.xml rename to packages/NLog.4.4.12/lib/sl4/NLog.xml index a6c7129..f7ffa7a 100644 --- a/packages/NLog.4.4.10/lib/sl4/NLog.xml +++ b/packages/NLog.4.4.12/lib/sl4/NLog.xml @@ -9426,6 +9426,11 @@ List of property names to exclude when is true + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.12/lib/sl5/NLog.dll b/packages/NLog.4.4.12/lib/sl5/NLog.dll new file mode 100644 index 0000000..8234075 Binary files /dev/null and b/packages/NLog.4.4.12/lib/sl5/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/sl5/NLog.xml b/packages/NLog.4.4.12/lib/sl5/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/sl5/NLog.xml rename to packages/NLog.4.4.12/lib/sl5/NLog.xml index 41ad981..2649cf8 100644 --- a/packages/NLog.4.4.10/lib/sl5/NLog.xml +++ b/packages/NLog.4.4.12/lib/sl5/NLog.xml @@ -9426,6 +9426,11 @@ List of property names to exclude when is true + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.4.4.10/lib/wp8/NLog.dll b/packages/NLog.4.4.12/lib/wp8/NLog.dll similarity index 65% rename from packages/NLog.4.4.10/lib/wp8/NLog.dll rename to packages/NLog.4.4.12/lib/wp8/NLog.dll index 0d10649..ab710f9 100644 Binary files a/packages/NLog.4.4.10/lib/wp8/NLog.dll and b/packages/NLog.4.4.12/lib/wp8/NLog.dll differ diff --git a/packages/NLog.4.4.10/lib/wp8/NLog.xml b/packages/NLog.4.4.12/lib/wp8/NLog.xml similarity index 99% rename from packages/NLog.4.4.10/lib/wp8/NLog.xml rename to packages/NLog.4.4.12/lib/wp8/NLog.xml index 4ae7eb7..c910518 100644 --- a/packages/NLog.4.4.10/lib/wp8/NLog.xml +++ b/packages/NLog.4.4.12/lib/wp8/NLog.xml @@ -9570,6 +9570,11 @@ Initializes a new instance of the class. + + + Initializes the layout. + + Formats the log event as a JSON document for writing. diff --git a/packages/NLog.Config.4.4.10/NLog.Config.4.4.10.nupkg b/packages/NLog.Config.4.4.10/NLog.Config.4.4.10.nupkg deleted file mode 100644 index a70efb8..0000000 Binary files a/packages/NLog.Config.4.4.10/NLog.Config.4.4.10.nupkg and /dev/null differ diff --git a/packages/NLog.Config.4.4.12/NLog.Config.4.4.12.nupkg b/packages/NLog.Config.4.4.12/NLog.Config.4.4.12.nupkg new file mode 100644 index 0000000..af597e2 Binary files /dev/null and b/packages/NLog.Config.4.4.12/NLog.Config.4.4.12.nupkg differ diff --git a/packages/NLog.Config.4.4.10/content/NLog.config b/packages/NLog.Config.4.4.12/content/NLog.config similarity index 100% rename from packages/NLog.Config.4.4.10/content/NLog.config rename to packages/NLog.Config.4.4.12/content/NLog.config diff --git a/packages/NLog.Config.4.4.10/tools/Install.ps1 b/packages/NLog.Config.4.4.12/tools/Install.ps1 similarity index 100% rename from packages/NLog.Config.4.4.10/tools/Install.ps1 rename to packages/NLog.Config.4.4.12/tools/Install.ps1 diff --git a/packages/NLog.Schema.4.4.10/NLog.Schema.4.4.10.nupkg b/packages/NLog.Schema.4.4.10/NLog.Schema.4.4.10.nupkg deleted file mode 100644 index 21ee2b7..0000000 Binary files a/packages/NLog.Schema.4.4.10/NLog.Schema.4.4.10.nupkg and /dev/null differ diff --git a/packages/NLog.Schema.4.4.12/NLog.Schema.4.4.12.nupkg b/packages/NLog.Schema.4.4.12/NLog.Schema.4.4.12.nupkg new file mode 100644 index 0000000..103d174 Binary files /dev/null and b/packages/NLog.Schema.4.4.12/NLog.Schema.4.4.12.nupkg differ diff --git a/packages/NLog.Schema.4.4.10/content/NLog.xsd b/packages/NLog.Schema.4.4.12/content/NLog.xsd similarity index 97% rename from packages/NLog.Schema.4.4.10/content/NLog.xsd rename to packages/NLog.Schema.4.4.12/content/NLog.xsd index 6b26042..4740d80 100644 --- a/packages/NLog.Schema.4.4.10/content/NLog.xsd +++ b/packages/NLog.Schema.4.4.12/content/NLog.xsd @@ -164,6 +164,7 @@ + @@ -1135,18 +1136,19 @@ + - + + - @@ -1154,7 +1156,6 @@ - @@ -1246,6 +1247,11 @@ Value indicationg whether file creation calls should be synchronized by a system global mutex. + + + Maximum number of log filenames that should be stored as existing. + + Indicates whether the footer should be written only when the file is archived. @@ -1271,11 +1277,6 @@ Indicates whether to create directories if they do not exist. - - - Indicates whether to enable log file(s) to be deleted. - - File attributes (Windows only). @@ -1291,6 +1292,16 @@ Indicates whether to replace file contents on each write instead of appending log message at the end. + + + Indicates whether to enable log file(s) to be deleted. + + + + + Number of times the write is appended on the file before NLog discards the log message. + + Indicates whether concurrent writes to the log file by multiple processes on the same host. @@ -1301,11 +1312,6 @@ Indicates whether to keep log file open instead of opening and closing it on each logging event. - - - Maximum number of log filenames that should be stored as existing. - - Indicates whether concurrent writes to the log file by multiple processes on different network hosts. @@ -1341,11 +1347,6 @@ 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. - - @@ -2517,8 +2518,10 @@ + + @@ -2564,6 +2567,11 @@ Web service namespace. Only used with Soap. + + + Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in parameters) + + Protocol to be used when calling web service. @@ -2996,6 +3004,74 @@ + + + + + + + + + + + + + + + + + + Action to be taken when filter matches. + + + + + Layout to be used to filter log messages. + + + + + Default number of unique filter values to expect, will automatically increase if needed + + + + + Append FilterCount to the when an event is no longer filtered + + + + + Insert FilterCount value into when an event is no longer filtered + + + + + Max number of unique filter values to expect simultaneously + + + + + Max length of filter values, will truncate if above limit + + + + + Default buffer size for the internal buffers + + + + + Reuse internal buffers, and doesn't have to constantly allocate new buffers + + + + + How long before a filter expires, and logging is accepted again + + + + + diff --git a/packages/NLog.Web.4.5.0/NLog.Web.4.5.0.nupkg b/packages/NLog.Web.4.5.0/NLog.Web.4.5.0.nupkg deleted file mode 100644 index 96e5cc9..0000000 Binary files a/packages/NLog.Web.4.5.0/NLog.Web.4.5.0.nupkg and /dev/null differ diff --git a/packages/NLog.Web.4.5.0/lib/net35/NLog.Web.dll b/packages/NLog.Web.4.5.0/lib/net35/NLog.Web.dll deleted file mode 100644 index 3edbda6..0000000 Binary files a/packages/NLog.Web.4.5.0/lib/net35/NLog.Web.dll and /dev/null differ diff --git a/packages/NLog.Web.4.5.1/NLog.Web.4.5.1.nupkg b/packages/NLog.Web.4.5.1/NLog.Web.4.5.1.nupkg new file mode 100644 index 0000000..4878137 Binary files /dev/null and b/packages/NLog.Web.4.5.1/NLog.Web.4.5.1.nupkg differ diff --git a/packages/NLog.Web.4.5.0/lib/net35/NLog.Web.XML b/packages/NLog.Web.4.5.1/lib/net35/NLog.Web.XML similarity index 98% rename from packages/NLog.Web.4.5.0/lib/net35/NLog.Web.XML rename to packages/NLog.Web.4.5.1/lib/net35/NLog.Web.XML index cdae6f9..57984f2 100644 --- a/packages/NLog.Web.4.5.0/lib/net35/NLog.Web.XML +++ b/packages/NLog.Web.4.5.1/lib/net35/NLog.Web.XML @@ -436,7 +436,9 @@ - The (full) name of the assembly. If null, using the entry assembly. + The (full) name of the assembly. If null, using: + 1) for .NET Standard - the runtime framework (for example, for .NET Core 1.1 this layout renderer returned value "1.1"), + 2) for .NET Full - the entry assembly. @@ -489,6 +491,7 @@ ${aspnet-request-url:IncludeQueryString=false} - produces http://www.exmaple.com/ ${aspnet-request-url:IncludePort=true} - produces http://www.exmaple.com:80/ ${aspnet-request-url:IncludePort=false} - produces http://www.exmaple.com/ + ${aspnet-request-url:IncludeScheme=false} - produces www.exmaple.com/ ${aspnet-request-url:IncludePort=true:IncludeQueryString=true} - produces http://www.exmaple.com:80/?t=1 @@ -508,6 +511,11 @@ To specify whether to exclude / include the host. Default is true. + + + To specify whether to exclude / include the scheme. Default is true. + + Renders the Request URL from the HttpRequest diff --git a/packages/NLog.Web.4.5.1/lib/net35/NLog.Web.dll b/packages/NLog.Web.4.5.1/lib/net35/NLog.Web.dll new file mode 100644 index 0000000..8629910 Binary files /dev/null and b/packages/NLog.Web.4.5.1/lib/net35/NLog.Web.dll differ