Fixes

src/FlaUInspect/App.xaml.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Windows;
+using FlaUI.Core;
 using FlaUInspect.Core.Logger;
 using FlaUInspect.ViewModels;
 using FlaUInspect.Views;
@@ -8,30 +9,22 @@ namespace FlaUInspect;
 
 public partial class App {
     private void ApplicationStart(object sender, StartupEventArgs e) {
-        AssemblyInformationalVersionAttribute? versionAttribute = Assembly.GetEntryAssembly()?.GetCustomAttribute(typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
-
+        AssemblyFileVersionAttribute? versionAttribute = Assembly.GetEntryAssembly()?.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
+        string applicationVersion = versionAttribute?.Version ?? "N/A";
         InternalLogger logger = new ();
 
 #if AUTOMATION_UIA3
-        MainViewModel mainViewModel = new (AutomationType.UIA3, logger);
+        MainViewModel mainViewModel = new (AutomationType.UIA3, applicationVersion, logger);
         MainWindow mainWindow = new () { DataContext = mainViewModel };
 
-        if (versionAttribute != null) {
-            mainWindow.Title += " version" + versionAttribute.InformationalVersion;
-        }
-
         //Re-enable normal shutdown mode.
         Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
         Current.MainWindow = mainWindow;
         mainWindow.Show();
 #elif AUTOMATION_UIA2
-        MainViewModel mainViewModel = new (AutomationType.UIA2, logger);
+        MainViewModel mainViewModel = new (AutomationType.UIA2, applicationVersion, logger);
         MainWindow mainWindow = new() { DataContext = mainViewModel };
-
-        if (versionAttribute != null) {
-            mainWindow.Title += " version" + versionAttribute.InformationalVersion;
-        }
-
+
         //Re-enable normal shutdown mode.
         Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
         Current.MainWindow = mainWindow;
@@ -41,12 +34,9 @@ private void ApplicationStart(object sender, StartupEventArgs e) {
         ChooseVersionWindow dialog = new ();
 
         if (dialog.ShowDialog() == true) {
-            MainViewModel mainViewModel = new (dialog.SelectedAutomationType, logger);
-            MainWindow mainWindow = new() { DataContext = mainViewModel };
 
-            if (versionAttribute != null) {
-                mainWindow.Title += " version" + versionAttribute.InformationalVersion;
-            }
+            MainViewModel mainViewModel = new (dialog.SelectedAutomationType, applicationVersion, logger);
+            MainWindow mainWindow = new () { DataContext = mainViewModel };
 
             //Re-enable normal shutdown mode.
             Current.ShutdownMode = ShutdownMode.OnMainWindowClose;

src/FlaUInspect/Core/Converters/CountToVisibilityConverter.cs

@@ -4,7 +4,7 @@
 
 namespace FlaUInspect.Core.Converters;
 
-public class CountToVisibilityConverter  : IValueConverter {
+public class CountToVisibilityConverter : IValueConverter {
     public Visibility ZeroCountVisibility { get; set; } = Visibility.Collapsed;
     public Visibility MultipleCountVisibility { get; set; } = Visibility.Visible;
 

src/FlaUInspect/Core/ElementHighlighter.cs

@@ -6,12 +6,11 @@
 namespace FlaUInspect.Core;
 
 public static class ElementHighlighter {
-    public static void HighlightElement(AutomationElement? automationElement, ILogger logger) {
+    public static void HighlightElement(AutomationElement? automationElement, ILogger? logger) {
         try {
             Task.Run(() => automationElement?.DrawHighlight(false, Color.Red, TimeSpan.FromSeconds(1)));
-        }
-        catch (PropertyNotSupportedException ex) {
-            logger.LogError($"Exception: {ex.Message}");
+        } catch (PropertyNotSupportedException ex) {
+            logger?.LogError($"Exception: {ex.Message}");
         }
     }
 }

src/FlaUInspect/Core/Extensions/AutomationPropertyExtensions.cs

@@ -7,8 +7,7 @@ public static class AutomationPropertyExtensions {
         try {
             bool success = automationProperty.TryGetValue(out T? value);
             return success ? value == null ? string.Empty : value.ToString() : "Not Supported";
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
             return $"Exception getting value ({ex.HResult})";
         }
     }

src/FlaUInspect/Core/Extensions/TaskExtensions.cs

@@ -11,8 +11,7 @@ public static async Task<T> WaitAsync<T>(this Task<T> task, TimeSpan period, T d
                 return result;
             }
             return defaultValue;
-        }
-        catch (Exception) {
+        } catch (Exception) {
             return defaultValue;
         }
     }

src/FlaUInspect/Core/HoverMode.cs

@@ -11,10 +11,10 @@ namespace FlaUInspect.Core;
 public class HoverMode {
     private readonly AutomationBase? _automation;
     private readonly DispatcherTimer _dispatcherTimer;
-    private readonly ILogger _logger;
+    private readonly ILogger? _logger;
     private AutomationElement? _currentHoveredElement;
 
-    public HoverMode(AutomationBase? automation, ILogger logger) {
+    public HoverMode(AutomationBase? automation, ILogger? logger) {
         _automation = automation;
         _logger = logger;
         _dispatcherTimer = new DispatcherTimer();
@@ -50,16 +50,13 @@ private void DispatcherTimerTick(object? sender, EventArgs e) {
                 if (!Equals(_currentHoveredElement, hoveredElement)) {
                     _currentHoveredElement = hoveredElement;
                     ElementHovered?.Invoke(hoveredElement);
-                }
-                else {
+                } else {
                     ElementHighlighter.HighlightElement(hoveredElement, _logger);
                 }
-            }
-            catch (UnauthorizedAccessException) {
-                _logger.LogError("You are accessing a protected UI element in hover mode.\nTry to start FlaUInspect as administrator.");
-            }
-            catch (Exception ex) {
-                _logger.LogError($"Exception: {ex.Message}");
+            } catch (UnauthorizedAccessException) {
+                _logger?.LogError("You are accessing a protected UI element in hover mode.\nTry to start FlaUInspect as administrator.");
+            } catch (Exception ex) {
+                _logger?.LogError($"Exception: {ex.Message}");
             }
         }
     }

src/FlaUInspect/Core/Logger/LoggerExtensions.cs

@@ -35,11 +35,11 @@ public static void LogTrace(this ILogger logger, string? message, params object?
         }
 
         List<string> paramsName = Regex.Matches(formattedMessage, @"(\{\w+\})")
-                                        .Cast<Match>()
-                                        .Select(x => x.Groups[1].Value)
-                                        .Where(x => !string.IsNullOrEmpty(x))
-                                        .Select(x=>x!)
-                                        .ToList();
+                                       .Cast<Match>()
+                                       .Select(x => x.Groups[1].Value)
+                                       .Where(x => !string.IsNullOrEmpty(x))
+                                       .Select(x => x!)
+                                       .ToList();
 
         for (var i = 0; i < paramsName.Count; i++) {
             if (i < args.Length) {

src/FlaUInspect/Core/PatternItemsFactory.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using FlaUI.Core;
 using FlaUI.Core.AutomationElements;
@@ -29,8 +28,7 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
     public const string Details = "Details";
     public const string PatternSupport = "Pattern Support";
 
-    private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia2Func =
-    [
+    private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia2Func = [
         new (GridItemPattern.Pattern, AddGridItemPatternDetails),
         new (GridPattern.Pattern, AddGridPatternPatternDetails),
         new (RangeValuePattern.Pattern, AddRangeValuePatternDetails),
@@ -46,8 +44,7 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
         new (InvokePattern.Pattern, AddInvokePatternDetails)
     ];
 
-    private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia3Func =
-    [
+    private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia3Func = [
         new (FlaUI.UIA3.Patterns.GridItemPattern.Pattern, AddGridItemPatternDetails),
         new (FlaUI.UIA3.Patterns.GridPattern.Pattern, AddGridPatternPatternDetails),
         new (LegacyIAccessiblePattern.Pattern, AddLegacyIAccessiblePatternDetails),
@@ -61,12 +58,11 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
         new (FlaUI.UIA3.Patterns.TogglePattern.Pattern, AddTogglePatternDetails),
         new (FlaUI.UIA3.Patterns.ValuePattern.Pattern, AddValuePatternDetails),
         new (FlaUI.UIA3.Patterns.WindowPattern.Pattern, AddWindowPatternDetails),
-        new (FlaUI.UIA3.Patterns.InvokePattern.Pattern, AddInvokePatternDetails)
+        new (InvokePattern.Pattern, AddInvokePatternDetails)
     ];
 
     public IDictionary<string, PatternItem[]> CreatePatternItemsForElement(AutomationElement element, HashSet<PatternId> allSupportedPatterns) {
-        Dictionary<string, PatternItem[]> patternItems = new()
-        {
+        Dictionary<string, PatternItem[]> patternItems = new () {
             { Identification, AddIdentificationDetails(element).ToArray() },
             { Details, AddDetailsDetails(element).ToArray() },
             { PatternSupport, AddPatternSupportDetails(element).ToArray() }
@@ -76,7 +72,7 @@ public IDictionary<string, PatternItem[]> CreatePatternItemsForElement(Automatio
             automationBase is UIA3Automation ? _patternsUia3Func : _patternsUia2Func;
 
         foreach ((PatternId key, Func<AutomationElement, IEnumerable<PatternItem>> value) in patternsFactory.Where(kvp => allSupportedPatterns.Contains(kvp.Key))) {
-            patternItems.Add(key.Name, (value.Invoke(element)).ToArray());
+            patternItems.Add(key.Name, value.Invoke(element).ToArray());
         }
 
         return patternItems;

src/FlaUInspect/Core/RelayCommand.cs

@@ -14,7 +14,7 @@ public bool CanExecute(object? parameter) {
         if (parameter == null) {
             return true;
         }
-        return (canExecuteEvaluator == null || canExecuteEvaluator.Invoke(parameter));
+        return canExecuteEvaluator == null || canExecuteEvaluator.Invoke(parameter);
     }
 
     public event EventHandler? CanExecuteChanged {

src/FlaUInspect/FlaUInspect.csproj

@@ -20,60 +20,60 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-      <OutputPath>bin\Debug\</OutputPath>
-      <AssemblyName>FlaUInspect</AssemblyName>
+        <OutputPath>bin\Debug\</OutputPath>
+        <AssemblyName>FlaUInspect</AssemblyName>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'UIA2' ">
-      <DefineConstants>TRACE;AUTOMATION_UIA2</DefineConstants>
-      <OutputPath>bin\UIA2\</OutputPath>
-      <AssemblyName>FlaUInspect.UIA2</AssemblyName>
+        <DefineConstants>TRACE;AUTOMATION_UIA2</DefineConstants>
+        <OutputPath>bin\UIA2\</OutputPath>
+        <AssemblyName>FlaUInspect.UIA2</AssemblyName>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'UIA3' ">
-      <DefineConstants>TRACE;AUTOMATION_UIA3</DefineConstants>
-      <OutputPath>bin\UIA3\</OutputPath>
-      <AssemblyName>FlaUInspect.UIA3</AssemblyName>
+        <DefineConstants>TRACE;AUTOMATION_UIA3</DefineConstants>
+        <OutputPath>bin\UIA3\</OutputPath>
+        <AssemblyName>FlaUInspect.UIA3</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FlaUI.Core" Version="5.0.0" />
-        <PackageReference Include="FlaUI.UIA2" Version="5.0.0" />
-        <PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
+        <PackageReference Include="FlaUI.Core" Version="5.0.0"/>
+        <PackageReference Include="FlaUI.UIA2" Version="5.0.0"/>
+        <PackageReference Include="FlaUI.UIA3" Version="5.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-      <Page Update="Resources\Icons.xaml">
-        <Generator>MSBuild:Compile</Generator>
-        <XamlRuntime>Wpf</XamlRuntime>
-        <SubType>Designer</SubType>
-      </Page>
-      <Page Update="Resources\RibbonIcons.xaml">
-        <Generator>MSBuild:Compile</Generator>
-        <XamlRuntime>Wpf</XamlRuntime>
-        <SubType>Designer</SubType>
-      </Page>
-      <Page Update="Resources\DetailsIcons.xaml">
-        <Generator>MSBuild:Compile</Generator>
-        <XamlRuntime>Wpf</XamlRuntime>
-        <SubType>Designer</SubType>
-      </Page>
-      <Page Update="Resources\ChooseVersionIcons.xaml">
-        <Generator>MSBuild:Compile</Generator>
-        <XamlRuntime>Wpf</XamlRuntime>
-        <SubType>Designer</SubType>
-      </Page>
+        <Page Update="Resources\Icons.xaml">
+            <Generator>MSBuild:Compile</Generator>
+            <XamlRuntime>Wpf</XamlRuntime>
+            <SubType>Designer</SubType>
+        </Page>
+        <Page Update="Resources\RibbonIcons.xaml">
+            <Generator>MSBuild:Compile</Generator>
+            <XamlRuntime>Wpf</XamlRuntime>
+            <SubType>Designer</SubType>
+        </Page>
+        <Page Update="Resources\DetailsIcons.xaml">
+            <Generator>MSBuild:Compile</Generator>
+            <XamlRuntime>Wpf</XamlRuntime>
+            <SubType>Designer</SubType>
+        </Page>
+        <Page Update="Resources\ChooseVersionIcons.xaml">
+            <Generator>MSBuild:Compile</Generator>
+            <XamlRuntime>Wpf</XamlRuntime>
+            <SubType>Designer</SubType>
+        </Page>
     </ItemGroup>
 
     <ItemGroup>
-      <None Update="FlaUInspect.png">
-        <Pack>True</Pack>
-        <PackagePath></PackagePath>
-      </None>
+        <None Update="FlaUInspect.png">
+            <Pack>True</Pack>
+            <PackagePath></PackagePath>
+        </None>
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="LICENSE" />
+        <None Remove="LICENSE"/>
     </ItemGroup>
 
 </Project>