Maintenance

WildGums · Dec 11, 2023 · 72f58ba · 72f58ba
1 parent a9616b1
commit 72f58ba
Show file tree

Hide file tree

Showing 34 changed files with 14 additions and 56 deletions.
diff --git a/src/LogViewer.Tests/LogViewer.Tests.csproj b/src/LogViewer.Tests/LogViewer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <AssemblyName>LogViewer.Tests</AssemblyName>
     <RootNamespace>LogViewer.Tests</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
@@ -33,10 +33,6 @@
     <PackageReference Include="PublicApiGenerator" Version="11.0.0" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="NETStandard.Library" Version="2.0.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\LogViewer\LogViewer.csproj" />
   </ItemGroup>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
         }
     }
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows</TargetFrameworks>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <SelfContained>true</SelfContained>
@@ -54,10 +54,6 @@
     <PackageReference Include="Rx-WPF" Version="2.2.5" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="NETStandard.Library" Version="2.0.3" />
-  </ItemGroup>
-
   <Import Project="$(MSBuildProjectDirectory)\..\Directory.build.shared.explicit.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.build.shared.explicit.props')" />
   <Import Project="$(MSBuildProjectDirectory)\..\Directory.build.shared.mat.props" Condition="Exists('$(MSBuildProjectDirectory)\..\Directory.build.shared.mat.props')" />
 </Project>
diff --git 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
@@ -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
@@ -1,7 +1,5 @@
 using Catel.IoC;
-using LogViewer;
 using LogViewer.Services;
-using LogViewer.Models;
 using Orchestra.Services;
 
 /// <summary>

diff --git 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
@@ -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
@@ -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<LogRecord> LoadRecordsFromFile(FileNode fileNode)
         {
             ArgumentNullException.ThrowIfNull(fileNode);
 
-            FileStream stream;
+            Stream stream;
 
             Log.Debug("Loading records file file '{0}'", fileNode);
 
@@ -60,7 +58,8 @@ public IEnumerable<LogRecord> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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