Ensure optional packages that have already been installed are install…

…ed so they get upgraded during DNN's upgrade process
dnnsoftware · Nov 5, 2020 · 28258b7 · 28258b7
1 parent 626c1f8
commit 28258b7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/DNN Platform/Library/Services/Upgrade/Upgrade.cs b/DNN Platform/Library/Services/Upgrade/Upgrade.cs
@@ -2777,6 +2777,7 @@ private static void ParsePackagesFromApplicationPath(IEnumerable<string> package
                         continue;
                     }
 
+                    var isInstalled = false;
                     PackageController.ParsePackage(file, installPackagePath, packages, invalidPackages);
                     if (packages.ContainsKey(file))
                     {
@@ -2787,6 +2788,7 @@ private static void ParsePackagesFromApplicationPath(IEnumerable<string> package
                             Null.NullInteger,
                             p => p.Name.Equals(package.Name, StringComparison.OrdinalIgnoreCase)
                                     && p.PackageType.Equals(package.PackageType, StringComparison.OrdinalIgnoreCase));
+                        isInstalled = installedPackage != null;
 
                         if (packages.Values.Count(p => p.FriendlyName.Equals(package.FriendlyName, StringComparison.OrdinalIgnoreCase)) > 1
                                 || installedPackage != null)
@@ -2818,7 +2820,7 @@ private static void ParsePackagesFromApplicationPath(IEnumerable<string> package
                         }
                     }
 
-                    if (extension != ".zip")
+                    if (extension != ".zip" && !isInstalled)
                     {
                         optionalPackages.Add(file);
                     }