Skip to content

Commit 07ccdc4

Browse files
authored
fix(bundler/nsis): Include WebView2Loader.dll if found to match msi (#12324)
* fix(bundler/nsis): Include WebView2Loader.dll if found to match msi behavior * Update fix-nsis-webviewloaderdll.md * only include dll in gnu builds
1 parent d2c8f0e commit 07ccdc4

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
tauri-bundler: 'patch:bug'
3+
---
4+
5+
Fixed an issue leading to NSIS based installers to not contain the `WebView2Loader.dll` file when targetting `windows-gnu`.

crates/tauri-bundler/src/bundle/windows/nsis/mod.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,24 @@ fn association_description(
595595
type ResourcesMap = BTreeMap<PathBuf, (PathBuf, PathBuf)>;
596596
fn generate_resource_data(settings: &Settings) -> crate::Result<ResourcesMap> {
597597
let mut resources = ResourcesMap::new();
598+
598599
let cwd = std::env::current_dir()?;
599600

600601
let mut added_resources = Vec::new();
601602

603+
// Adding WebViewer2Loader.dll in case windows-gnu toolchain is used
604+
if settings.target().ends_with("-gnu") {
605+
let loader_path =
606+
dunce::simplified(&settings.project_out_directory().join("WebView2Loader.dll")).to_path_buf();
607+
if loader_path.exists() {
608+
added_resources.push(loader_path.clone());
609+
resources.insert(
610+
loader_path,
611+
(PathBuf::new(), PathBuf::from("WebView2Loader.dll")),
612+
);
613+
}
614+
}
615+
602616
for resource in settings.resource_files().iter() {
603617
let resource = resource?;
604618

0 commit comments

Comments
 (0)