Merge pull request #4277 from donker/fixinstaller

Upgrade optional packages when they've already been installed
dnnsoftware · Nov 5, 2020 · deaeb66 · deaeb66
2 parents 626c1f8 + 507d5cd
commit deaeb66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Library.build b/DNN Platform/Dnn.AuthServices.Jwt/Library.build
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <Import Project="..\..\DNN_Platform.build" />
   <PropertyGroup>
-    <Extension>zip</Extension>
+    <Extension>resources</Extension>
     <DNNFileName>Dnn.Jwt</DNNFileName>
     <PackageName>DnnJwtAuth</PackageName>
     <ModuleFolderName>$(WebsitePath)\DesktopModules\AuthenticationServices\JWTAuth</ModuleFolderName>

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);
                     }