From f38d2a6cb0e0531620556380a85e919c2e3f83de Mon Sep 17 00:00:00 2001
From: "Gergely Z. Toth" <gwergilius@gmail.com>
Date: Mon, 24 Jan 2022 05:12:54 +0100
Subject: [PATCH 1/2] Target Framework is updated to .Net Framework 4.8

---
 src/FlaUInspect/App.config                 | 2 +-
 src/FlaUInspect/FlaUInspect.csproj         | 2 +-
 src/FlaUInspect/Properties/AssemblyInfo.cs | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/FlaUInspect/App.config b/src/FlaUInspect/App.config
index 8bde09a..fc51563 100644
--- a/src/FlaUInspect/App.config
+++ b/src/FlaUInspect/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/src/FlaUInspect/FlaUInspect.csproj b/src/FlaUInspect/FlaUInspect.csproj
index 26a4194..55c20df 100644
--- a/src/FlaUInspect/FlaUInspect.csproj
+++ b/src/FlaUInspect/FlaUInspect.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FlaUInspect</RootNamespace>
     <AssemblyName>FlaUInspect</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/src/FlaUInspect/Properties/AssemblyInfo.cs b/src/FlaUInspect/Properties/AssemblyInfo.cs
index 0585bd0..5973cc6 100644
--- a/src/FlaUInspect/Properties/AssemblyInfo.cs
+++ b/src/FlaUInspect/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Roemer")]
 [assembly: AssemblyProduct("FlaUInspect")]
-[assembly: AssemblyCopyright("Copyright © 2016-2017")]
+[assembly: AssemblyCopyright("Copyright © 2016-2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -22,6 +22,6 @@
     // app, or any theme specific resource dictionaries)
     )]
 
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
-[assembly: AssemblyInformationalVersion("1.3.0")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: AssemblyInformationalVersion("1.4.0")]

From d074d5ef16685490b2a5f61af2de761ab2481b27 Mon Sep 17 00:00:00 2001
From: "Gergely Z. Toth" <gwergilius@gmail.com>
Date: Mon, 24 Jan 2022 06:12:50 +0100
Subject: [PATCH 2/2] AutomationType (Version) can also be configured by
 appsettings.json file

---
 README.md                                   |  2 ++
 src/FlaUInspect/App.xaml.cs                 | 28 ++++++++++++++--
 src/FlaUInspect/FlaUInspect.csproj          | 36 +++++++++------------
 src/FlaUInspect/Settings/FlaUInspect.cs     |  9 ++++++
 src/FlaUInspect/ViewModels/MainViewModel.cs |  8 ++++-
 src/FlaUInspect/Views/MainWindow.xaml.cs    | 19 +++++++----
 src/FlaUInspect/appsettings.json            |  5 +++
 7 files changed, 77 insertions(+), 30 deletions(-)
 create mode 100644 src/FlaUInspect/Settings/FlaUInspect.cs
 create mode 100644 src/FlaUInspect/appsettings.json

