null warnings fixed

build-all.ps1

@@ -81,7 +81,7 @@ dotnet publish "$PSScriptRoot\src\$Project\$Project.csproj" `
 	   --nologo
 
 # Archiv Build
-Compress-Archive -Path "$BuildPathLinuxX64\$Project" -DestinationPath $ArchiveLinuxX64
-Compress-Archive -Path "$BuildPathLinuxARM64\$Project" -DestinationPath $ArchiveLinuxARM64
-Compress-Archive -Path "$BuildPathWindowsX64\$Project.exe" -DestinationPath $ArchiveWindowsX64
-Compress-Archive -Path "$BuildPathWindowsARM64\$Project.exe" -DestinationPath $ArchiveWindowsARM64
+Compress-Archive -Path "$BuildPathLinuxX64\File-Content-Search" -DestinationPath $ArchiveLinuxX64
+Compress-Archive -Path "$BuildPathLinuxARM64\File-Content-Search" -DestinationPath $ArchiveLinuxARM64
+Compress-Archive -Path "$BuildPathWindowsX64\File-Content-Search.exe" -DestinationPath $ArchiveWindowsX64
+Compress-Archive -Path "$BuildPathWindowsARM64\File-Content-Search.exe" -DestinationPath $ArchiveWindowsARM64

src/.editorconfig

@@ -88,14 +88,14 @@ csharp_style_throw_expression = true:warning
 csharp_style_conditional_delegate_call = true:warning
 # Modifier preferences
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-# Expression-level preferences
-csharp_prefer_braces = true:suggestion
+csharp_prefer_braces = when_multiline
 csharp_style_deconstructed_variable_declaration = true:warning
 csharp_prefer_simple_default_expression = true:warning
 csharp_style_pattern_local_over_anonymous_function = true:warning
 csharp_style_inlined_variable_declaration = true:warning
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_prefer_primary_constructors = false:silent
 csharp_style_prefer_null_check_over_type_check = true:suggestion
 csharp_style_prefer_local_over_anonymous_function = true:suggestion
 csharp_style_prefer_index_operator = true:suggestion

src/ContentSearch/AppState.cs

@@ -5,7 +5,7 @@
 
     public class AppState : IDisposable
     {
-        private CancellationTokenSource cancellationTokenSource;
+        private CancellationTokenSource? cancellationTokenSource;
         private State currentState;
         private bool isDisposed;
 
@@ -14,7 +14,7 @@ public AppState()
             this.CurrentState = State.Idle;
         }
 
-        public event EventHandler<State> CurrentStateChanged;
+        public event EventHandler<State>? CurrentStateChanged;
 
         public enum State
         {
@@ -71,7 +71,7 @@ protected virtual void Dispose(bool disposing)
 
             if (disposing)
             {
-                this.cancellationTokenSource.Dispose();
+                this.cancellationTokenSource?.Dispose();
             }
 
             this.isDisposed = true;

src/ContentSearch/ContentSearch.csproj

@@ -3,6 +3,7 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <ApplicationIcon>Assets/App.ico</ApplicationIcon>
+        <AssemblyName>File-Content-Search</AssemblyName>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>

src/ContentSearch/Settings/GeneralSettings.cs

@@ -3,9 +3,5 @@
     public class GeneralSettings
     {
         public int Property1 { get; set; }
-
-        public string Property2 { get; set; }
-
-        public bool Property4 { get; set; }
     }
 }

src/ContentSearch/ViewModels/AppStateViewModel.cs

@@ -12,7 +12,7 @@ public class AppStateViewModel : ViewModelBase
         private SolidColorBrush commandTextColor = new SolidColorBrush(Colors.Green);
 
         private int searchProgressValue;
-        private string fileCountStatus;
+        private string fileCountStatus = string.Empty;
         private bool isBusy;
         private double progress;
 
@@ -64,7 +64,7 @@ public void IncrementProgress(int fileCount)
             this.Progress = (double)this.searchProgressValue++ / fileCount;
         }
 
-        private void ApplicationStateOnCurrentStateChanged(object sender, AppState.State state)
+        private void ApplicationStateOnCurrentStateChanged(object? sender, AppState.State state)
         {
             switch (state)
             {

src/ContentSearch/ViewModels/MainViewModel.cs

@@ -98,11 +98,14 @@ private async Task OpenFolderPicker()
 
     private void OpenCurrentDirectory()
     {
-        var directoryInfo = new DirectoryInfo(this.SearchSettings.SearchPath);
-
-        if (directoryInfo.Exists)
+        if (this.SearchSettings.SearchPath != null)
         {
-            Process.Start("explorer", directoryInfo.FullName);
+            var directoryInfo = new DirectoryInfo(this.SearchSettings.SearchPath);
+
+            if (directoryInfo.Exists)
+            {
+                Process.Start("explorer", directoryInfo.FullName);
+            }
         }
     }
 
@@ -254,7 +257,7 @@ private HashSet<string> GetExcludedSubdirectoryNames()
         return excludedSubdirectoryNames;
     }
 
-    private void AddFileContentSearchResults(FileContentSearchResult searchTextResult, int fileCount)
+    private void AddFileContentSearchResults(FileContentSearchResult? searchTextResult, int fileCount)
     {
         if (searchTextResult != null)
         {

src/ContentSearch/ViewModels/RelayCommand.cs

@@ -7,7 +7,7 @@ public class RelayCommand : ICommand
     {
         private readonly Action execute;
 
-        private readonly Func<bool> canExecute;
+        private readonly Func<bool>? canExecute;
 
         public event EventHandler? CanExecuteChanged;
 
@@ -16,41 +16,41 @@ public RelayCommand(Action execute)
         {
         }
 
-        public RelayCommand(Action execute, Func<bool> canExecute)
+        public RelayCommand(Action execute, Func<bool>? canExecute)
         {
             this.execute = execute ?? throw new ArgumentNullException(nameof(execute));
             this.canExecute = canExecute;
         }
 
-        public bool CanExecute(object parameter) => this.canExecute == null || this.canExecute();
+        public bool CanExecute(object? parameter) => this.canExecute == null || this.canExecute();
 
-        public void Execute(object parameter) => this.execute();
+        public void Execute(object? parameter) => this.execute();
 
         public void RaiseCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
     }
 
     public class RelayCommand<T> : ICommand
     {
-        private readonly Action<T> execute;
+        private readonly Action<T?> execute;
 
-        private readonly Func<T, bool> canExecute;
+        private readonly Func<T?, bool>? canExecute;
 
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler? CanExecuteChanged;
 
-        public RelayCommand(Action<T> execute)
+        public RelayCommand(Action<T?> execute)
             : this(execute, null)
-        {
+        {   
         }
 
-        public RelayCommand(Action<T> execute, Func<T, bool> canExecute)
+        public RelayCommand(Action<T?> execute, Func<T?, bool>? canExecute)
         {
             this.execute = execute ?? throw new ArgumentNullException(nameof(execute));
             this.canExecute = canExecute;
         }
 
-        public bool CanExecute(object parameter) => this.canExecute == null || this.canExecute((T)parameter);
+        public bool CanExecute(object? parameter) => this.canExecute == null || this.canExecute(parameter is null ? default : (T)parameter);
 
-        public void Execute(object parameter) => this.execute((T)parameter);
+        public void Execute(object? parameter) => this.execute(parameter is null ? default : (T)parameter);
 
         public void RaiseCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
     }

src/ContentSearch/ViewModels/SearchParameterViewModel.cs

@@ -7,7 +7,7 @@ public class SearchParameterViewModel : ViewModelBase
     {
         private readonly SearchSettings searchSettings;
 
-        public string SearchPath
+        public string? SearchPath
         {
             get => this.searchSettings.SearchPath;
             set
@@ -19,7 +19,7 @@ public string SearchPath
             }
         }
 
-        public string SearchText1
+        public string? SearchText1
         {
             get => this.searchSettings.SearchText1;
             set
@@ -31,7 +31,7 @@ public string SearchText1
             }
         }
 
-        public string SearchText2
+        public string? SearchText2
         {
             get => this.searchSettings.SearchText2;
             set
@@ -43,7 +43,7 @@ public string SearchText2
             }
         }
 
-        public string FileExtensions
+        public string? FileExtensions
         {
             get => this.searchSettings.FileExtensions;
             set
@@ -55,7 +55,7 @@ public string FileExtensions
             }
         }
 
-        public string ExcludedSubdirectoryName1
+        public string? ExcludedSubdirectoryName1
         {
             get => this.searchSettings.ExcludedSubdirectoryName1;
             set
@@ -67,7 +67,7 @@ public string ExcludedSubdirectoryName1
             }
         }
 
-        public string ExcludedSubdirectoryName2
+        public string? ExcludedSubdirectoryName2
         {
             get => this.searchSettings.ExcludedSubdirectoryName2;
             set

src/ContentSearch/Views/Converter/IntPercentageToDoubleConverter.cs

@@ -7,7 +7,7 @@
     // Convert an integer percentage (0 to 100) to a double between (0.0d and 1.0d)
     public class IntPercentageToDoubleConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             var res = 0.0d;
             if (value is int intVal)
@@ -27,7 +27,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return res;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             return null;
         }

src/ContentSearch/Views/Converter/InverseBooleanConverter.cs

@@ -6,14 +6,14 @@
 
     public class InverseBooleanConverter : IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            return !(bool)value;
+            return value is bool inputValue ? !inputValue : true;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            return !(bool)value;
+            return value is bool inputValue ? !inputValue : true;
         }
     }
 }

src/ContentSearch/Views/Converter/ToggleButtonConverter.cs

@@ -9,7 +9,7 @@ public class ToggleButtonConverter : IValueConverter
         public required string TrueValue { get; set; }
         public required string FalseValue { get; set; }
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             if (value is bool isChecked && isChecked)
             {
@@ -18,7 +18,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             return this.FalseValue;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }

src/Services/FileContentSearchOptions.cs

@@ -11,15 +11,15 @@ public class FileContentSearchOptions
 
         public FileContentSearchOptions(ILocalizationService localizationService,
             IMessageBoxService messageBoxService,
-            string searchPath,
+            string? searchPath,
             ICollection<string> searchTags,
             bool checkUpperLowerCase,
             bool checkAllFiles,
-            string fileExtensions,
+            string? fileExtensions,
             bool excludSubdirectoryNames,
             ICollection<string> excludedSubdirectoryNames)
         {
-            this.SearchPath = searchPath.Trim();
+            this.SearchPath = searchPath == null ? string.Empty : searchPath.Trim();
             this.SearchTags = searchTags;
             this.localizationService = localizationService;
             this.messageBoxService = messageBoxService;

src/Services/FileContentSearchService.cs

@@ -118,7 +118,7 @@ private void SearchText(string searchFile, int fileCount, FileContentSearchOptio
 
                 using (var streamReader = new StreamReader(fileInfo.FullName, encoding))
                 {
-                    string line;
+                    string? line;
                     while ((line = streamReader.ReadLine()) != null && !cancellationToken.IsCancellationRequested)
                     {
                         foreach (var searchTag in searchTags)

src/Services/FileSearchCacheService.cs

@@ -7,10 +7,15 @@
 
     public class FileSearchCacheService
     {
-        private FileContentSearchOptions cachedOptions;
+        private FileContentSearchOptions? cachedOptions;
 
         public ReadOnlyCollection<string> Files { get; private set; }
 
+        public FileSearchCacheService()
+        {
+            this.Files = new ReadOnlyCollection<string>([]);
+        }
+
         public void SetCache(List<string> filesCorrespondingToTheOptions, FileContentSearchOptions options)
         {
             this.Files = new ReadOnlyCollection<string>(filesCorrespondingToTheOptions);

src/Services/FileSearchService.cs

@@ -31,7 +31,7 @@ public async Task<List<string>> LoadFilesForSearch(FileContentSearchOptions opti
                                 },
                                 token).ConfigureAwait(false);
 
-            if (token.IsCancellationRequested) { return null; }
+            if (token.IsCancellationRequested) { return []; }
 
             this.NotifyFileCountChangedAction(files.Count);
 

src/Services/FileTypeBasedTextExtraction/DocxToTextService.cs

@@ -45,7 +45,7 @@ private string GetTextFromDocX(string filePath)
 
                 var xmlNamespaceManager = new XmlNamespaceManager(xmlDocument.NameTable);
                 xmlNamespaceManager.AddNamespace("w", WordprocessingMlNamespace);
-                var xmlNode = xmlDocument.DocumentElement.SelectSingleNode(BodyXPath, xmlNamespaceManager);
+                var xmlNode = xmlDocument.DocumentElement?.SelectSingleNode(BodyXPath, xmlNamespaceManager);
 
                 stringBuilder.Append(this.ReadTextFromNodeRecursive(xmlNode));
             }
@@ -57,7 +57,7 @@ private string GetTextFromDocX(string filePath)
             return stringBuilder.ToString();
         }
 
-        private string ReadTextFromNodeRecursive(XmlNode xmlNode)
+        private string ReadTextFromNodeRecursive(XmlNode? xmlNode)
         {
             if (xmlNode == null || xmlNode.NodeType != XmlNodeType.Element)
             {

src/Services/Services.csproj

@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">