JLink operations don't delete files anymore (#282)

nanoframework · Jun 24, 2024 · 6f50e27 · 6f50e27
1 parent 4e6c5c3
commit 6f50e27
Showing 1 changed file with 9 additions and 29 deletions.
diff --git a/nanoFirmwareFlasher.Library/JLinkCli.cs b/nanoFirmwareFlasher.Library/JLinkCli.cs
@@ -138,7 +138,9 @@ public ExitCodes ExecuteFlashBinFiles(
         {
             List<string> shadowFiles = [];
 
-            var processFileResult = ProcessFilePaths(files, shadowFiles);
+            var processFileResult = ProcessFilePaths(
+                files,
+                shadowFiles);
 
             if (processFileResult != ExitCodes.OK)
             {
@@ -280,19 +282,6 @@ public ExitCodes ExecuteFlashBinFiles(
 
             Console.ForegroundColor = ConsoleColor.White;
 
-            // be nice and clean up shadow files
-            try
-            {
-                foreach (string shadowFile in shadowFiles)
-                {
-                    File.Delete(shadowFile);
-                }
-            }
-            catch (Exception)
-            {
-                // ignore any exception here
-            }
-
             return ExitCodes.OK;
         }
 
@@ -308,7 +297,9 @@ public ExitCodes ExecuteFlashHexFiles(
         {
             List<string> shadowFiles = [];
 
-            var processFileResult = ProcessFilePaths(files, shadowFiles);
+            var processFileResult = ProcessFilePaths(
+                files,
+                shadowFiles);
 
             if (processFileResult != ExitCodes.OK)
             {
@@ -421,19 +412,6 @@ public ExitCodes ExecuteFlashHexFiles(
 
             Console.ForegroundColor = ConsoleColor.White;
 
-            // be nice and clean up shadow files
-            try
-            {
-                foreach (string shadowFile in shadowFiles)
-                {
-                    File.Delete(shadowFile);
-                }
-            }
-            catch (Exception)
-            {
-                // ignore any exception here
-            }
-
             return ExitCodes.OK;
         }
 
@@ -521,7 +499,9 @@ internal static string RunJLinkCLI(string cmdFile, string arguments = null)
             return jlinkCli.StandardOutput.ReadToEnd();
         }
 
-        private ExitCodes ProcessFilePaths(IList<string> files, List<string> shadowFiles)
+        private static ExitCodes ProcessFilePaths(
+            IList<string> files,
+            List<string> shadowFiles)
         {
             // J-Link can't handle diacritc chars
             // developer note: reported to Segger (Case: 60276735) and can be removed if this is fixed/improved