Merge pull request #19 from atc-net/feature/maintenance-cleanup

Feature/maintenance cleanup

Author: davidkallesen

Directory.Build.props

@@ -44,7 +44,7 @@
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.136" PrivateAssets="All" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="All" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.16.0.82469" PrivateAssets="All" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.17.0.82934" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/Atc.Installer.Integration.Azure/Atc.Installer.Integration.Azure.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.398" />
+    <PackageReference Include="Atc" Version="2.0.412" />
     <PackageReference Include="Azure.Identity" Version="1.10.4" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
   </ItemGroup>

src/Atc.Installer.Integration.WindowsApplication/Atc.Installer.Integration.WindowsApplication.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.398" />
+    <PackageReference Include="Atc" Version="2.0.412" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
   </ItemGroup>
 

src/Atc.Installer.Integration/Atc.Installer.Integration.csproj

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc" Version="2.0.398" />
+    <PackageReference Include="Atc" Version="2.0.412" />
   </ItemGroup>
 
 </Project>

src/Atc.Installer.Integration/Extensions/StringExtensions.cs

@@ -3,58 +3,6 @@ namespace System;
 
 public static class StringExtensions
 {
-    public static bool ContainsTemplateKeyBrackets(
-        this string value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-
-        return value.Contains("[[", StringComparison.Ordinal) &&
-               value.Contains("]]", StringComparison.Ordinal);
-    }
-
-    [SuppressMessage("Performance", "MA0110:Use the Regex source generator", Justification = "OK.")]
-    public static IList<string> GetTemplateKeys(
-        this string value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-
-        var doubleBracketContentPattern = new Regex(@"\[\[(.*?)\]\]", RegexOptions.ExplicitCapture, TimeSpan.FromSeconds(1));
-        var matches = doubleBracketContentPattern.Matches(value);
-        return matches
-            .Select(match => match
-                .Groups[0]
-                .Value
-                .Replace("[[", string.Empty, StringComparison.Ordinal)
-                .Replace("]]", string.Empty, StringComparison.Ordinal))
-            .ToList();
-    }
-
-    public static IList<string> SplitTemplate(
-        this string value)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-
-        var list = new List<string>();
-        var sa1 = value.Split("[[", StringSplitOptions.RemoveEmptyEntries);
-        foreach (var sx1 in sa1)
-        {
-            var sa2 = sx1.Split("]]", StringSplitOptions.RemoveEmptyEntries);
-            list.AddRange(sa2);
-        }
-
-        return list;
-    }
-
-    public static string ReplaceTemplateWithKey(
-        this string value,
-        string templateKey,
-        string newValue)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-
-        return value.Replace($"[[{templateKey}]]", newValue, StringComparison.OrdinalIgnoreCase);
-    }
-
     public static string IndentEachLineWith(
         this string value,
         string prefixPadding)

src/Atc.Installer.Integration/Extensions/X509Certificate2Extensions.cs

@@ -9,7 +9,6 @@
 global using System.Security.Principal;
 global using System.Text;
 global using System.Text.Json;
-global using System.Text.RegularExpressions;
 global using System.Xml.Linq;
 
 global using Atc;

src/Atc.Installer.Integration/GlobalUsings.cs

@@ -5,9 +5,9 @@
 [assembly: AssemblyCompany("atc-net")]
 [assembly: AssemblyProduct("Atc.Installer")]
 [assembly: AssemblyTitle("Atc.Installer")]
-[assembly: AssemblyVersion("1.0.18.0")]
-[assembly: AssemblyInformationalVersion("1.0.18.0")]
-[assembly: AssemblyFileVersion("1.0.18.0")]
+[assembly: AssemblyVersion("1.0.19.0")]
+[assembly: AssemblyInformationalVersion("1.0.19.0")]
+[assembly: AssemblyFileVersion("1.0.19.0")]
 [assembly: System.Resources.NeutralResourcesLanguage("en")]
 [assembly: System.Runtime.Versioning.TargetPlatform("Windows7.0")]
 [assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows7.0")]

src/Atc.Installer.Integration/Helpers/VersionHelper.cs

@@ -23,6 +23,7 @@
     mc:Ignorable="d">
 
     <UserControl.Resources>
+        <atcValueConverters:BoolToVisibilityCollapsedValueConverter x:Key="BoolToVisibilityCollapsedValueConverter" />
         <atcValueConverters:CollectionNullOrEmptyToVisibilityCollapsedValueConverter x:Key="CollectionNullOrEmptyToVisibilityCollapsedValueConverter" />
         <atcValueConverters:EnumDescriptionToStringValueConverter x:Key="EnumDescriptionToStringValueConverter" />
         <atcValueConverters:IntegerGreaterThenZeroToVisibilityVisibleValueConverter x:Key="IntegerGreaterThenZeroToVisibilityVisibleValueConverter" />
@@ -35,15 +36,16 @@
 
     <atc:GridEx
         Margin="10,0,10,10"
-        Columns="600,20,*"
+        Columns="Auto,20,*"
         Rows="*">
 
         <!--  Left-Content  -->
+
         <atc:GridEx
             Grid.Row="0"
             Grid.Column="0"
             Columns="*"
-            Rows="100,*">
+            Rows="100,Auto,*">
             <StackPanel
                 Grid.Row="0"
                 Grid.Column="0"
@@ -58,11 +60,21 @@
                     FontSize="24"
                     Text="{Binding Path=ProjectName, FallbackValue='- Project Name -'}" />
             </StackPanel>
-            <GroupBox
+            <atc:ToggleSwitch
+                x:Name="twShowHide"
                 Grid.Row="1"
                 Grid.Column="0"
+                Width="50"
+                Margin="5"
+                Content="Compact mode"
+                IsOn="{Binding Path=CompactMode}" />
+            <GroupBox
+                Grid.Row="2"
+                Grid.Column="0"
+                MinWidth="200"
                 Padding="0"
-                Header="Components">
+                Header="Components"
+                Visibility="{Binding Path=CompactMode, Converter={StaticResource BoolToVisibilityCollapsedValueConverter}}">
                 <DockPanel>
                     <TextBox
                         Margin="5"