Compiler: compiled sketch discovery was missing merged sketch

Author: Federico Fissore

arduino-core/src/processing/app/debug/Compiler.java

@@ -182,7 +182,14 @@ static public boolean upload(SketchData data, Uploader uploader, String buildPat
   }
 
   static public File findCompiledSketch(PreferencesMap prefs) throws PreferencesMapException {
-    List<String> paths = Arrays.asList("{build.path}/{build.project_name}.hex", "{build.path}/{build.project_name}.bin");
+    List<String> paths = Arrays.asList(
+      "{build.path}/sketch/{build.project_name}.with_bootloader.hex",
+      "{build.path}/sketch/{build.project_name}.hex",
+      "{build.path}/{build.project_name}.with_bootloader.hex",
+      "{build.path}/{build.project_name}.hex",
+      "{build.path}/sketch/{build.project_name}.bin",
+      "{build.path}/{build.project_name}.bin"
+    );
     Optional<File> sketch = paths.stream().
       map(path -> StringReplacer.replaceFromMapping(path, prefs)).
       map(File::new).