Merge branch 'main' into test-pipeline-build

nanoframework · Jun 23, 2024 · 57f18b4 · 57f18b4
2 parents 1a485dc + 4e6c5c3
commit 57f18b4
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 202 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -68,27 +68,9 @@ jobs:
           else
           {
               # build NOT from PR
-              Write-Host "Build NOT from PR, commit ID: $env:Build_SourceVersion"
-          
-              # get PR associated with commit
-              $prUrl = "https://api.github.com/repos/$env:Build_Repository_Name/commits/$env:Build_SourceVersion/pulls"
-              $commit = Invoke-RestMethod -Uri $prUrl -ContentType "application/json" -Headers @{"Accept"="application/vnd.github.groot-preview+json"} -Method GET
-      
-              if($commit -ne $null)
-              {
-                  # there is a PR, check labels
-                  $updateDependents = $commit.labels | where {$_.Name -eq 'CI: Update Dependents'}
-                  if($updateDependents -ne $null)
-                  {
-                      $update = $true
-                  }
-              }
+              Write-Host "Build NOT from PR, commit ID: $env:Build_SourceVersion"         
           }
-      }
-  
-      # set variable to foward to jobs
-      echo "##vso[task.setvariable variable=RUN_UPDATE_DEPENDENTS;isOutput=true]$update"
-  
+      }  
     name: BuildOptions
     displayName: Evaluate build options
 
@@ -187,8 +169,6 @@ jobs:
       value: 'Release'
     - name: solution
       value: 'nanoFirmwareFlasher.sln'
-    - name: run_update_dependents
-      value: $[dependencies.Check_Build_Options.outputs['BuildOptions.RUN_UPDATE_DEPENDENTS']]
 
   steps:
 
@@ -473,21 +453,6 @@ jobs:
           { "label" : "Type: documentation", "displayName" : "Documentation", "state" : "closed" }
         ]
 
-  # update dependents
-  - task: PowerShell@2
-    condition: >-
-      or(
-        eq(variables['System.PullRequest.PullRequestId'], ''),
-        eq(variables['UPDATE_DEPENDENTS'], 'true'),
-        eq(variables['run_update_dependents'], 'true')
-      )
-    displayName: Update dependent tools
-    inputs:
-      targetType: filePath
-      filePath: azure-pipelines/update-dependents.ps1
-    env:
-      GH_TOKEN: $(GitHubToken)
-
 ##################################
 # report build failure to Discord
 - job: Report_Build_Failure

diff --git a/azure-pipelines/update-dependents.ps1 b/azure-pipelines/update-dependents.ps1
diff --git a/lib/jlink/JLink.exe b/lib/jlink/JLink.exe
diff --git a/lib/jlink/JLink_x64.dll b/lib/jlink/JLink_x64.dll
diff --git a/lib/jlinkLinux/JLinkExe b/lib/jlinkLinux/JLinkExe
diff --git a/lib/jlinkMac/JLinkExe b/lib/jlinkMac/JLinkExe
diff --git a/nanoFirmwareFlasher.Library/JLinkCli.cs b/nanoFirmwareFlasher.Library/JLinkCli.cs
@@ -136,10 +136,13 @@ public ExitCodes ExecuteFlashBinFiles(
             IList<string> addresses,
             string probeId)
         {
-            // check file existence
-            if (files.Any(f => !File.Exists(f)))
+            List<string> shadowFiles = [];
+
+            var processFileResult = ProcessFilePaths(files, shadowFiles);
+
+            if (processFileResult != ExitCodes.OK)
             {
-                return ExitCodes.E5004;
+                return processFileResult;
             }
 
             // perform check on address(es)
@@ -179,10 +182,6 @@ public ExitCodes ExecuteFlashBinFiles(
                 }
             }
 
