From b29823c2263dad6b27da080121c5419fd67a21b0 Mon Sep 17 00:00:00 2001
From: FabianLars <github@fabianlars.de>
Date: Tue, 3 Feb 2026 15:53:43 +0100
Subject: [PATCH] fix merge conflicts

---
 crates/tauri-cli/src/bundle.rs         |  2 +-
 crates/tauri-cli/src/interface/rust.rs | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/tauri-cli/src/bundle.rs b/crates/tauri-cli/src/bundle.rs
index 495eb072c..718ce949b 100644
--- a/crates/tauri-cli/src/bundle.rs
+++ b/crates/tauri-cli/src/bundle.rs
@@ -147,7 +147,7 @@ pub fn command(options: Options, verbosity: u8) -> crate::Result<()> {
 
   let out_dir = app_settings.out_dir(&interface_options, dirs.tauri)?;
 
-  interface.on_before_bundle(&interface_options)?;
+  interface.on_before_bundle(&interface_options, &dirs)?;
 
   bundle(
     &options,
diff --git a/crates/tauri-cli/src/interface/rust.rs b/crates/tauri-cli/src/interface/rust.rs
index 21db1034a..c796530fd 100644
--- a/crates/tauri-cli/src/interface/rust.rs
+++ b/crates/tauri-cli/src/interface/rust.rs
@@ -182,12 +182,12 @@ impl Rust {
     self.app_settings.clone()
   }
 
-  pub fn on_before_bundle(&self, options: &Options) -> crate::Result<()> {
-    self.prepare(options)
+  pub fn on_before_bundle(&self, options: &Options, dirs: &Dirs) -> crate::Result<()> {
+    self.prepare(options, dirs)
   }
 
   pub fn build(&mut self, options: Options, dirs: &Dirs) -> crate::Result<PathBuf> {
-    self.prepare(&options)?;
+    self.prepare(&options, dirs)?;
     desktop::build(
       options,
       &self.app_settings,
@@ -205,7 +205,7 @@ impl Rust {
     on_exit: F,
     dirs: &Dirs,
   ) -> crate::Result<()> {
-    self.prepare(&options)?;
+    self.prepare(&options, dirs)?;
     let on_exit = Arc::new(on_exit);
 
     let mut run_args = Vec::new();
@@ -494,6 +494,7 @@ fn ensure_cef_directory_if_needed(
   config_features: Vec<String>,
   target: Option<&str>,
   features: &Vec<String>,
+  tauri_dir: &Path,
 ) -> crate::Result<()> {
   let mut merged_features = config_features;
   merged_features.extend(features.clone());
@@ -522,7 +523,7 @@ fn ensure_cef_directory_if_needed(
     // We also do this for builds since we can't codesign the global cache.
     #[cfg(windows)]
     Ok(Some(cef_dir)) => {
-      let out_dir = app_settings.out_dir(options)?;
+      let out_dir = app_settings.out_dir(options, tauri_dir)?;
       crate::helpers::fs::copy_dir_all(&cef_dir, &out_dir)?;
     }
     Err(e) => {
@@ -533,13 +534,14 @@ fn ensure_cef_directory_if_needed(
 }
 
 impl Rust {
-  fn prepare(&self, options: &Options) -> crate::Result<()> {
+  fn prepare(&self, options: &Options, dirs: &Dirs) -> crate::Result<()> {
     ensure_cef_directory_if_needed(
       &self.app_settings,
       options,
       self.config_features.clone(),
       options.target.as_deref(),
       &options.features,
+      dirs.tauri,
     )
   }