fix: use semicolon separator for LIB env var in Windows cross-compile

Author: claude

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-dotnet-deploy",
     "displayName": "Dotnet 部署工具",
     "description": "通过 SSH 将 .NET 应用程序部署到 Ubuntu/Linux 服务器",
-    "version": "0.1.58",
+    "version": "0.1.61",
     "publisher": "local",
     "repository": {
         "type": "git",

src/crossCompile/index.ts

@@ -9,5 +9,14 @@
 
 export * from './toolchain';
 export * from './zigWrapper';
-export * from './xwinSetup';
+export {
+    getDefaultXwinSdkPath,
+    getXwinSdkPath,
+    downloadWindowsSdk,
+    getWindowsCrossCompileArgs,
+    validateWindowsSdk,
+    getLldLinkPath,
+    getWindowsCrossCompileEnv,
+    cleanWindowsSdkCache,
+} from './xwinSetup';
 export * from './types';

src/crossCompile/xwinSetup.ts

@@ -137,6 +137,8 @@ export async function getWindowsCrossCompileArgs(runtime: string): Promise<{
     args: string[];
     env: Record<string, string>;
     error?: string;
+    /** 临时 props 文件路径，需要在构建后删除 */
+    tempPropsFile?: string;
 }> {
     const sdkPath = getXwinSdkPath();
     const splatPath = path.join(sdkPath, 'splat');
@@ -194,13 +196,9 @@ export async function getWindowsCrossCompileArgs(runtime: string): Promise<{
         sdkUcrtPath,
     ].filter(p => fs.existsSync(p));
 
-    // 通过 IlcAdditionalLinkArgs 传递链接器参数
-    // 使用分号分隔多个参数，避免空格被 MSBuild 误解
-    const linkerArgs = libPaths.map(p => `/LIBPATH:${p}`).join(';');
-    args.push(`-p:IlcAdditionalLinkArgs="${linkerArgs}"`);
-
-    // 构建 LIB 环境变量 - lld-link 需要这个来查找库
-    const libEnvPaths = libPaths.join(path.delimiter);
+    // 设置 LIB 环境变量
+    // 注意：lld-link 是 Windows 工具，期望使用分号 (;) 分隔路径，而不是 macOS 的冒号 (:)
+    const libEnvPaths = libPaths.join(';');
 
     // 添加 lld-link 到 PATH
     const brewPrefix = process.arch === 'arm64' ? '/opt/homebrew' : '/usr/local';
@@ -217,6 +215,123 @@ export async function getWindowsCrossCompileArgs(runtime: string): Promise<{
     return { success: true, args, env };
 }
 
+/**
+ * 临时 props 文件管理
+ */
+export interface TempPropsFileResult {
+    /** 创建的文件路径 */
+    propsFilePath: string;
+    /** 原始文件的备份路径（如果需要备份） */
+    backupFilePath?: string;
+    /** 是否需要恢复原始文件 */
+    needsRestore: boolean;
+}
+
+/**
+ * 创建临时的 Directory.Build.props 文件用于设置链接器参数
+ * @param projectDir 项目目录
+ * @param runtime 目标运行时
+ * @returns 创建的文件信息，或 null 如果失败
+ */
+export function createTempLinkerPropsFile(projectDir: string, runtime: string): TempPropsFileResult | null {
+    const sdkPath = getXwinSdkPath();
+    const splatPath = path.join(sdkPath, 'splat');
+    const arch = getWindowsArch(runtime);
+
+    const crtLibPath = path.join(splatPath, 'crt', 'lib', arch);
+    const sdkUmPath = path.join(splatPath, 'sdk', 'lib', 'um', arch);
+    const sdkUcrtPath = path.join(splatPath, 'sdk', 'lib', 'ucrt', arch);
+
+    const libPaths = [crtLibPath, sdkUmPath, sdkUcrtPath].filter(p => fs.existsSync(p));
+
+    if (libPaths.length === 0) {
+        return null;
+    }
+
+    // 构建 LinkerArg ItemGroup
+    const linkerArgs = libPaths.map(p => `    <LinkerArg Include="/LIBPATH:${p}" />`).join('\n');
+
+    // 必须使用 Directory.Build.props 这个名称，MSBuild 才会自动导入
+    const propsFileName = 'Directory.Build.props';
+    const propsFilePath = path.join(projectDir, propsFileName);
+    const backupFilePath = path.join(projectDir, 'Directory.Build.props.dotnet-deploy-backup');
+
+    let needsRestore = false;
+    let originalContent: string | null = null;
+
+    // 检查是否已存在 Directory.Build.props
+    if (fs.existsSync(propsFilePath)) {
+        // 备份现有文件
+        try {
+            originalContent = fs.readFileSync(propsFilePath, 'utf8');
+            fs.writeFileSync(backupFilePath, originalContent, 'utf8');
+            needsRestore = true;
+        } catch {
+            // 如果无法备份，不继续
+            return null;
+        }
+
+        // 尝试在现有文件中添加我们的 ItemGroup
+        // 查找 </Project> 结束标签并在之前插入
+        const insertIndex = originalContent.lastIndexOf('</Project>');
+        if (insertIndex !== -1) {
+            const newContent = originalContent.slice(0, insertIndex) +
+                `  <!-- Auto-generated by vscode-dotnet-deploy for cross-compilation -->
+  <ItemGroup Condition="'$(PublishAot)' == 'true' and '$(RuntimeIdentifier)' == '${runtime}'">
+${linkerArgs}
+  </ItemGroup>
+` + originalContent.slice(insertIndex);
+            try {
+                fs.writeFileSync(propsFilePath, newContent, 'utf8');
+                return { propsFilePath, backupFilePath, needsRestore };
+            } catch {
+                // 恢复原始文件
+                if (needsRestore) {
+                    fs.writeFileSync(propsFilePath, originalContent, 'utf8');
+                }
+                return null;
+            }
+        }
+    }
+
+    // 创建新的 Directory.Build.props 文件
+    const propsContent = `<?xml version="1.0" encoding="utf-8"?>
+<!-- Auto-generated by vscode-dotnet-deploy for cross-compilation -->
+<Project>
+  <ItemGroup Condition="'$(PublishAot)' == 'true' and '$(RuntimeIdentifier)' == '${runtime}'">
+${linkerArgs}
+  </ItemGroup>
+</Project>
+`;
+
+    try {
+        fs.writeFileSync(propsFilePath, propsContent, 'utf8');
+        return { propsFilePath, backupFilePath: needsRestore ? backupFilePath : undefined, needsRestore };
+    } catch {
+        return null;
+    }
+}
+
+/**
+ * 删除或恢复临时 props 文件
+ */
+export function removeTempLinkerPropsFile(result: TempPropsFileResult): void {
+    try {
+        if (result.needsRestore && result.backupFilePath && fs.existsSync(result.backupFilePath)) {
+            // 恢复原始文件
+            const originalContent = fs.readFileSync(result.backupFilePath, 'utf8');
+            fs.writeFileSync(result.propsFilePath, originalContent, 'utf8');
+            // 删除备份
+            fs.unlinkSync(result.backupFilePath);
+        } else if (fs.existsSync(result.propsFilePath)) {
+            // 删除创建的文件
+            fs.unlinkSync(result.propsFilePath);
+        }
+    } catch {
+        // 忽略错误
+    }
+}
+
 /**
  * 验证 Windows SDK 完整性
  */

src/publisher.ts

@@ -81,7 +81,7 @@ export async function publish(
         }
 
         // 获取交叉编译参数
-        const crossCompileResult = await prepareCrossCompileArgs(options.runtime, options.stripSymbols || false, outputChannel);
+        const crossCompileResult = await prepareCrossCompileArgs(options.runtime, options.stripSymbols || false, outputChannel, projectDir);
 
         if (crossCompileResult.success) {
             args.push(...crossCompileResult.args);
@@ -204,7 +204,8 @@ export async function publish(
 async function prepareCrossCompileArgs(
     runtime: string,
     stripSymbols: boolean,
-    outputChannel: vscode.OutputChannel
+    outputChannel: vscode.OutputChannel,
+    projectDir: string
 ): Promise<{ success: boolean; args: string[]; env?: Record<string, string>; error?: string }> {
     const target = getCrossCompileTarget(runtime);
 
@@ -229,6 +230,13 @@ async function prepareCrossCompileArgs(
             // 合并环境变量
             const baseEnv = getWindowsCrossCompileEnv();
             const combinedEnv = { ...baseEnv, ...result.env };
+
+            outputChannel.appendLine(`[Publisher] LIB env: ${combinedEnv['LIB'] || 'not set'}`);
+
+            // 先尝试只使用环境变量，不创建临时文件
+            // lld-link 应该能读取 LIB 环境变量（使用分号分隔）
+            // 如果失败，用户可以手动创建 Directory.Build.props 文件
+
             return { success: true, args: result.args, env: combinedEnv };
         } else {
             return { success: false, args: [], error: result.error };