diff --git a/README.md b/README.md
index a8fbee9..6949136 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ On startup, you can choose if you want to use UIA2 or UIA3 (see [FAQ](https://gi
 ###### Choose Version Dialog
 ![Choose Version](https://raw.githubusercontent.com/wiki/FlauTech/FlaUInspect/images/choose_version.png)
 
+Version could also specified in appsettings.json file. If you do this, the application will start silently, i.e. 'Choose Version Dialog' will not pop up
+
 ###### Main Screen
 ![Main Screen](https://raw.githubusercontent.com/wiki/FlauTech/FlaUInspect/images/main_screen.png)
 
diff --git a/src/FlaUInspect/App.xaml.cs b/src/FlaUInspect/App.xaml.cs
index 9f569c1..a5bc151 100644
--- a/src/FlaUInspect/App.xaml.cs
+++ b/src/FlaUInspect/App.xaml.cs
@@ -1,9 +1,33 @@
-namespace FlaUInspect
+using Microsoft.Extensions.Configuration;
+using System;
+using System.IO;
+using System.Windows;
+
+namespace FlaUInspect
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App
+    public partial class App : Application
     {
+        private static Lazy<Settings.FlaUInspect> configuration = new Lazy<Settings.FlaUInspect>(ReadConfiguration);
+
+        public static new App Current => (App)Application.Current;
+
+        public Settings.FlaUInspect Configuration => configuration.Value;
+
+        private static Settings.FlaUInspect ReadConfiguration()
+        {
+            IConfigurationRoot configuration = new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
+                .Build();
+
+            // Read the configuration settings
+            var setting = new Settings.FlaUInspect();
+            configuration.Bind(nameof(Settings.FlaUInspect), setting);
+
+            return setting;
+        }
     }
 }
diff --git a/src/FlaUInspect/FlaUInspect.csproj b/src/FlaUInspect/FlaUInspect.csproj
index 55c20df..414a73a 100644
--- a/src/FlaUInspect/FlaUInspect.csproj
+++ b/src/FlaUInspect/FlaUInspect.csproj
@@ -64,6 +64,12 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FlaUI.UIA2" Version="3.2.0" />
+    <PackageReference Include="FlaUI.UIA3" Version="3.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -76,6 +82,7 @@
     <Compile Include="Core\HoverMode.cs" />
     <Compile Include="Core\ObservableObject.cs" />
     <Compile Include="Core\RelayCommand.cs" />
+    <Compile Include="Settings\FlaUInspect.cs" />
     <Compile Include="Models\Element.cs" />
     <Compile Include="ViewModels\DetailGroupViewModel.cs" />
     <Compile Include="ViewModels\DetailViewModel.cs" />
@@ -126,6 +133,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Button.png" />
@@ -143,7 +153,12 @@
     <Resource Include="Resources\Window.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\Calendar.png" />
+    <Resource Include="Resources\Custom.png" />
     <Resource Include="Resources\DataGrid.png" />
+    <Resource Include="Resources\Document.png" />
+    <Resource Include="Resources\Header.png" />
+    <Resource Include="Resources\HeaderItem.png" />
     <Resource Include="Resources\HyperLink.png" />
     <Resource Include="Resources\Item.png" />
     <Resource Include="Resources\List.png" />
@@ -159,30 +174,9 @@
     <Resource Include="Resources\ToolBar.png" />
     <Resource Include="Resources\ToolTip.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Header.png" />
-    <Resource Include="Resources\HeaderItem.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Custom.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Document.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Inspect.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Calendar.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="FlaUI.UIA2">
-      <Version>3.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="FlaUI.UIA3">
-      <Version>3.2.0</Version>
-    </PackageReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/FlaUInspect/Settings/FlaUInspect.cs b/src/FlaUInspect/Settings/FlaUInspect.cs
new file mode 100644
index 0000000..6653161
--- /dev/null
+++ b/src/FlaUInspect/Settings/FlaUInspect.cs
@@ -0,0 +1,9 @@
+using FlaUI.Core;
+
+namespace FlaUInspect.Settings
+{
+    public class FlaUInspect
+    {
+        public AutomationType? AutomationType { get; set; }
+    }
+}
diff --git a/src/FlaUInspect/ViewModels/MainViewModel.cs b/src/FlaUInspect/ViewModels/MainViewModel.cs
index 6334fd2..0f3cb28 100644
--- a/src/FlaUInspect/ViewModels/MainViewModel.cs
+++ b/src/FlaUInspect/ViewModels/MainViewModel.cs
@@ -112,12 +112,18 @@ public ElementViewModel SelectedItemInTree
             private set { SetProperty(value); }
         }
 
+        public void Initialize(Func<AutomationType> selectAutomationType)
+        {
+            var automationType = App.Current.Configuration.AutomationType ?? selectAutomationType();
+            Initialize(automationType);
+        }
+
         public void Initialize(AutomationType selectedAutomationType)
         {
             SelectedAutomationType = selectedAutomationType;
             IsInitialized = true;
 
-            _automation = selectedAutomationType == AutomationType.UIA2 ? (AutomationBase)new UIA2Automation() : new UIA3Automation();
+            _automation = SelectedAutomationType == AutomationType.UIA2 ? (AutomationBase)new UIA2Automation() : new UIA3Automation();
             _rootElement = _automation.GetDesktop();
             var desktopViewModel = new ElementViewModel(_rootElement);
             desktopViewModel.SelectionChanged += DesktopViewModel_SelectionChanged;
diff --git a/src/FlaUInspect/Views/MainWindow.xaml.cs b/src/FlaUInspect/Views/MainWindow.xaml.cs
index 7dabbd7..8deb198 100644
--- a/src/FlaUInspect/Views/MainWindow.xaml.cs
+++ b/src/FlaUInspect/Views/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
+using FlaUI.Core;
 using FlaUInspect.ViewModels;
 
 namespace FlaUInspect.Views
@@ -36,16 +37,22 @@ private void MainWindow_Loaded(object sender, System.EventArgs e)
         {
             if (!_vm.IsInitialized)
             {
-                var dlg = new ChooseVersionWindow { Owner = this };
-                if (dlg.ShowDialog() != true)
-                {
-                    Close();
-                }
-                _vm.Initialize(dlg.SelectedAutomationType);
+                _vm.Initialize(ChoseVersion);
                 Loaded -= MainWindow_Loaded;
             }
         }
 
+        private AutomationType ChoseVersion()
+        {
+            var dlg = new ChooseVersionWindow { Owner = this };
+            if (dlg.ShowDialog() != true)
+            {
+                Close();
+            }
+
+            return dlg.SelectedAutomationType;
+        }
+
         private void MenuItem_Click(object sender, RoutedEventArgs e)
         {
             Close();
diff --git a/src/FlaUInspect/appsettings.json b/src/FlaUInspect/appsettings.json
new file mode 100644
index 0000000..6a52bf1
--- /dev/null
+++ b/src/FlaUInspect/appsettings.json
@@ -0,0 +1,5 @@
+{
+  "FlaUInspect": {
+    "AutomationType": "UIA3"
+  }
+}