use 'dotnet xxx.dll' instead of 'xxx.exe' on arm64 platform

Author: github0null

src/CodeBuilder.ts

@@ -49,7 +49,7 @@ import { ArrayDelRepetition } from "../lib/node-utility/Utility";
 import { DependenceManager } from "./DependenceManager";
 import { WorkspaceManager } from "./WorkspaceManager";
 import { ToolchainName } from "./ToolchainManager";
-import { md5, sha256, copyObject } from "./utility";
+import { md5, sha256, copyObject, generateDotnetProgramCmd } from "./utility";
 import { exeSuffix, osType } from "./Platform";
 import { FileWatcher } from "../lib/node-utility/FileWatcher";
 import { STVPFlasherOptions } from './HexUploader';
@@ -322,10 +322,8 @@ export abstract class CodeBuilder {
         outDir.CreateDir(true);
 
         // generate command line
-        const commandLine = CmdLineHandler.getCommandLine(
-            ResManager.instance().getUnifyBuilderExe().noSuffixName,
-            this.getCommands()
-        );
+        const commandLine = generateDotnetProgramCmd(
+            ResManager.instance().getUnifyBuilderExe(), this.getCommands());
 
         // if only generate params, exit
         if (options?.onlyGenParams) return;

src/EIDEProject.ts

@@ -2510,6 +2510,9 @@ $(OUT_DIR):
         this.registerBuiltinVar('SYS_PathSep', () => platform.osType() != 'win32' ? ':' : ';');
         this.registerBuiltinVar('SYS_PathSeparator', () => platform.osType() != 'win32' ? ':' : ';');
         this.registerBuiltinVar('SYS_EOL', () => os.EOL);
+
+        // eide vars
+        this.registerBuiltinVar('UnifyBuilderDir', () => ResManager.instance().getUnifyBuilderExe().dir);
     }
 
     private RegisterEvent(): void {

src/EIDEProjectExplorer.ts

@@ -103,7 +103,8 @@ import {
     compareVersion,
     getGccSystemSearchList,
     openocd_getConfigList,
-    pyocd_getTargetList
+    pyocd_getTargetList,
+    generateDotnetProgramCmd
 } from './utility';
 import { concatSystemEnvPath, DeleteDir, exeSuffix, kill, osType, DeleteAllChildren } from './Platform';
 import { KeilARMOption, KeilC51Option, KeilParser, KeilRteDependence } from './KeilXmlParser';
@@ -4463,8 +4464,8 @@ export class ProjectExplorer implements CustomConfigurationProvider {
         paramsFile.Write(JSON.stringify(cmdList));
 
         /* launch */
-        const exeName = ResManager.GetInstance().getUnifyBuilderExe().noSuffixName;
-        const commandLine = CmdLineHandler.getCommandLine(exeName, ['-r', paramsFile.path]);
+        const commandLine = generateDotnetProgramCmd(
+            ResManager.instance().getUnifyBuilderExe(), ['-r', paramsFile.path]);
         runShellCommand('build workspace', commandLine);
     }
 

src/ResManager.ts

@@ -163,7 +163,7 @@ export class ResManager extends events.EventEmitter {
 
     enumSerialPort(): string[] {
         try {
-            const cmd = this.getSerialPortExe().noSuffixName;
+            const cmd = utility.generateDotnetProgramCmd(this.getSerialPortExe());
             const data = ChildProcess.execSync(cmd, { env: process.env });
             const portList: string[] = JSON.parse(EncodingConverter.trimUtf8BomHeader(data));
             if (!Array.isArray(portList)) { throw Error("get current port list error !"); }

src/utility.ts

@@ -45,6 +45,22 @@ import { SettingManager } from './SettingManager';
 import { ToolchainName } from './ToolchainManager';
 import { Time } from '../lib/node-utility/Time';
 
+export function generateDotnetProgramCmd(programFile: File, args?: string[]): string {
+    // 在 x64 平台上，.NET编译生成的 包装程序 <my_program>.exe 无法在 arm64 平台运行
+    // 因此需要直接使用 dotnet 命令去直接执行程序的本体.
+    // 命令 "<my_program>.exe" 的等价替换是 "dotnet <my_program_dir>/<my_program>.dll"
+    if (platform.getArchId() == 'arm64') {
+        let dllpath = [programFile.dir, `${programFile.noSuffixName}.dll`].join('/');
+        let commandLine = `dotnet ${CmdLineHandler.quoteString(File.ToLocalPath(dllpath), '"')}`;
+        args?.forEach(p => {
+            commandLine += ' ' + CmdLineHandler.quoteString(p, '"');
+        });
+        return commandLine;
+    } else {
+        return CmdLineHandler.getCommandLine(programFile.noSuffixName, args || []);
+    }
+}
+
 export function timeStamp(): string {
     const time = Time.GetInstance().GetTimeInfo();
     return `${time.year}/${time.month.toString().padStart(2, '0')}/${time.date.toString().padStart(2, '0')}`