-            List<string> shadowFiles = [];
-
-            ProcessFilePaths(files, shadowFiles);
-
             // erase flash
             if (DoMassErase)
             {
@@ -281,42 +280,20 @@ public ExitCodes ExecuteFlashBinFiles(
 
             Console.ForegroundColor = ConsoleColor.White;
 
-            return ExitCodes.OK;
-        }
-
-        private void 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
-            foreach (string binFile in files)
+            // be nice and clean up shadow files
+            try
             {
-                // make sure path is absolute
-                var binFilePath = Utilities.MakePathAbsolute(
-                    Environment.CurrentDirectory,
-                    binFile);
-
-                if (!binFilePath.IsNormalized(NormalizationForm.FormD)
-                    || binFilePath.Contains(' '))
+                foreach (string shadowFile in shadowFiles)
                 {
-                    var tempFile = Path.Combine(
-                        Environment.GetEnvironmentVariable("TEMP", EnvironmentVariableTarget.Machine),
-                        Path.GetFileName(binFilePath));
-
-                    // copy file to shadow file
-                    File.Copy(
-                        binFilePath,
-                        tempFile,
-                        true);
-
-                    shadowFiles.Add(tempFile);
-                }
-                else
-                {
-                    // copy file to shadow list
-                    shadowFiles.Add(binFile);
+                    File.Delete(shadowFile);
                 }
-
             }
+            catch (Exception)
+            {
+                // ignore any exception here
+            }
+
+            return ExitCodes.OK;
         }
 
         /// <summary>
@@ -329,15 +306,14 @@ public ExitCodes ExecuteFlashHexFiles(
             IList<string> files,
             string probeId)
         {
-            // check file existence
-            if (files.Any(f => !File.Exists(f)))
-            {
-                return ExitCodes.E5004;
-            }
-
             List<string> shadowFiles = [];
 
-            ProcessFilePaths(files, shadowFiles);
+            var processFileResult = ProcessFilePaths(files, shadowFiles);
+
+            if (processFileResult != ExitCodes.OK)
+            {
+                return processFileResult;
+            }
 
             // erase flash
             if (DoMassErase)
@@ -445,10 +421,23 @@ 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;
         }
 
-        public void ShowCLIOutput(string cliOutput)
+        internal void ShowCLIOutput(string cliOutput)
         {
             // show CLI output, if verbosity is diagnostic
             if (Verbosity == VerbosityLevel.Diagnostic)
@@ -531,5 +520,47 @@ internal static string RunJLinkCLI(string cmdFile, string arguments = null)
 
             return jlinkCli.StandardOutput.ReadToEnd();
         }
+
+        private 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
+            foreach (string binFile in files)
+            {
+                // make sure path is absolute
+                var binFilePath = Utilities.MakePathAbsolute(
+                    Environment.CurrentDirectory,
+                    binFile);
+
+                // check file existence
+                if (!File.Exists(binFilePath))
+                {
+                    return ExitCodes.E5004;
+                }
+
+                if (!binFilePath.IsNormalized(NormalizationForm.FormD)
+                    || binFilePath.Contains(' '))
+                {
+                    var tempFile = Path.Combine(
+                        Environment.GetEnvironmentVariable("TEMP", EnvironmentVariableTarget.Machine),
+                        Path.GetFileName(binFilePath));
+
+                    // copy file to shadow file
+                    File.Copy(
+                        binFilePath,
+                        tempFile,
+                        true);
+
+                    shadowFiles.Add(tempFile);
+                }
+                else
+                {
+                    // copy file to shadow list
+                    shadowFiles.Add(binFilePath);
+                }
+            }
+
+            return ExitCodes.OK;
+        }
     }
 }
diff --git a/nanoFirmwareFlasher.Tool/nanoFirmwareFlasher.Tool.csproj b/nanoFirmwareFlasher.Tool/nanoFirmwareFlasher.Tool.csproj
@@ -23,6 +23,7 @@
 		<Platforms>AnyCPU;x64</Platforms>
 		<RuntimeIdentifiers>any</RuntimeIdentifiers>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<LangVersion>12.0</LangVersion>
 		<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
 	    <RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
 	</PropertyGroup>