feat: Fix Spelling issue for HostingFrameworkType DonNetFramework48 =…

…> DotNetFramework48
atc-net · Mar 11, 2024 · 62acc2c · 62acc2c
1 parent 7788ce1
commit 62acc2c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/src/Atc.Installer.Integration/Enums/HostingFrameworkType.cs b/src/Atc.Installer.Integration/Enums/HostingFrameworkType.cs
@@ -12,7 +12,7 @@ public enum HostingFrameworkType
     NativeNoSettings,
 
     [Description(".NET Framework 4.8")]
-    DonNetFramework48,
+    DotNetFramework48,
 
     [Description(".NET 7")]
     DotNet7,

diff --git a/...Provider.InternetInformationServer/InternetInformationServerComponentProviderViewModel.cs b/...Provider.InternetInformationServer/InternetInformationServerComponentProviderViewModel.cs
@@ -774,7 +774,7 @@ private void CheckPrerequisitesForHostingFramework()
     {
         switch (HostingFramework)
         {
-            case HostingFrameworkType.DonNetFramework48:
+            case HostingFrameworkType.DotNetFramework48:
                 if (iisInstallerService.IsMicrosoftDotNetFramework48())
                 {
                     AddToInstallationPrerequisites("IsMicrosoftDotNetFramework48", LogCategoryType.Information, "Microsoft .NET Framework 4.8 is installed");

diff --git a/....Wpf.ComponentProvider.WindowsApplication/WindowsApplicationComponentProviderViewModel.cs b/....Wpf.ComponentProvider.WindowsApplication/WindowsApplicationComponentProviderViewModel.cs
@@ -529,10 +529,10 @@ private void CheckPrerequisitesForHostingFramework()
             case HostingFrameworkType.DotNet8:
                 AddToInstallationPrerequisites("IsMicrosoftDotNet8", LogCategoryType.Warning, "Microsoft .NET 8 is not installed");
                 break;
-            case HostingFrameworkType.DonNetFramework48 when waInstallerService.IsMicrosoftDotNetFramework48():
+            case HostingFrameworkType.DotNetFramework48 when waInstallerService.IsMicrosoftDotNetFramework48():
                 AddToInstallationPrerequisites("IsMicrosoftDotNetFramework48", LogCategoryType.Information, "Microsoft .NET Framework 4.8 is installed");
                 break;
-            case HostingFrameworkType.DonNetFramework48:
+            case HostingFrameworkType.DotNetFramework48:
                 AddToInstallationPrerequisites("IsMicrosoftDotNetFramework48", LogCategoryType.Warning, "Microsoft .NET Framework 4.8 is not installed");
                 break;
             case HostingFrameworkType.Native:

diff --git a/src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs b/src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs
@@ -3,6 +3,7 @@
 // ReSharper disable ReturnTypeCanBeEnumerable.Local
 // ReSharper disable StringLiteralTypo
 // ReSharper disable SwitchStatementHandlesSomeKnownEnumValuesWithDefault
+// ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
 namespace Atc.Installer.Wpf.ComponentProvider;
 
 [SuppressMessage("Design", "MA0048:File name must match type name", Justification = "OK - partial class")]
@@ -110,7 +111,7 @@ public void LoadConfigurationFiles()
 
         switch (HostingFramework)
         {
-            case HostingFrameworkType.DonNetFramework48:
+            case HostingFrameworkType.DotNetFramework48:
             {
                 if (InstalledMainFilePath is not null)
                 {
@@ -201,10 +202,21 @@ public void PrepareInstallationFiles(
 
         UnpackedZipFolderPath = Path.Combine(InstallerTempDirectory.FullName, @$"{ProjectName}\Unpacked\{Name}");
 
-        if (Directory.Exists(UnpackedZipFolderPath) &&
-            Directory.GetFiles(UnpackedZipFolderPath).Length == 0)
+        if (Directory.Exists(UnpackedZipFolderPath))
         {
-            Directory.Delete(UnpackedZipFolderPath, recursive: true);
+            var minimumExpectedNumberOfFiles = 1;
+            if (HostingFramework is
+                HostingFrameworkType.DotNetFramework48 or
+                HostingFrameworkType.DotNet7 or
+                HostingFrameworkType.DotNet8)
+            {
+                minimumExpectedNumberOfFiles = 10;
+            }
+
+            if (Directory.GetFiles(UnpackedZipFolderPath).Length < minimumExpectedNumberOfFiles)
+            {
+                Directory.Delete(UnpackedZipFolderPath, recursive: true);
+            }
         }
 
         if (unpackIfExist ||
@@ -823,7 +835,7 @@ public async Task<ReportingData> GetReportingData()
 
                 switch (HostingFramework)
                 {
-                    case HostingFrameworkType.DonNetFramework48 or
+                    case HostingFrameworkType.DotNetFramework48 or
                         HostingFrameworkType.DotNet7 or
                         HostingFrameworkType.DotNet8:
                     {
@@ -946,7 +958,7 @@ private void ResolveInstalledMainFile(
         {
             case { ComponentType: ComponentType.Application, HostingFramework: HostingFrameworkType.DotNet7 }:
             case { ComponentType: ComponentType.Application, HostingFramework: HostingFrameworkType.DotNet8 }:
-            case { ComponentType: ComponentType.Application, HostingFramework: HostingFrameworkType.DonNetFramework48 }:
+            case { ComponentType: ComponentType.Application, HostingFramework: HostingFrameworkType.DotNetFramework48 }:
                 InstalledMainFilePath = new ValueTemplateItemViewModel(
                     Path.Combine(basePath, $"{Name}.exe"),
                     template: instFolderPath,
@@ -960,7 +972,7 @@ private void ResolveInstalledMainFile(
                 break;
             case { ComponentType: ComponentType.InternetInformationService, HostingFramework: HostingFrameworkType.DotNet7 }:
             case { ComponentType: ComponentType.InternetInformationService, HostingFramework: HostingFrameworkType.DotNet8 }:
-            case { ComponentType: ComponentType.InternetInformationService, HostingFramework: HostingFrameworkType.DonNetFramework48 }:
+            case { ComponentType: ComponentType.InternetInformationService, HostingFramework: HostingFrameworkType.DotNetFramework48 }:
                 InstalledMainFilePath = new ValueTemplateItemViewModel(
                     Path.Combine(basePath, $"{Name}.dll"),
                     template: instFolderPath,
@@ -974,7 +986,7 @@ private void ResolveInstalledMainFile(
                 break;
             case { ComponentType: ComponentType.WindowsService, HostingFramework: HostingFrameworkType.DotNet7 }:
             case { ComponentType: ComponentType.WindowsService, HostingFramework: HostingFrameworkType.DotNet8 }:
-            case { ComponentType: ComponentType.WindowsService, HostingFramework: HostingFrameworkType.DonNetFramework48 }:
+            case { ComponentType: ComponentType.WindowsService, HostingFramework: HostingFrameworkType.DotNetFramework48 }:
                 InstalledMainFilePath = new ValueTemplateItemViewModel(
                     Path.Combine(basePath, $"{Name}.exe"),
                     template: instFolderPath,

diff --git a/...rovider/ValueConverters/ComponentProviderVersionCompareVisibilityVisibleValueConverter.cs b/...rovider/ValueConverters/ComponentProviderVersionCompareVisibilityVisibleValueConverter.cs
@@ -21,7 +21,7 @@ public object Convert(
         }
 
         if (vm.HostingFramework is
-            HostingFrameworkType.DonNetFramework48 or
+            HostingFrameworkType.DotNetFramework48 or
             HostingFrameworkType.DotNet7 or
             HostingFrameworkType.DotNet8)
         {