From 72f58bacf3b91df8e828008ad8978e4f7b9faa4f Mon Sep 17 00:00:00 2001 From: Geert van Horrik Date: Mon, 11 Dec 2023 14:13:35 +0100 Subject: [PATCH] Maintenance --- src/LogViewer.Tests/LogViewer.Tests.csproj | 6 +----- .../Behaviors/MultipleSelectionBehavior.cs | 1 - .../Commands/FileExitCommandContainer.cs | 2 +- ...erCopyResultToClipboardCommandContainer.cs | 7 +++---- .../FilterExportResultCommandContainer.cs | 3 +-- ...lterResetSearchTemplateCommandContainer.cs | 3 +-- .../Commands/HelpAboutCommandContainer.cs | 3 +-- .../SettingsGeneralCommandContainer.cs | 5 ++--- .../NavigatorConfigurationSynchronizer.cs | 1 - ...tampVisibilityConfigurationSynchronizer.cs | 1 - .../Controls/HighlightableTextBlock.cs | 1 - .../Extensions/AppDataServiceExtensions.cs | 2 -- src/LogViewer/Extensions/FilterExtensions.cs | 2 -- src/LogViewer/Extensions/IListExtensions.cs | 1 - .../Extensions/ItemsControlExtensions.cs | 1 - src/LogViewer/Extensions/ListExtensions.cs | 1 - src/LogViewer/LogViewer.csproj | 6 +----- src/LogViewer/Models/FileNode.cs | 2 -- src/LogViewer/Models/FolderNode.cs | 1 - src/LogViewer/ModuleInitializer.cs | 2 -- src/LogViewer/Services/FileSystemService.cs | 1 - src/LogViewer/Services/FilterService.cs | 1 - src/LogViewer/Services/LogReaderService.cs | 7 +++---- .../Services/LogTableConfigurationService.cs | 1 - src/LogViewer/Services/RegexService.cs | 1 - src/LogViewer/UnhandledExceptionWatcher.cs | 1 - .../ViewModels/LogRecordsTableViewModel.cs | 1 - src/LogViewer/ViewModels/RibbonViewModel.cs | 1 - src/LogViewer/ViewModels/SettingsViewModel.cs | 1 - .../ViewModels/StatusBarViewModel.cs | 1 - .../ViewModels/WindowCommandsViewModel.cs | 1 - .../Initializers/WorkspaceInitializer.cs | 1 - .../Providers/FilterWorkspaceProvider.cs | 1 - src/SolutionAssemblyInfo.cs | Bin 2654 -> 2604 bytes 34 files changed, 14 insertions(+), 56 deletions(-) diff --git a/src/LogViewer.Tests/LogViewer.Tests.csproj b/src/LogViewer.Tests/LogViewer.Tests.csproj index e06be31c..30e8a9e9 100644 --- a/src/LogViewer.Tests/LogViewer.Tests.csproj +++ b/src/LogViewer.Tests/LogViewer.Tests.csproj @@ -1,6 +1,6 @@ - net6.0-windows + net8.0-windows LogViewer.Tests LogViewer.Tests en-US @@ -33,10 +33,6 @@ - - - - diff --git a/src/LogViewer/Behaviors/MultipleSelectionBehavior.cs b/src/LogViewer/Behaviors/MultipleSelectionBehavior.cs index 7cbe4ce0..a60e7ec5 100644 --- a/src/LogViewer/Behaviors/MultipleSelectionBehavior.cs +++ b/src/LogViewer/Behaviors/MultipleSelectionBehavior.cs @@ -1,7 +1,6 @@ namespace LogViewer.Behaviors { using System; - using System.Collections; using System.Collections.Generic; using System.Linq; using System.Windows; diff --git a/src/LogViewer/Commands/FileExitCommandContainer.cs b/src/LogViewer/Commands/FileExitCommandContainer.cs index c1c99432..18d4d604 100644 --- a/src/LogViewer/Commands/FileExitCommandContainer.cs +++ b/src/LogViewer/Commands/FileExitCommandContainer.cs @@ -17,7 +17,7 @@ public FileExitCommandContainer(ICommandManager commandManager, INavigationServi _navigationService = navigationService; } - protected override async Task ExecuteAsync(object parameter) + public override async Task ExecuteAsync(object parameter) { await _navigationService.CloseApplicationAsync(); } diff --git a/src/LogViewer/Commands/FilterCopyResultToClipboardCommandContainer.cs b/src/LogViewer/Commands/FilterCopyResultToClipboardCommandContainer.cs index efbd1996..95c3810c 100644 --- a/src/LogViewer/Commands/FilterCopyResultToClipboardCommandContainer.cs +++ b/src/LogViewer/Commands/FilterCopyResultToClipboardCommandContainer.cs @@ -1,10 +1,8 @@ namespace LogViewer { using System; - using System.Linq; using System.Text; - - using Catel; + using System.Threading.Tasks; using Catel.MVVM; using LogViewer.Services; @@ -26,9 +24,10 @@ public FilterCopyResultToClipboardCommandContainer(ICommandManager commandManage _logTableService = logTableService; } - protected override void Execute(object parameter) + public override async Task ExecuteAsync(object parameter) { var stringBuilder = new StringBuilder(); + foreach (var record in _logTableService.LogTable.Records) { stringBuilder.AppendLine(record.ToString()); diff --git a/src/LogViewer/Commands/FilterExportResultCommandContainer.cs b/src/LogViewer/Commands/FilterExportResultCommandContainer.cs index f7d99a2b..e5f65904 100644 --- a/src/LogViewer/Commands/FilterExportResultCommandContainer.cs +++ b/src/LogViewer/Commands/FilterExportResultCommandContainer.cs @@ -1,7 +1,6 @@ namespace LogViewer { using System; - using System.IO; using System.Linq; using System.Threading.Tasks; @@ -32,7 +31,7 @@ public FilterExportResultCommandContainer(ICommandManager commandManager, _logTableService = logTableService; } - protected override async Task ExecuteAsync(object parameter) + public override async Task ExecuteAsync(object parameter) { var result = await _saveFileService.DetermineFileAsync(new DetermineSaveFileContext { diff --git a/src/LogViewer/Commands/FilterResetSearchTemplateCommandContainer.cs b/src/LogViewer/Commands/FilterResetSearchTemplateCommandContainer.cs index cccf0aa3..33721c38 100644 --- a/src/LogViewer/Commands/FilterResetSearchTemplateCommandContainer.cs +++ b/src/LogViewer/Commands/FilterResetSearchTemplateCommandContainer.cs @@ -1,7 +1,6 @@ namespace LogViewer { using System; - using Catel; using Catel.MVVM; using Services; @@ -17,7 +16,7 @@ public FilterResetSearchTemplateCommandContainer(ICommandManager commandManager, _filterService = filterService; } - protected override void Execute(object parameter) + public override void Execute(object parameter) { _filterService.Filter.SearchTemplate.TemplateString = string.Empty; } diff --git a/src/LogViewer/Commands/HelpAboutCommandContainer.cs b/src/LogViewer/Commands/HelpAboutCommandContainer.cs index 65fb9e0f..c1e51dd9 100644 --- a/src/LogViewer/Commands/HelpAboutCommandContainer.cs +++ b/src/LogViewer/Commands/HelpAboutCommandContainer.cs @@ -2,7 +2,6 @@ { using System; using System.Threading.Tasks; - using Catel; using Catel.MVVM; using Orchestra.Services; @@ -18,7 +17,7 @@ public HelpAboutCommandContainer(ICommandManager commandManager, IAboutService a _aboutService = aboutService; } - protected override Task ExecuteAsync(object parameter) + public override Task ExecuteAsync(object parameter) { return _aboutService.ShowAboutAsync(); } diff --git a/src/LogViewer/Commands/SettingsGeneralCommandContainer.cs b/src/LogViewer/Commands/SettingsGeneralCommandContainer.cs index b631d0c0..dc4789e2 100644 --- a/src/LogViewer/Commands/SettingsGeneralCommandContainer.cs +++ b/src/LogViewer/Commands/SettingsGeneralCommandContainer.cs @@ -3,7 +3,6 @@ using System; using System.Linq; using System.Threading.Tasks; - using Catel; using Catel.Logging; using Catel.MVVM; using Catel.Reflection; @@ -28,7 +27,7 @@ public SettingsGeneralCommandContainer(ICommandManager commandManager, IUIVisual _viewModelFactory = viewModelFactory; } - protected override async Task ExecuteAsync(object parameter) + public override async Task ExecuteAsync(object parameter) { base.Execute(parameter); @@ -43,4 +42,4 @@ protected override async Task ExecuteAsync(object parameter) await _uiVisualizerService.ShowDialogAsync(viewModel); } } -} \ No newline at end of file +} diff --git a/src/LogViewer/Configuration/NavigatorConfigurationSynchronizer.cs b/src/LogViewer/Configuration/NavigatorConfigurationSynchronizer.cs index aabc0115..8bf78b89 100644 --- a/src/LogViewer/Configuration/NavigatorConfigurationSynchronizer.cs +++ b/src/LogViewer/Configuration/NavigatorConfigurationSynchronizer.cs @@ -3,7 +3,6 @@ using System; using System.Collections.ObjectModel; using System.Linq; - using Catel; using Catel.Configuration; using Models; using Services; diff --git a/src/LogViewer/Configuration/TimestampVisibilityConfigurationSynchronizer.cs b/src/LogViewer/Configuration/TimestampVisibilityConfigurationSynchronizer.cs index 85d3860c..98974d2b 100644 --- a/src/LogViewer/Configuration/TimestampVisibilityConfigurationSynchronizer.cs +++ b/src/LogViewer/Configuration/TimestampVisibilityConfigurationSynchronizer.cs @@ -1,7 +1,6 @@ namespace LogViewer.Configuration { using System; - using Catel; using Catel.Configuration; using Models; using Services; diff --git a/src/LogViewer/Controls/HighlightableTextBlock.cs b/src/LogViewer/Controls/HighlightableTextBlock.cs index 6e85fcb0..d4dacac0 100644 --- a/src/LogViewer/Controls/HighlightableTextBlock.cs +++ b/src/LogViewer/Controls/HighlightableTextBlock.cs @@ -8,7 +8,6 @@ using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; - using Catel.IoC; using Catel.Services; using Catel.Windows.Threading; diff --git a/src/LogViewer/Extensions/AppDataServiceExtensions.cs b/src/LogViewer/Extensions/AppDataServiceExtensions.cs index be5ece0b..e4fc9715 100644 --- a/src/LogViewer/Extensions/AppDataServiceExtensions.cs +++ b/src/LogViewer/Extensions/AppDataServiceExtensions.cs @@ -1,10 +1,8 @@ namespace LogViewer { using System; - using Catel; using Catel.IO; using Catel.Services; - using Orchestra.Services; public static class AppDataServiceExtensions { diff --git a/src/LogViewer/Extensions/FilterExtensions.cs b/src/LogViewer/Extensions/FilterExtensions.cs index 68b56b44..c94ba249 100644 --- a/src/LogViewer/Extensions/FilterExtensions.cs +++ b/src/LogViewer/Extensions/FilterExtensions.cs @@ -2,8 +2,6 @@ { using System; using System.Text.RegularExpressions; - - using Catel; using Catel.Logging; using LogViewer.Models; diff --git a/src/LogViewer/Extensions/IListExtensions.cs b/src/LogViewer/Extensions/IListExtensions.cs index 2aba85b7..2e28803c 100644 --- a/src/LogViewer/Extensions/IListExtensions.cs +++ b/src/LogViewer/Extensions/IListExtensions.cs @@ -2,7 +2,6 @@ { using System; using System.Collections.Generic; - using Catel; public static class IListExtensions { diff --git a/src/LogViewer/Extensions/ItemsControlExtensions.cs b/src/LogViewer/Extensions/ItemsControlExtensions.cs index 4b752119..e34d0930 100644 --- a/src/LogViewer/Extensions/ItemsControlExtensions.cs +++ b/src/LogViewer/Extensions/ItemsControlExtensions.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Windows.Controls; - using Catel; public static class ItemsControlExtensions { diff --git a/src/LogViewer/Extensions/ListExtensions.cs b/src/LogViewer/Extensions/ListExtensions.cs index c38ba859..04d67b1f 100644 --- a/src/LogViewer/Extensions/ListExtensions.cs +++ b/src/LogViewer/Extensions/ListExtensions.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Linq; - using Catel; public static class ListExtensions { diff --git a/src/LogViewer/LogViewer.csproj b/src/LogViewer/LogViewer.csproj index 1d5a3f11..c6a38f00 100644 --- a/src/LogViewer/LogViewer.csproj +++ b/src/LogViewer/LogViewer.csproj @@ -1,6 +1,6 @@ - net6.0-windows + net8.0-windows win-x64 false true @@ -54,10 +54,6 @@ - - - - diff --git a/src/LogViewer/Models/FileNode.cs b/src/LogViewer/Models/FileNode.cs index 9bcb8407..41b40dc7 100644 --- a/src/LogViewer/Models/FileNode.cs +++ b/src/LogViewer/Models/FileNode.cs @@ -1,9 +1,7 @@ namespace LogViewer.Models { using System; - using System.Collections.ObjectModel; using System.IO; - using Catel; using Catel.Collections; public class FileNode : NavigationNode diff --git a/src/LogViewer/Models/FolderNode.cs b/src/LogViewer/Models/FolderNode.cs index aeab33e2..ced31255 100644 --- a/src/LogViewer/Models/FolderNode.cs +++ b/src/LogViewer/Models/FolderNode.cs @@ -6,7 +6,6 @@ using System.Collections.ObjectModel; using System.IO; using System.Windows.Data; - using Catel; public class FolderNode : NavigationNode { diff --git a/src/LogViewer/ModuleInitializer.cs b/src/LogViewer/ModuleInitializer.cs index 0657a520..6ed85cb4 100644 --- a/src/LogViewer/ModuleInitializer.cs +++ b/src/LogViewer/ModuleInitializer.cs @@ -1,7 +1,5 @@ using Catel.IoC; -using LogViewer; using LogViewer.Services; -using LogViewer.Models; using Orchestra.Services; /// diff --git a/src/LogViewer/Services/FileSystemService.cs b/src/LogViewer/Services/FileSystemService.cs index f5949662..e7f49818 100644 --- a/src/LogViewer/Services/FileSystemService.cs +++ b/src/LogViewer/Services/FileSystemService.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Threading.Tasks; using Catel; - using Catel.Collections; using Catel.Logging; using Catel.Services; using Models; diff --git a/src/LogViewer/Services/FilterService.cs b/src/LogViewer/Services/FilterService.cs index 751c8a2b..bdce84f5 100644 --- a/src/LogViewer/Services/FilterService.cs +++ b/src/LogViewer/Services/FilterService.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; - using Catel; using Catel.Collections; using Catel.Services; using MethodTimer; diff --git a/src/LogViewer/Services/LogReaderService.cs b/src/LogViewer/Services/LogReaderService.cs index cb3f4316..5aa0c061 100644 --- a/src/LogViewer/Services/LogReaderService.cs +++ b/src/LogViewer/Services/LogReaderService.cs @@ -5,9 +5,7 @@ using System.Globalization; using System.IO; using System.Text.RegularExpressions; - using Catel; using Catel.Logging; - using MethodTimer; using Models; using Orc.FileSystem; @@ -45,7 +43,7 @@ public IEnumerable LoadRecordsFromFile(FileNode fileNode) { ArgumentNullException.ThrowIfNull(fileNode); - FileStream stream; + Stream stream; Log.Debug("Loading records file file '{0}'", fileNode); @@ -60,7 +58,8 @@ public IEnumerable LoadRecordsFromFile(FileNode fileNode) yield break; } - int counter = 0; + var counter = 0; + using (stream) { using (var reader = new StreamReader(stream)) diff --git a/src/LogViewer/Services/LogTableConfigurationService.cs b/src/LogViewer/Services/LogTableConfigurationService.cs index cda805a0..165f7846 100644 --- a/src/LogViewer/Services/LogTableConfigurationService.cs +++ b/src/LogViewer/Services/LogTableConfigurationService.cs @@ -1,7 +1,6 @@ namespace LogViewer.Services { using System; - using Catel; using Catel.Configuration; public class LogTableConfigurationService : ILogTableConfigurationService diff --git a/src/LogViewer/Services/RegexService.cs b/src/LogViewer/Services/RegexService.cs index 5be06815..d16de4c9 100644 --- a/src/LogViewer/Services/RegexService.cs +++ b/src/LogViewer/Services/RegexService.cs @@ -1,7 +1,6 @@ namespace LogViewer.Services { using System; - using Catel; internal class RegexService : IRegexService { diff --git a/src/LogViewer/UnhandledExceptionWatcher.cs b/src/LogViewer/UnhandledExceptionWatcher.cs index 8f9c2529..6a57d013 100644 --- a/src/LogViewer/UnhandledExceptionWatcher.cs +++ b/src/LogViewer/UnhandledExceptionWatcher.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Threading.Tasks; using System.Windows; - using Catel; using Catel.Logging; using Catel.Services; diff --git a/src/LogViewer/ViewModels/LogRecordsTableViewModel.cs b/src/LogViewer/ViewModels/LogRecordsTableViewModel.cs index 1454dbef..b37f3603 100644 --- a/src/LogViewer/ViewModels/LogRecordsTableViewModel.cs +++ b/src/LogViewer/ViewModels/LogRecordsTableViewModel.cs @@ -6,7 +6,6 @@ using System.ComponentModel; using System.Reactive.Linq; using System.Threading.Tasks; - using Catel; using Catel.Fody; using Catel.MVVM; using Models; diff --git a/src/LogViewer/ViewModels/RibbonViewModel.cs b/src/LogViewer/ViewModels/RibbonViewModel.cs index 78a0e2eb..faeff475 100644 --- a/src/LogViewer/ViewModels/RibbonViewModel.cs +++ b/src/LogViewer/ViewModels/RibbonViewModel.cs @@ -2,7 +2,6 @@ { using System.ComponentModel; using System.Threading.Tasks; - using Catel; using Catel.Configuration; using Catel.Fody; using Catel.Reflection; diff --git a/src/LogViewer/ViewModels/SettingsViewModel.cs b/src/LogViewer/ViewModels/SettingsViewModel.cs index d56c2694..39ea0fc6 100644 --- a/src/LogViewer/ViewModels/SettingsViewModel.cs +++ b/src/LogViewer/ViewModels/SettingsViewModel.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; - using Catel; using Catel.Configuration; using Catel.MVVM; using Orc.Squirrel; diff --git a/src/LogViewer/ViewModels/StatusBarViewModel.cs b/src/LogViewer/ViewModels/StatusBarViewModel.cs index 0ebc1a4f..8a723207 100644 --- a/src/LogViewer/ViewModels/StatusBarViewModel.cs +++ b/src/LogViewer/ViewModels/StatusBarViewModel.cs @@ -2,7 +2,6 @@ { using System; using System.Threading.Tasks; - using Catel; using Catel.Configuration; using Catel.MVVM; using Orchestra; diff --git a/src/LogViewer/ViewModels/WindowCommandsViewModel.cs b/src/LogViewer/ViewModels/WindowCommandsViewModel.cs index d75ae68b..2fa2c644 100644 --- a/src/LogViewer/ViewModels/WindowCommandsViewModel.cs +++ b/src/LogViewer/ViewModels/WindowCommandsViewModel.cs @@ -3,7 +3,6 @@ using System; using System.Linq; using System.Threading.Tasks; - using Catel; using Catel.Configuration; using Catel.MVVM; using Orc.Theming; diff --git a/src/LogViewer/WorkspaceManagement/Initializers/WorkspaceInitializer.cs b/src/LogViewer/WorkspaceManagement/Initializers/WorkspaceInitializer.cs index 680ada56..25afa1e3 100644 --- a/src/LogViewer/WorkspaceManagement/Initializers/WorkspaceInitializer.cs +++ b/src/LogViewer/WorkspaceManagement/Initializers/WorkspaceInitializer.cs @@ -2,7 +2,6 @@ { using System; using System.Threading.Tasks; - using Catel; using Catel.IoC; using Orc.WorkspaceManagement; diff --git a/src/LogViewer/WorkspaceManagement/Providers/FilterWorkspaceProvider.cs b/src/LogViewer/WorkspaceManagement/Providers/FilterWorkspaceProvider.cs index 19bbb3e6..67d37080 100644 --- a/src/LogViewer/WorkspaceManagement/Providers/FilterWorkspaceProvider.cs +++ b/src/LogViewer/WorkspaceManagement/Providers/FilterWorkspaceProvider.cs @@ -2,7 +2,6 @@ { using System; using System.Threading.Tasks; - using Catel; using Catel.IoC; using Orc.WorkspaceManagement; using Services; diff --git a/src/SolutionAssemblyInfo.cs b/src/SolutionAssemblyInfo.cs index 9c365efa6e73c8a802de31b55b50f98ab3045481..c6fcbf7273953a7171d02e95593c3a967718d0e7 100644 GIT binary patch delta 12 Tcmca7vPNWs8}sH0=4WgGA#w!9 delta 30 lcmZ1@a!+J~8}no#W;xzshJ1!nh9ZV!hE#^)&GyW1*#L(d2x|ZU