From 784f0227ee9a7173b4698ca0e74c2152da84e670 Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Tue, 27 Nov 2018 21:26:04 +0000 Subject: [PATCH] Updated NuGet packages --- .../Filtration.Common.Tests.csproj | 33 +- Filtration.Common.Tests/app.config | 19 + Filtration.Common.Tests/packages.config | 9 +- Filtration.Common/Filtration.Common.csproj | 35 +- Filtration.Common/app.config | 11 + Filtration.Common/packages.config | 8 +- .../Filtration.Interface.csproj | 19 +- Filtration.Interface/app.config | 11 + Filtration.Interface/packages.config | 4 +- .../App.config | 14 +- ...ration.ItemFilterPreview.Data.Tests.csproj | 31 +- .../packages.config | 12 +- Filtration.ItemFilterPreview.Data/App.config | 21 +- .../Filtration.ItemFilterPreview.Data.csproj | 25 +- .../packages.config | 10 +- .../Filtration.ItemFilterPreview.Tests.csproj | 43 +- Filtration.ItemFilterPreview.Tests/app.config | 26 +- .../packages.config | 12 +- Filtration.ItemFilterPreview/App.config | 24 +- .../Filtration.ItemFilterPreview.csproj | 48 +- Filtration.ItemFilterPreview/packages.config | 13 +- .../Filtration.ObjectModel.Tests.csproj | 33 +- Filtration.ObjectModel.Tests/app.config | 27 + Filtration.ObjectModel.Tests/packages.config | 9 +- .../Filtration.ObjectModel.csproj | 30 +- Filtration.ObjectModel/app.config | 11 + Filtration.ObjectModel/packages.config | 8 +- .../Filtration.Parser.Interface.csproj | 4 +- Filtration.Parser.Interface/app.config | 11 + .../Filtration.Parser.Tests.csproj | 40 +- .../TestItemFilterScriptTranslator.cs | 2 +- Filtration.Parser.Tests/app.config | 27 + Filtration.Parser.Tests/packages.config | 11 +- Filtration.Parser/Filtration.Parser.csproj | 13 +- Filtration.Parser/app.config | 11 + Filtration.Parser/packages.config | 4 +- Filtration.Tests/Filtration.Tests.csproj | 39 +- .../TestItemFilterScriptRepository.cs | 2 +- Filtration.Tests/app.config | 30 +- Filtration.Tests/packages.config | 11 +- .../Filtration.ThemeEditor.Tests.csproj | 33 +- Filtration.ThemeEditor.Tests/app.config | 27 + Filtration.ThemeEditor.Tests/packages.config | 9 +- .../Filtration.ThemeEditor.csproj | 78 +- Filtration.ThemeEditor/app.config | 11 + Filtration.ThemeEditor/packages.config | 15 +- Filtration/App.config | 10 +- Filtration/App.xaml | 2 +- Filtration/Filtration.csproj | 88 +- Filtration/NLog.xsd | 809 +++++++++++------- Filtration/ViewModels/MainWindowViewModel.cs | 8 +- Filtration/packages.config | 24 +- 52 files changed, 1209 insertions(+), 656 deletions(-) create mode 100644 Filtration.Common.Tests/app.config create mode 100644 Filtration.Common/app.config create mode 100644 Filtration.Interface/app.config create mode 100644 Filtration.ObjectModel.Tests/app.config create mode 100644 Filtration.ObjectModel/app.config create mode 100644 Filtration.Parser.Interface/app.config create mode 100644 Filtration.Parser.Tests/app.config create mode 100644 Filtration.Parser/app.config create mode 100644 Filtration.ThemeEditor.Tests/app.config create mode 100644 Filtration.ThemeEditor/app.config diff --git a/Filtration.Common.Tests/Filtration.Common.Tests.csproj b/Filtration.Common.Tests/Filtration.Common.Tests.csproj index 4cef0e6..87f9293 100644 --- a/Filtration.Common.Tests/Filtration.Common.Tests.csproj +++ b/Filtration.Common.Tests/Filtration.Common.Tests.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,6 +13,8 @@ v4.6.1 512 + + true @@ -31,18 +34,27 @@ 4 - - ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll - True + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll - - ..\packages\Moq.4.5.30\lib\net45\Moq.dll + + ..\packages\Moq.4.10.0\lib\net45\Moq.dll - - ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -53,9 +65,16 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +
+ @@ -11,19 +11,28 @@ + - - - + + - + - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj b/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj index 8b4461e..f99748f 100644 --- a/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj +++ b/Filtration.ItemFilterPreview.Data/Filtration.ItemFilterPreview.Data.csproj @@ -34,23 +34,22 @@ - ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - True + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\System.Data.SQLite.Core.1.0.102.0\lib\net46\System.Data.SQLite.dll - True + + ..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.102.0\lib\net46\System.Data.SQLite.EF6.dll - True + + ..\packages\System.Data.SQLite.EF6.1.0.109.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.102.0\lib\net46\System.Data.SQLite.Linq.dll - True + + ..\packages\System.Data.SQLite.Linq.1.0.109.0\lib\net46\System.Data.SQLite.Linq.dll @@ -78,12 +77,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index daac6b1..2d0a9d1 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -52,18 +52,20 @@ true - - ..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll + + ..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll - - ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll - True + + ..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll - - ..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll + + ..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll - - ..\packages\ControlzEx.2.2.0.4\lib\net45\ControlzEx.dll + + ..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll + + + ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll @@ -74,25 +76,20 @@ ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll - - ..\packages\Fluent.Ribbon.4.0.3.394\lib\net45\Fluent.dll - True + + ..\packages\Fluent.Ribbon.6.1.0.326\lib\net45\Fluent.dll - - ..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll - True + + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll - - ..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll - True + + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll - - ..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll - True + + ..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll ..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll - True @@ -114,7 +111,7 @@ ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll - ..\packages\NLog.4.4.9\lib\net45\NLog.dll + ..\packages\NLog.4.5.11\lib\net45\NLog.dll ..\packages\squirrel.windows.1.8.0\lib\Net45\NuGet.Squirrel.dll @@ -130,7 +127,17 @@ + + + + + + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + False ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll @@ -141,7 +148,7 @@ - ..\packages\ControlzEx.2.2.0.4\lib\net45\System.Windows.Interactivity.dll + ..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll @@ -152,37 +159,34 @@ - - ..\packages\WpfAnimatedGif.1.4.14\lib\net\WpfAnimatedGif.dll - True + + ..\packages\WpfAnimatedGif.1.4.17\lib\net\WpfAnimatedGif.dll False ..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll - True + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - True + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - True + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - True + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll False libs\Xceed.Wpf.AvalonDock.Themes.VS2013.dll - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll - True + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.DataGrid.dll + + + ..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.Toolkit.dll diff --git a/Filtration/NLog.xsd b/Filtration/NLog.xsd index c9cbd05..075bb91 100644 --- a/Filtration/NLog.xsd +++ b/Filtration/NLog.xsd @@ -70,6 +70,11 @@ Use InvariantCulture as default culture instead of CurrentCulture. Default value is: false. + + + Perform mesage template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty. + + @@ -164,6 +169,7 @@ + @@ -325,16 +331,11 @@ - + - - - Name of the target. - - Delay the flush until the LogEvent has been confirmed as written @@ -345,6 +346,11 @@ Condition expression. Log events who meet this condition will cause a flush on the wrapped target. + + + Name of the target. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -360,6 +366,7 @@ + @@ -378,6 +385,11 @@ 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. + + + Action to take if the buffer overflows. + + Indicates whether to use sliding timeout. @@ -391,6 +403,12 @@ + + + + + + @@ -402,21 +420,25 @@ - + - + - - + + + + + + + - - + @@ -454,9 +476,9 @@ Action that should be taken if the will be more connections than . - + - Action that should be taken if the message is larger than maxMessageSize. + Maximum queue size. @@ -479,14 +501,24 @@ Network address. - + - Maximum queue size. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to include stack contents. + NDLC item separator. + + + + + NDC item separator. + + + + + Indicates whether to include NLog-specific extensions to log4j schema. @@ -494,9 +526,19 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include contents of the stack. + + + + + Indicates whether to include stack contents. + + + + + Indicates whether to include dictionary contents. @@ -509,19 +551,19 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. - - - - - Indicates whether to include dictionary contents. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -570,12 +612,12 @@ - - - + + + @@ -598,11 +640,6 @@ Footer. - - - Indicates whether to use default row highlighting rules. - - Indicates whether to auto-check if the console is available. - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App) @@ -618,6 +655,11 @@ Indicates whether the error stream (stderr) should be used instead of the output stream (stdout). + + + Indicates whether to use default row highlighting rules. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -671,14 +713,19 @@ + - + + + Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used. + + Indicates whether to ignore case when comparing texts. @@ -699,11 +746,6 @@ Indicates whether to match whole words only. - - - Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used. - - Background color. @@ -723,9 +765,9 @@ - + @@ -748,11 +790,6 @@ Footer. - - - Indicates whether to send the log messages to the standard error instead of the standard output. - - Indicates whether to auto-check if the console is available - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App) @@ -763,6 +800,11 @@ The encoding for writing messages to the . + + + Indicates whether to send the log messages to the standard error instead of the standard output. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1007,13 +1049,14 @@ + + + - - @@ -1031,6 +1074,11 @@ Layout that renders event Category. + + + Optional entrytype. When not set, or when not convertable to then determined by + + Layout that renders event ID. @@ -1046,6 +1094,16 @@ Name of the machine on which Event Log service is running. + + + Maximum Event log size in kilobytes. If null, the value won't be set. Default is 512 Kilobytes as specified by Eventlog API + + + + + Message length limit to write to the Event Log. + + Value to be used as the event Source. @@ -1056,16 +1114,6 @@ Action to take if the message is larger than the option. - - - Optional entrytype. When not set, or when not convertable to then determined by - - - - - Message length limit to write to the Event Log. - - Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1117,38 +1165,40 @@ + + - - - - - - - + + + + + + + + - - - - - - - - - + - - - + + + + + + + + + + @@ -1180,6 +1230,11 @@ Line ending mode. + + + Indicates whether to compress archive files into the zip archive format. + + Way file archives are numbered. @@ -1190,6 +1245,11 @@ Name of the file to be used for an archive. + + + Is the an absolute or relative path? + + Indicates whether to automatically archive log files every time the specified time passes. @@ -1200,34 +1260,19 @@ Size in bytes above which log files will be automatically archived. Warning: combining this with isn't supported. We cannot create multiple archive files, if they should have the same name. Choose: - - - Indicates whether to compress archive files into the zip archive format. - - Maximum number of archive files that should be kept. - + - Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation. + Indicates whether the footer should be written only when the file is archived. - + - Is the an absolute or relative path? - - - - - Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong. - - - - - Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write + Maximum number of log filenames that should be stored as existing. @@ -1235,14 +1280,29 @@ Is the an absolute or relative path? + + + Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation. + + Value indicationg whether file creation calls should be synchronized by a system global mutex. - + - Indicates whether the footer should be written only when the file is archived. + Indicates whether to replace file contents on each write instead of appending log message at the end. + + + + + Indicates whether to write BOM (byte order mark) in created files + + + + + Indicates whether to enable log file(s) to be deleted. @@ -1260,59 +1320,24 @@ Indicates whether to archive old log file on startup. + + + Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong. + + Indicates whether to create directories if they do not exist. - - - Indicates whether to enable log file(s) to be deleted. - - - - - File attributes (Windows only). - - Indicates whether to delete old log file on startup. - + - Indicates whether to replace file contents on each write instead of appending log message at the end. - - - - - Indicates whether concurrent writes to the log file by multiple processes on the same host. - - - - - 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. - - - - - 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). - - - - - 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. + File attributes (Windows only). @@ -1320,14 +1345,39 @@ Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit - + - Log file buffer size in bytes. + Indicates whether concurrent writes to the log file by multiple processes on different network hosts. - + - Indicates whether to automatically flush the file buffers after each log message. + 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). + + + + + Indicates whether to keep log file open instead of opening and closing it on each logging event. + + + + + Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write + + + + + Indicates whether concurrent writes to the log file by multiple processes on the same host. + + + + + Number of times the write is appended on the file before NLog discards the log message. @@ -1335,9 +1385,19 @@ 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. + Log file buffer size in bytes. + + + + + Maximum number of seconds before open files are flushed. If this number is negative or zero the files are not flushed by timer. + + + + + Indicates whether to automatically flush the file buffers after each log message. @@ -1351,6 +1411,13 @@ + + + + + + + @@ -1368,13 +1435,6 @@ - - - - - - - @@ -1510,16 +1570,11 @@ - + - - - Name of the target. - - Interval in which messages will be written up to the number of messages. @@ -1530,6 +1585,11 @@ Maximum allowed number of messages written per . + + + Name of the target. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -1631,19 +1691,19 @@ - + + - - - + + + + - - - - + + @@ -1674,9 +1734,14 @@ Footer. - + - Indicates whether to send message as HTML instead of plain text. + Indicates whether NewLine characters in the body should be replaced with tags. + + + + + Priority used for sending mails. @@ -1684,9 +1749,9 @@ Encoding to be used for sending e-mail. - + - Indicates whether to add new lines between log entries. + BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1694,14 +1759,19 @@ CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). - + - Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Indicates whether to add new lines between log entries. - + - BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). + Indicates whether to send message as HTML instead of plain text. + + + + + Sender's email address (e.g. joe@domain.com). @@ -1714,24 +1784,9 @@ Mail subject. - + - Sender's email address (e.g. joe@domain.com). - - - - - Indicates the SMTP client timeout. - - - - - Priority used for sending mails. - - - - - Indicates whether NewLine characters in the body should be replaced with tags. + Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com). @@ -1739,6 +1794,11 @@ Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit + + + Indicates the SMTP client timeout. + + SMTP Server to be used for sending. @@ -1827,74 +1887,6 @@ - - - - - - - - - - - - - - - - - - Name of the target. - - - - - Layout used to format log messages. - - - - - Encoding to be used when writing text to the queue. - - - - - Indicates whether to use the XML format when serializing message. This will also disable creating queues. - - - - - Indicates whether to check if a queue exists before writing to it. - - - - - Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit - - - - - Indicates whether to create the queue if it doesn't exists. - - - - - Label to associate with each message. - - - - - Name of the queue to write to. - - - - - Indicates whether to use recoverable messages (with guaranteed delivery). - - - - - @@ -1938,13 +1930,13 @@ - - + + @@ -1977,16 +1969,6 @@ Indicates whether to append newline at the end of log message. - - - Action that should be taken if the will be more connections than . - - - - - Action that should be taken if the message is larger than maxMessageSize. - - Network address. @@ -2012,6 +1994,16 @@ Maximum queue size. + + + Action that should be taken if the will be more connections than . + + + + + Action that should be taken if the message is larger than maxMessageSize. + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -2031,21 +2023,25 @@ - + - + - - + + + + + + + - - + @@ -2083,9 +2079,9 @@ Action that should be taken if the will be more connections than . - + - Action that should be taken if the message is larger than maxMessageSize. + Maximum queue size. @@ -2108,14 +2104,24 @@ Network address. - + - Maximum queue size. + Action that should be taken if the message is larger than maxMessageSize. - + - Indicates whether to include stack contents. + NDLC item separator. + + + + + NDC item separator. + + + + + Indicates whether to include NLog-specific extensions to log4j schema. @@ -2123,9 +2129,19 @@ Indicates whether to include source info (file name and line number) in the information sent over the network. - + - Indicates whether to include NLog-specific extensions to log4j schema. + Indicates whether to include contents of the stack. + + + + + Indicates whether to include stack contents. + + + + + Indicates whether to include dictionary contents. @@ -2138,19 +2154,19 @@ Indicates whether to include call site (class and method name) in the information sent over the network. + + + Option to include all properties from the log events + + AppInfo field. By default it's the friendly name of the current AppDomain. - + - NDC item separator. - - - - - Indicates whether to include dictionary contents. + Renderer for log4j:event logger-xml-attribute (Default ${logger}) @@ -2480,6 +2496,7 @@ + @@ -2492,6 +2509,11 @@ Layout used to format log messages. + + + Always use independent of + + Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit @@ -2505,47 +2527,36 @@ - - - - + + + + + + + + Name of the target. - - - Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. - - Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit - + - Encoding. - - - - - Value whether escaping be done according to the old NLog style (Very non-standard) - - - - - Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs) + Should we include the BOM (Byte-order-mark) for UTF? Influences the property. This will only work for UTF-8. @@ -2563,11 +2574,36 @@ Protocol to be used when calling web service. + + + Custom proxy address, include port separated by a colon + + + + + Encoding. + + Web service URL. + + + Value whether escaping be done according to the old NLog style (Very non-standard) + + + + + Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs) + + + + + Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in parameters) + + Name of the root XML element, if POST of XML document chosen. If so, this property must not be null. (see and ). @@ -2578,6 +2614,11 @@ (optional) root namespace of the XML document, if POST of XML document chosen. (see and ). + + + Proxy configuration when calling web service + + @@ -2591,6 +2632,14 @@ + + + + + + + + @@ -2701,8 +2750,11 @@ + + + @@ -2711,7 +2763,17 @@ - Option to include all properties from the log events + Option to include all properties from the log event (as JSON) + + + + + Indicates whether to include contents of the dictionary. + + + + + Indicates whether to include contents of the dictionary. @@ -2724,16 +2786,32 @@ Option to suppress the extra spaces in the output json + + + How far should the JSON serializer follow object references before backing off + + - - + + + + + + Layout that will be rendered as the attribute's value. + + + + + Name of the attribute. + + Determines wether or not this attribute will be Json encoded. @@ -2744,14 +2822,9 @@ Indicates whether to escape non-ascii characters - + - Layout that will be rendered as the attribute's value. - - - - - Name of the attribute. + Whether an attribute with empty value should be included in the output @@ -2788,6 +2861,8 @@ + + @@ -2804,6 +2879,16 @@ Indicates whether to include contents of the dictionary. + + + Indicates whether to include contents of the stack. + + + + + Indicates whether to include contents of the stack. + + @@ -2978,6 +3063,80 @@ + + + + + + + + + + + + + + + + + + + Action to be taken when filter matches. + + + + + Default number of unique filter values to expect, will automatically increase if needed + + + + + Applies the configured action to the initial logevent that starts the timeout period. Used to configure that it should ignore all events until timeout. + + + + + Layout to be used to filter log messages. + + + + + Max number of unique filter values to expect simultaneously + + + + + Max length of filter values, will truncate if above limit + + + + + How long before a filter expires, and logging is accepted again + + + + + Default buffer size for the internal buffers + + + + + Reuse internal buffers, and doesn't have to constantly allocate new buffers + + + + + Append FilterCount to the when an event is no longer filtered + + + + + Insert FilterCount value into when an event is no longer filtered + + + + + diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs index c549ae9..2466aff 100644 --- a/Filtration/ViewModels/MainWindowViewModel.cs +++ b/Filtration/ViewModels/MainWindowViewModel.cs @@ -788,12 +788,12 @@ namespace Filtration.ViewModels foreach (var document in openDocuments) { - var docCount = _avalonDockWorkspaceViewModel.OpenDocuments.OfType().Count(); - await document.Close(); - if (_avalonDockWorkspaceViewModel.OpenDocuments.OfType().Count() == docCount) + if (!_avalonDockWorkspaceViewModel.OpenDocuments.Contains(document)) { - return false; + continue; } + + await document.Close(); } return true; diff --git a/Filtration/packages.config b/Filtration/packages.config index 0b98c5b..c02736b 100644 --- a/Filtration/packages.config +++ b/Filtration/packages.config @@ -1,25 +1,25 @@  - - - - - + + + + + - - + + - - - - + + + + - + \ No newline at end of file