update

KaivnD · Mar 25, 2021 · 2a41057 · 2a41057
1 parent 56036ba
commit 2a41057
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -674,8 +674,17 @@ internal void ExecutePackageDownload(string name, PackageVersion package, string
                 if (immediateUninstalls.Any())
                 {
                     var stdLibPkgs = GetPackagesLocatedInStandardLibrary(immediateUninstalls);
+                    if (stdLibHasTopPriority && stdLibPkgs.Count() > 0) {
+                        // Some or all dependencies are in standard library.
+                        MessageBox.Show(String.Format(Resources.MessagePackageHasDepsInStdLib,
+                            name + " " + package.version,
+                            JoinPackageNames(stdLibPkgs)),
+                            Resources.CannotDownloadPackageMessageBoxTitle,
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                        return;
+                    }
 
-                    // if the package is not in use, tell the user we will be uninstall it and give them the opportunity to cancel
+                    // if the package is not in use, tell the user we will uninstall it and give them the opportunity to cancel
                     if (MessageBox.Show(String.Format(Resources.MessageAlreadyInstallDynamo,
                         DynamoViewModel.BrandingResourceProvider.ProductName,
                         JoinPackageNames(immediateUninstalls)),

diff --git a/src/DynamoPackages/PackageLoader.cs b/src/DynamoPackages/PackageLoader.cs
@@ -76,14 +76,16 @@ public string DefaultPackagesDirectory
 
         internal int Priority(string path)
         {
-            for (var ii=0; ii<packagesDirectories.Count(); ii++)
+            var pkgDirCount = packagesDirectories.Count();
+            for (var ii=0; ii< pkgDirCount; ii++)
             {
                 if (path.Contains(packagesDirectories[ii]))
                 {
-                    return packagesDirectories.Count() - ii;
+                    return pkgDirCount - ii;
                 }
             }
-            return -1;
+            // Lowest priority for paths that are not yet registered.
+            return pkgDirCount;
         }
 
         private readonly List<string> packagesDirectoriesToVerifyCertificates = new List<string>();