[desktop] Update tauri (#1760)

desktop/tauri/src-tauri/Cargo.toml

@@ -12,21 +12,21 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc.7", features = [] }
+tauri-build = { version = "2.0.3", features = [] }
 
 [dependencies]
 # Tauri
-tauri = { version = "2.0.0-rc.8", features = ["tray-icon", "image-png", "config-json5", "devtools"] }
-tauri-plugin-shell = "2.0.0-rc"
-tauri-plugin-dialog = "2.0.0-rc"
-tauri-plugin-clipboard-manager = "2.0.0-rc"
-tauri-plugin-os = "2.0.0-rc"
-tauri-plugin-single-instance = "2.0.0-rc"
-tauri-plugin-notification = "2.0.0-rc"
-tauri-plugin-log = "2.0.0-rc"
-tauri-plugin-window-state = "2.0.0-rc"
+tauri = { version = "2.1.1", features = ["tray-icon", "image-png", "config-json5", "devtools"] }
+tauri-plugin-shell = "2.0.2"
+tauri-plugin-dialog = "2.0.3"
+tauri-plugin-clipboard-manager = "2.0.2"
+tauri-plugin-os = "2.0.1"
+tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-notification = "2.0.1"
+tauri-plugin-log = "2.0.2"
+tauri-plugin-window-state = "2.0.2"
 
-tauri-cli = "2.0.0-rc.8"
+tauri-cli = "2.1.0"
 clap = { version = "4" }
 
 # General

desktop/tauri/src-tauri/src/traymenu.rs

@@ -29,7 +29,7 @@ use crate::{
     portmaster::PortmasterExt,
     window::{create_main_window, may_navigate_to_ui, open_window},
 };
-use tauri_plugin_dialog::DialogExt;
+use tauri_plugin_dialog::{DialogExt, MessageDialogButtons};
 
 pub type AppIcon = TrayIcon<Wry>;
 
@@ -199,8 +199,10 @@ pub fn setup_tray_menu(
                 app.dialog()
                     .message("This does not stop the Portmaster system service")
                     .title("Do you really want to quit the user interface?")
-                    .ok_button_label("Yes, exit")
-                    .cancel_button_label("No")
+                    .buttons(MessageDialogButtons::OkCancelCustom(
+                        "Yes, exit".to_owned(),
+                        "No".to_owned(),
+                    ))
                     .show(move |answer| {
                         if answer {
                             // let _ = handle.emit("exit-requested", "");

desktop/tauri/src-tauri/templates/main.wxs

@@ -139,7 +139,7 @@
                 {{/each~}}
             </Component>
             <Component Id="Path" Guid="{{path_component_guid}}" Win64="$(var.Win64)">
-                <File Id="Path" Source="{{app_exe_source}}" KeyPath="yes" Checksum="yes"/>
+                <File Id="Path" Source="{{main_binary_path}}" KeyPath="yes" Checksum="yes"/>
                 {{#each file_associations as |association| ~}}
                 {{#each association.ext as |ext| ~}}
                 <ProgId Id="{{../../product_name}}.{{ext}}" Advertise="yes" Description="{{association.description}}">

desktop/tauri/src-tauri/templates/main_original.wxs

@@ -139,7 +139,7 @@
                 {{/each~}}
             </Component>
             <Component Id="Path" Guid="{{path_component_guid}}" Win64="$(var.Win64)">
-                <File Id="Path" Source="{{app_exe_source}}" KeyPath="yes" Checksum="yes"/>
+                <File Id="Path" Source="{{main_binary_path}}" KeyPath="yes" Checksum="yes"/>
                 {{#each file_associations as |association| ~}}
                 {{#each association.ext as |ext| ~}}
                 <ProgId Id="{{../../product_name}}.{{ext}}" Advertise="yes" Description="{{association.description}}">