revert docs change to add retain feature

DynamoDS · Jan 29, 2024 · 5d9eb81 · 5d9eb81
1 parent 95c7ee5
commit 5d9eb81
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 7 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/PublishPackageDocumentation.html b/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/PublishPackageDocumentation.html
@@ -256,7 +256,6 @@ <h4>Adding package files</h4>
         In either case, the assembly must be tagged as a node library. Currently, for assemblies marked as node library that contain NodeModel or NodeCustomization types, all other types will be ignored. For this reason, it is important to separate NodeModel/NodeViewCustomization types from types you wish to import using ZeroTouch import.
     </p>
     </p>
-    <!-- TODO, uncomment after DYN-6589
     <p>
 
         <b>Retain folder structure:</b><br />
@@ -269,7 +268,6 @@ <h4>Adding package files</h4>
             When in doubt, toggle the setting off to allow Dynamo to set up the folder structure.
         </p>
     </p>
-    -->
     <p>
         <b>Preview Package Contents:</b><br />
         When you are satisfied with your package contents, click Next to see a preview of how the package files will be set up once they are published.

diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml b/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml
@@ -583,7 +583,6 @@
         </Rectangle>
 
         <!--Toggle-->
-        <!-- TODO, uncomment after DYN-6589
         <StackPanel Orientation="Horizontal"
                     Grid.Column="1"
                     Grid.Row="2">
@@ -610,6 +609,6 @@
                              Style="{StaticResource GenericToolTipLight}" />
                 </Rectangle.ToolTip>
             </Rectangle>
-        </StackPanel>-->
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs
@@ -220,7 +220,7 @@ internal void CopyFilesIntoRetainedPackageDirectory(IEnumerable<IEnumerable<stri
             {
                 // We expect that files are bundled in root folders
                 // For single files, just get its folder
-                var commonPath = files.Count() > 1 ? GetLongestCommonPrefix(files.ToArray()) : Path.GetDirectoryName(files.First());
+                var commonPath = files.Count() > 1 ? GetLongestCommonPrefix(files.ToArray()) : Path.GetDirectoryName(files.FirstOrDefault());
                 commonPath = commonPath.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
                 var commonRootPath = Path.GetDirectoryName(commonPath);
                 if (commonRootPath == null) commonRootPath = commonPath; // already at the root

diff --git a/src/DynamoPackages/PackageManagerClient.cs b/src/DynamoPackages/PackageManagerClient.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Dynamo.Graph.Workspaces;
@@ -273,9 +274,12 @@ internal void Publish(Package package, object files, IEnumerable<string> markdow
                     packageUploadHandle.Error(ret.message);
                     return;
                 }
-
                 packageUploadHandle.Done(null);
             }
+            catch (IOException e)
+            {
+                packageUploadHandle.Error(DynamoPackages.Properties.Resources.CannotRemovePackageAssemblyTitle + ": " + DynamoPackages.Properties.Resources.CannotRemovePackageAssemblyMessage + "(" + e.Message + ")");
+            }
             catch (Exception e)
             {
                 packageUploadHandle.Error(e.GetType() + ": " + e.Message);

diff --git a/src/DynamoPackages/Properties/Resources.Designer.cs b/src/DynamoPackages/Properties/Resources.Designer.cs
diff --git a/src/DynamoPackages/Properties/Resources.en-US.resx b/src/DynamoPackages/Properties/Resources.en-US.resx
@@ -117,6 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CannotRemovePackageAssemblyMessage" xml:space="preserve">
+    <value>Due to limitations in the .NET framework, it is not possible to update your package assembly while it is already loaded.  Please update the assembly while Dynamo is not running and try again.</value>
+    <comment>The message is shown when a user tries to remove assemblies from a loaded package.</comment>
+  </data>
+  <data name="CannotRemovePackageAssemblyTitle" xml:space="preserve">
+    <value>Cannot update assembly</value>
+  </data>
   <data name="InvalidPackageFolderWarning" xml:space="preserve">
     <value>The folder '{0}' does not exist</value>
     <comment>This warning message is shown (during start up) when user specifies additional folders in DynamoSettings.xml file but the folders do not exist.</comment>

diff --git a/src/DynamoPackages/Properties/Resources.resx b/src/DynamoPackages/Properties/Resources.resx
@@ -117,6 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CannotRemovePackageAssemblyMessage" xml:space="preserve">
+    <value>Due to limitations in the .NET framework, it is not possible to update your package assembly while it is already loaded.  Please update the assembly while Dynamo is not running and try again.</value>
+    <comment>The message is shown when a user tries to remove assemblies from a loaded package.</comment>
+  </data>
+  <data name="CannotRemovePackageAssemblyTitle" xml:space="preserve">
+    <value>Cannot update assembly</value>
+  </data>
   <data name="InvalidPackageFolderWarning" xml:space="preserve">
     <value>The folder '{0}' does not exist</value>
     <comment>This warning message is shown (during start up) when user specifies additional folders in DynamoSettings.xml file but the folders do not exist.</comment>