Merge pull request #1 from atc-net/feature/Improve-template-resolver

davidkallesen · web-flow · commit bf2c4c9bf8ad · 2023-07-06T23:53:39.000+02:00
Improve template resolver
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -41,7 +41,7 @@
   <ItemGroup Label="Code Analyzers">
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
     <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.62" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.63" PrivateAssets="All" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="All" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="9.4.0.72892" PrivateAssets="All" />
diff --git a/src/Atc.Installer.Wpf.App/App.xaml b/src/Atc.Installer.Wpf.App/App.xaml
@@ -8,15 +8,10 @@
         <ResourceDictionary>
 
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Styles/Controls.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Theming;component/Styles/Default.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Atc.Wpf.Controls;component/Styles/Controls.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
-            <Style TargetType="MenuItem">
-                <Setter Property="HorizontalContentAlignment" Value="Left" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-            </Style>
-
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/Atc.Installer.Wpf.App/AssemblyInfo.cs b/src/Atc.Installer.Wpf.App/AssemblyInfo.cs
@@ -5,9 +5,9 @@
 [assembly: AssemblyCompany("atc-net")]
 [assembly: AssemblyProduct("Atc.Installer")]
 [assembly: AssemblyTitle("Atc.Installer")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyInformationalVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyInformationalVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
 [assembly: System.Resources.NeutralResourcesLanguage("en")]
 [assembly: System.Runtime.Versioning.TargetPlatform("Windows7.0")]
 [assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows7.0")]
diff --git a/src/Atc.Installer.Wpf.App/Atc.Installer.Wpf.App.csproj b/src/Atc.Installer.Wpf.App/Atc.Installer.Wpf.App.csproj
@@ -40,10 +40,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.ElasticSearch/Atc.Installer.Wpf.ComponentProvider.ElasticSearch.csproj b/src/Atc.Installer.Wpf.ComponentProvider.ElasticSearch/Atc.Installer.Wpf.ComponentProvider.ElasticSearch.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.ElasticSearch/ElasticSearchServerComponentProviderViewModel_Commands.cs b/src/Atc.Installer.Wpf.ComponentProvider.ElasticSearch/ElasticSearchServerComponentProviderViewModel_Commands.cs
@@ -23,6 +23,8 @@ private async Task TestConnectionCommandHandler()
     {
         LogItems.Add(LogItemFactory.CreateTrace("Test connection"));
 
+        IsBusy = true;
+
         var (isSucceeded, errorMessage) = await esInstallerService
             .TestConnection(
                 ElasticSearchConnection.WebProtocol!,
@@ -33,6 +35,8 @@ private async Task TestConnectionCommandHandler()
                 ElasticSearchConnection.Index)
             .ConfigureAwait(true);
 
+        IsBusy = false;
+
         if (isSucceeded)
         {
             LogItems.Add(LogItemFactory.CreateInformation("Test connection succeeded"));
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer.csproj b/src/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.PostgreSql/Atc.Installer.Wpf.ComponentProvider.PostgreSql.csproj b/src/Atc.Installer.Wpf.ComponentProvider.PostgreSql/Atc.Installer.Wpf.ComponentProvider.PostgreSql.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.PostgreSql/PostgreSqlServerComponentProviderViewModel_Commands.cs b/src/Atc.Installer.Wpf.ComponentProvider.PostgreSql/PostgreSqlServerComponentProviderViewModel_Commands.cs
@@ -23,6 +23,8 @@ private async Task TestConnectionCommandHandler()
     {
         LogItems.Add(LogItemFactory.CreateTrace("Test connection"));
 
+        IsBusy = true;
+
         var (isSucceeded, errorMessage) = await pgInstallerService
             .TestConnection(
                 PostgreSqlConnection.HostName!,
@@ -32,6 +34,8 @@ private async Task TestConnectionCommandHandler()
                 PostgreSqlConnection.Password!)
             .ConfigureAwait(true);
 
+        IsBusy = false;
+
         if (isSucceeded)
         {
             LogItems.Add(LogItemFactory.CreateInformation("Test connection succeeded"));
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.WindowsApplication/Atc.Installer.Wpf.ComponentProvider.WindowsApplication.csproj b/src/Atc.Installer.Wpf.ComponentProvider.WindowsApplication/Atc.Installer.Wpf.ComponentProvider.WindowsApplication.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Installer.Wpf.ComponentProvider/Atc.Installer.Wpf.ComponentProvider.csproj b/src/Atc.Installer.Wpf.ComponentProvider/Atc.Installer.Wpf.ComponentProvider.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.326" />
-    <PackageReference Include="Atc.Wpf" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.178" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.178" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.195" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.195" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs b/src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs
@@ -228,6 +228,12 @@ public virtual bool TryGetStringFromApplicationSetting(
         string key,
         out string resultValue)
     {
+        if (TryGetStringFromApplicationSettings(key, out var value))
+        {
+            resultValue = value;
+            return true;
+        }
+
         resultValue = string.Empty;
         return false;
     }
@@ -401,11 +407,11 @@ protected string ResolveTemplateIfNeededByApplicationSettingsLookup(
                     var sa = key.Split('|', StringSplitOptions.RemoveEmptyEntries);
                     if (sa.Length == 2)
                     {
-                        var refComponentProvider = refComponentProviders.First(x => x.Name == sa[0]);
+                        var refComponentProvider = refComponentProviders.FirstOrDefault(x => x.Name.Equals(sa[0], StringComparison.OrdinalIgnoreCase));
                         if (refComponentProvider is not null &&
                             refComponentProvider.TryGetStringFromApplicationSetting(sa[1], out var resultValue))
                         {
-                            value = resultValue;
+                            value = value.ReplaceTemplateWithKey(key, resultValue);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,12 @@ public virtual bool TryGetStringFromApplicationSetting(`
`228`	`228`	`string key,`
`229`	`229`	`out string resultValue)`
`230`	`230`	`{`
	`231`	`+ if (TryGetStringFromApplicationSettings(key, out var value))`
	`232`	`+ {`
	`233`	`+ resultValue = value;`
	`234`	`+ return true;`
	`235`	`+ }`
	`236`	`+`
`231`	`237`	`resultValue = string.Empty;`
`232`	`238`	`return false;`
`233`	`239`	`}`
`@@ -401,11 +407,11 @@ protected string ResolveTemplateIfNeededByApplicationSettingsLookup(`
`401`	`407`	`var sa = key.Split('\|', StringSplitOptions.RemoveEmptyEntries);`
`402`	`408`	`if (sa.Length == 2)`
`403`	`409`	`{`
`404`		`- var refComponentProvider = refComponentProviders.First(x => x.Name == sa[0]);`
	`410`	`+ var refComponentProvider = refComponentProviders.FirstOrDefault(x => x.Name.Equals(sa[0], StringComparison.OrdinalIgnoreCase));`
`405`	`411`	`if (refComponentProvider is not null &&`
`406`	`412`	`refComponentProvider.TryGetStringFromApplicationSetting(sa[1], out var resultValue))`
`407`	`413`	`{`
`408`		`- value = resultValue;`
	`414`	`+ value = value.ReplaceTemplateWithKey(key, resultValue);`
`409`	`415`	`}`
`410`	`416`	`}`
`411`	`417`	`}`