Reorganized pre run commands

Author: MscrmTools

Commands/NugetCleanup.Command.xml

@@ -0,0 +1,19 @@
+<Commands>
+  <Command Processed="false">
+    <PreChecks>
+      <PreCheck type="FileExists">Nuget.Common.dll</PreCheck>
+      <PreCheck type="FileExists">XrmToolBox.PluginsStore.dll</PreCheck>
+    </PreChecks>
+    <Description>This version of XrmToolBox removes the legacy tool library. Nuget assemblies are not needed anymore and will be deleted.</Description>
+    <Actions>
+      <Action>IF EXIST "Nuget.Common.dll" (DEL "Nuget.Common.dll")</Action>
+      <Action>IF EXIST "Nuget.Configuration.dll" (DEL "Nuget.Configuration.dll")</Action>
+      <Action>IF EXIST "Nuget.Core.dll" (DEL "Nuget.Core.dll")</Action>
+      <Action>IF EXIST "Nuget.Frameworks.dll" (DEL "Nuget.Frameworks.dll")</Action>
+      <Action>IF EXIST "Nuget.Packaging.dll" (DEL "Nuget.Packaging.dll")</Action>
+      <Action>IF EXIST "Nuget.Protocol.dll" (DEL "Nuget.Protocol.dll")</Action>
+      <Action>IF EXIST "Nuget.Versioning.dll" (DEL "Nuget.Versioning.dll")</Action>
+      <Action>IF EXIST "XrmToolBox.PluginsStore.dll" (DEL "XrmToolBox.PluginsStore.dll")</Action>
+    </Actions>
+  </Command>
+</Commands>

XrmToolBox.AutoUpdater/AutoUpdater.cs

@@ -118,9 +118,7 @@ private void btnLaunchXrmToolBox_Click(object sender, EventArgs e)
             catch (Exception error)
             {
                 MessageBox.Show(this,
-                    $@"Unable to start XrmToolBox for the following reason: {error.Message}. File not found : {
-                            xtbPath
-                        }", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    $@"Unable to start XrmToolBox for the following reason: {error.Message}. File not found : {xtbPath}", @"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
@@ -189,6 +187,12 @@ private void CopyDirectoryContent(string directoryPath, string destinationDirect
             var directory = new DirectoryInfo(directoryPath);
             foreach (var fi in directory.GetFiles())
             {
+                if (fi.FullName.ToLower().EndsWith(".command.xml") && File.Exists(Path.Combine(destinationDirectoryPath, fi.Name)))
+                {
+                    // If the file already exists, we skip it
+                    continue;
+                }
+
                 worker.ReportProgress(0, action + " " + fi.Name);
 
                 fi.CopyTo(Path.Combine(destinationDirectoryPath, fi.Name), true);