diff --git a/.github/workflows/release-tauri.yml b/.github/workflows/release-tauri.yml index df3efc3e..85c81737 100644 --- a/.github/workflows/release-tauri.yml +++ b/.github/workflows/release-tauri.yml @@ -271,7 +271,11 @@ jobs: $msiPath = Join-Path $bundleDir "OpenLess_${version}_x64_en-US.msi" Push-Location $appRoot try { - & $light -nologo -ext WixUIExtension -ext WixUtilExtension -loc $locale -out $msiPath $mainObj $imeObj + # -sice:ICE80:x86 IME DLL 与 x64 一同打进 INSTALLDIR\windows-ime\, + # 这是 32 位组件落在 64 位 Directory 下的合法场景(DLL 路径绝对指向, + # 不依赖 SysWOW64 重定向)。Tauri 自身没有暴露 light 透传参数,所以 + # 必须在这里抑制,否则 LGHT0204 必失败。 + & $light -nologo -sice:ICE80 -ext WixUIExtension -ext WixUtilExtension -loc $locale -out $msiPath $mainObj $imeObj if ($LASTEXITCODE -ne 0) { throw "light.exe relink failed with exit $LASTEXITCODE" } } finally { Pop-Location diff --git a/openless-all/app/package-lock.json b/openless-all/app/package-lock.json index 1f96a64b..ed870da0 100644 --- a/openless-all/app/package-lock.json +++ b/openless-all/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "openless-app", - "version": "1.2.16", + "version": "1.2.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openless-app", - "version": "1.2.16", + "version": "1.2.17", "dependencies": { "@tauri-apps/api": "^2.1.1", "@tauri-apps/plugin-autostart": "^2.5.1", diff --git a/openless-all/app/package.json b/openless-all/app/package.json index 758e6bf4..44440af5 100644 --- a/openless-all/app/package.json +++ b/openless-all/app/package.json @@ -1,7 +1,7 @@ { "name": "openless-app", "private": true, - "version": "1.2.16", + "version": "1.2.17", "type": "module", "scripts": { "dev": "vite", diff --git a/openless-all/app/scripts/windows-package-msvc.ps1 b/openless-all/app/scripts/windows-package-msvc.ps1 index ea9e84f0..baff9663 100644 --- a/openless-all/app/scripts/windows-package-msvc.ps1 +++ b/openless-all/app/scripts/windows-package-msvc.ps1 @@ -175,7 +175,11 @@ function Repair-TauriMsiBundle { Remove-Item -LiteralPath $msiPath -Force -ErrorAction SilentlyContinue $light = Find-WixTool "light.exe" - & $light -nologo -ext WixUIExtension -ext WixUtilExtension -loc $locale -out $msiPath $mainObject $imeObject + # -sice:ICE80:x86 IME DLL 与 x64 一起装进 INSTALLDIR\windows-ime\, + # 32-bit Component 落在 64-bit Directory 下是 ICE80 的告警,但本场景路径 + # 绝对指向、不依赖 SysWOW64 重定向,是 Microsoft 文档允许的合法用法。 + # 与 .github/workflows/release-tauri.yml 的 light 调用保持一致。 + & $light -nologo -sice:ICE80 -ext WixUIExtension -ext WixUtilExtension -loc $locale -out $msiPath $mainObject $imeObject if ($LASTEXITCODE -ne 0) { throw "WiX light.exe failed with exit code $LASTEXITCODE." } diff --git a/openless-all/app/src-tauri/Cargo.lock b/openless-all/app/src-tauri/Cargo.lock index e55610d4..6ddee10a 100644 --- a/openless-all/app/src-tauri/Cargo.lock +++ b/openless-all/app/src-tauri/Cargo.lock @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "openless" -version = "1.2.16" +version = "1.2.17" dependencies = [ "anyhow", "arboard", diff --git a/openless-all/app/src-tauri/Cargo.toml b/openless-all/app/src-tauri/Cargo.toml index 5c36ec16..f3b72c47 100644 --- a/openless-all/app/src-tauri/Cargo.toml +++ b/openless-all/app/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openless" -version = "1.2.16" +version = "1.2.17" description = "OpenLess — local voice input that types where your cursor is" authors = ["OpenLess"] edition = "2021" diff --git a/openless-all/app/src-tauri/tauri.conf.json b/openless-all/app/src-tauri/tauri.conf.json index 1a051987..5b667e4e 100644 --- a/openless-all/app/src-tauri/tauri.conf.json +++ b/openless-all/app/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "OpenLess", - "version": "1.2.16", + "version": "1.2.17", "identifier": "com.openless.app", "build": { "beforeDevCommand": "npm run dev",