Merge pull request #11 from atc-net/feature/maintenance

Feature/maintenance
atc-net · Nov 9, 2023 · c060214 · c060214
2 parents ade9863 + 3178a6d
commit c060214
Show file tree

Hide file tree

Showing 19 changed files with 268 additions and 82 deletions.
diff --git a/.github/workflows/post-integration.yml b/.github/workflows/post-integration.yml
@@ -30,22 +30,23 @@ jobs:
         with:
           setAllVars: true
 
-      # - name: ⚙️ Setup dotnet 7.0.x
-        # uses: actions/setup-dotnet@v1
-        # with:
-          # dotnet-version: '7.0.x'
+      - name: ⚙️ Setup dotnet 7.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '7.0.x'
 
-      # - name: ⚙️ Set up JDK 11
-        # uses: actions/setup-java@v1
-        # with:
-          # java-version: 1.11
+      - name: ⚙️ Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'zulu'
 
-      # - name: 📐 Ensure nuget.org added as package source on Windows
-        # run: dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org --configfile $env:APPDATA\NuGet\NuGet.Config
-        # continue-on-error: true
+      - name: 📐 Ensure nuget.org added as package source on Windows
+        run: dotnet nuget add source https://api.nuget.org/v3/index.json -n nuget.org --configfile $env:APPDATA\NuGet\NuGet.Config
+        continue-on-error: true
 
-      # - name: 🔁 Restore packages
-        # run: dotnet restore Atc.Installer-WithoutSetup.sln
+      - name: 🔁 Restore packages
+        run: dotnet restore Atc.Installer-WithoutSetup.sln
 
       # - name: 🛠️ Build
         # run: dotnet build Atc.Installer-WithoutSetup.sln -c Release --no-restore /p:UseSourceLink=true

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.103" PrivateAssets="All" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.105" 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.12.0.78982" PrivateAssets="All" />

diff --git a/src/Atc.Installer.Integration.Azure/Atc.Installer.Integration.Azure.csproj b/src/Atc.Installer.Integration.Azure/Atc.Installer.Integration.Azure.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Atc" Version="2.0.386" />
     <PackageReference Include="Azure.Identity" Version="1.10.3" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.0-beta.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Installer.Integration/Extensions/DirectoryInfoExtensions.cs b/src/Atc.Installer.Integration/Extensions/DirectoryInfoExtensions.cs
@@ -6,6 +6,36 @@ namespace System.IO;
 
 public static class DirectoryInfoExtensions
 {
+    public static bool ExistsAndContainsFiles(
+        this DirectoryInfo directoryInfo,
+        string searchPattern = "*",
+        bool useRecursive = true)
+    {
+        ArgumentNullException.ThrowIfNull(directoryInfo);
+
+        var searchOption = useRecursive
+            ? SearchOption.AllDirectories
+            : SearchOption.TopDirectoryOnly;
+
+        return Directory.Exists(directoryInfo.FullName) &&
+               Directory.GetFiles(directoryInfo.FullName, searchPattern, searchOption).Length > 0;
+    }
+
+    public static bool ExistsAndContainsNoFiles(
+        this DirectoryInfo directoryInfo,
+        string searchPattern = "*",
+        bool useRecursive = true)
+    {
+        ArgumentNullException.ThrowIfNull(directoryInfo);
+
+        var searchOption = useRecursive
+            ? SearchOption.AllDirectories
+            : SearchOption.TopDirectoryOnly;
+
+        return Directory.Exists(directoryInfo.FullName) &&
+               Directory.GetFiles(directoryInfo.FullName, searchPattern, searchOption).Length == 0;
+    }
+
     public static void CopyAll(
         this DirectoryInfo source,
         DirectoryInfo destination,
@@ -15,6 +45,11 @@ public static void CopyAll(
         ArgumentNullException.ThrowIfNull(source);
         ArgumentNullException.ThrowIfNull(destination);
 
+        if (!Directory.Exists(source.FullName))
+        {
+            return;
+        }
+
         if (Directory.Exists(destination.FullName))
         {
             if (deleteAllFromDestinationBeforeCopy)

diff --git a/src/Atc.Installer.Integration/Helpers/DirectoryHelper.cs b/src/Atc.Installer.Integration/Helpers/DirectoryHelper.cs
@@ -0,0 +1,14 @@
+namespace Atc.Installer.Integration.Helpers;
+
+public static class DirectoryHelper
+{
+    public static bool ExistsAndContainsFiles(
+        string? folderPath)
+        => folderPath is not null &&
+           new DirectoryInfo(folderPath).ExistsAndContainsFiles();
+
+    public static bool ExistsAndContainsNoFiles(
+        string? folderPath)
+        => folderPath is not null &&
+           new DirectoryInfo(folderPath).ExistsAndContainsNoFiles();
+}
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.11.0")]
-[assembly: AssemblyInformationalVersion("1.0.11.0")]
-[assembly: AssemblyFileVersion("1.0.11.0")]
+[assembly: AssemblyVersion("1.0.12.0")]
+[assembly: AssemblyInformationalVersion("1.0.12.0")]
+[assembly: AssemblyFileVersion("1.0.12.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
@@ -43,10 +43,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.285" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.290" />
     <PackageReference Include="ClosedXML" Version="0.104.0-preview2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.2.23479.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.2.23479.6" />

diff --git a/src/Atc.Installer.Wpf.App/GlobalUsings.cs b/src/Atc.Installer.Wpf.App/GlobalUsings.cs
@@ -16,6 +16,7 @@
 global using Atc.Installer.Integration;
 global using Atc.Installer.Integration.Azure;
 global using Atc.Installer.Integration.ElasticSearch;
+global using Atc.Installer.Integration.Helpers;
 global using Atc.Installer.Integration.InstallationConfigurations;
 global using Atc.Installer.Integration.InternetInformationServer;
 global using Atc.Installer.Integration.PostgreSql;

diff --git a/src/Atc.Installer.Wpf.App/MainWindowViewModel_Commands.cs b/src/Atc.Installer.Wpf.App/MainWindowViewModel_Commands.cs
@@ -188,6 +188,7 @@ private async Task DownloadInstallationFilesFromAzureStorageAccountCommandHandle
                 GetComponentsWithInstallationFileContentHash())
             .ConfigureAwait(true);
 
+        var handledUnpackedZipFolderPaths = new List<string>();
         foreach (var vm in ComponentProviders)
         {
             var fileInfo = componentFiles.FirstOrDefault(x => x.Name.StartsWith(vm.Name, StringComparison.OrdinalIgnoreCase));
@@ -200,6 +201,23 @@ private async Task DownloadInstallationFilesFromAzureStorageAccountCommandHandle
             vm.AnalyzeAndUpdateStatesInBackgroundThread();
 
             loggerComponentProvider.Log(LogLevel.Information, $"Downloaded installation file: {fileInfo.Name}");
+            if (vm.UnpackedZipFolderPath is not null)
+            {
+                handledUnpackedZipFolderPaths.Add(vm.UnpackedZipFolderPath);
+            }
+        }
+
+        foreach (var vm in ComponentProviders)
+        {
+            if (vm.UnpackedZipFolderPath is null ||
+                handledUnpackedZipFolderPaths.Contains(vm.UnpackedZipFolderPath, StringComparer.Ordinal) ||
+                DirectoryHelper.ExistsAndContainsFiles(vm.UnpackedZipFolderPath))
+            {
+                continue;
+            }
+
+            vm.PrepareInstallationFiles(unpackIfExist: true);
+            vm.AnalyzeAndUpdateStatesInBackgroundThread();
         }
 
         loggerComponentProvider.Log(LogLevel.Trace, "Downloaded installation files from Azure StorageAccount");

diff --git a/....ComponentProvider.ElasticSearch/Atc.Installer.Wpf.ComponentProvider.ElasticSearch.csproj b/....ComponentProvider.ElasticSearch/Atc.Installer.Wpf.ComponentProvider.ElasticSearch.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.285" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.290" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...netInformationServer/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer.csproj b/...netInformationServer/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.285" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.290" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...staller.Wpf.ComponentProvider.InternetInformationServer/Controls/X509CertificateView.xaml b/...staller.Wpf.ComponentProvider.InternetInformationServer/Controls/X509CertificateView.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+    xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Atc.Installer.Wpf.ComponentProvider.InternetInformationServer"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -15,25 +16,36 @@
     <UserControl.Resources>
         <valueConverters:X509CertificateNameValueConverter x:Key="X509CertificateNameValueConverter" />
         <valueConverters:X509CertificateDnsNameValueConverter x:Key="X509CertificateDnsNameValueConverter" />
-        <valueConverters:X509CertificateValidationBrushValueConverter x:Key="X509CertificateValidationBrushValueConverter" />
+        <valueConverters:X509CertificateValidationInvalidToVisibilityVisibleValueConverter x:Key="X509CertificateValidationInvalidToVisibilityVisibleValueConverter" />
+        <atcValueConverters:ObjectNullToVisibilityCollapsedValueConverter x:Key="ObjectNullToVisibilityCollapsedValueConverter" />
     </UserControl.Resources>
 
     <GroupBox
         Padding="5"
         HorizontalAlignment="Stretch"
         VerticalAlignment="Top"
-        Background="{Binding Path=X509Certificate, Converter={StaticResource X509CertificateValidationBrushValueConverter}}"
         Header="X509 Certificate">
-        <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
-            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+        <StackPanel Orientation="Vertical">
 
-                <atc:LabelTextInfo
-                    HideAreas="InformationAndValidation"
-                    LabelText="Name"
-                    Orientation="Vertical"
-                    Text="{Binding Path=X509Certificate, Converter={StaticResource X509CertificateNameValueConverter}}">
-                    <atc:LabelTextInfo.ToolTip>
-                        <Grid Background="{Binding Path=X509Certificate, Converter={StaticResource X509CertificateValidationBrushValueConverter}}">
+            <atc:UniformSpacingPanel
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Orientation="Horizontal"
+                Spacing="10"
+                Visibility="{Binding Path=X509Certificate, Converter={StaticResource ObjectNullToVisibilityCollapsedValueConverter}}">
+                <TextBlock
+                    HorizontalAlignment="Right"
+                    Foreground="Red"
+                    Text="Invalid certificate"
+                    Visibility="{Binding Path=X509Certificate, Converter={StaticResource X509CertificateValidationInvalidToVisibilityVisibleValueConverter}}" />
+                <atc:SvgImage
+                    Width="20"
+                    Height="20"
+                    ControlSizeType="ContentToSizeNoStretch"
+                    OverrideColor="DodgerBlue"
+                    Source="/Atc.Installer.Wpf.ComponentProvider;component/Resources/info_help.svg">
+                    <atc:SvgImage.ToolTip>
+                        <Grid>
                             <atc:UniformSpacingPanel
                                 Margin="10"
                                 Orientation="Vertical"
@@ -76,16 +88,25 @@
                                     Text="{Binding Path=X509Certificate.Thumbprint, FallbackValue='N/A'}" />
                             </atc:UniformSpacingPanel>
                         </Grid>
-                    </atc:LabelTextInfo.ToolTip>
-                </atc:LabelTextInfo>
+                    </atc:SvgImage.ToolTip>
+                </atc:SvgImage>
+            </atc:UniformSpacingPanel>
+
+            <atc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+
+                <atc:LabelTextInfo
+                    HideAreas="InformationAndValidation"
+                    LabelText="Name"
+                    Orientation="Vertical"
+                    Text="{Binding Path=X509Certificate, Converter={StaticResource X509CertificateNameValueConverter}}" />
 
                 <Grid>
                     <atc:UniformSpacingPanel
                         HorizontalAlignment="Center"
                         IsEnabled="{Binding Path=EnableEditingMode}"
                         Spacing="10">
                         <Button
-                            Width="80"
+                            Width="70"
                             Background="Transparent"
                             BorderBrush="Transparent"
                             BorderThickness="0"
@@ -103,7 +124,7 @@
                             </StackPanel>
                         </Button>
                         <Button
-                            Width="80"
+                            Width="70"
                             Background="Transparent"
                             BorderBrush="Transparent"
                             BorderThickness="0"
@@ -124,6 +145,7 @@
                 </Grid>
 
             </atc:UniformSpacingPanel>
-        </atc:UniformSpacingPanel>
+
+        </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/...rtificateValidationBrushValueConverter.cs → ...validToVisibilityVisibleValueConverter.cs b/...rtificateValidationBrushValueConverter.cs → ...validToVisibilityVisibleValueConverter.cs
@@ -1,18 +1,18 @@
 // ReSharper disable InvertIf
 namespace Atc.Installer.Wpf.ComponentProvider.InternetInformationServer.ValueConverters;
 
-public class X509CertificateValidationBrushValueConverter : IValueConverter
+public class X509CertificateValidationInvalidToVisibilityVisibleValueConverter : IValueConverter
 {
     public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
         if (value is X509Certificate2 certificate)
         {
             return certificate.IsValid()
-                ? Brushes.Transparent
-                : Brushes.Red;
+                ? Visibility.Hidden
+                : Visibility.Visible;
         }
 
-        return Brushes.Transparent;
+        return Visibility.Hidden;
     }
 
     public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)

diff --git a/...er.Wpf.ComponentProvider.PostgreSql/Atc.Installer.Wpf.ComponentProvider.PostgreSql.csproj b/...er.Wpf.ComponentProvider.PostgreSql/Atc.Installer.Wpf.ComponentProvider.PostgreSql.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.285" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.290" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Provider.WindowsApplication/Atc.Installer.Wpf.ComponentProvider.WindowsApplication.csproj b/...Provider.WindowsApplication/Atc.Installer.Wpf.ComponentProvider.WindowsApplication.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Atc.Wpf" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.285" />
-    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.285" />
+    <PackageReference Include="Atc.Wpf" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Controls" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.FontIcons" Version="2.0.290" />
+    <PackageReference Include="Atc.Wpf.Theming" Version="2.0.290" />
   </ItemGroup>
 
   <ItemGroup>