diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json index c75ae23dd828..540673714d6f 100644 --- a/core/tauri-config-schema/schema.json +++ b/core/tauri-config-schema/schema.json @@ -2367,8 +2367,8 @@ "null" ] }, - "ensureWebview2Version": { - "description": "Ensure webview2 version to be newer than this version,\n if the user's webview2 is older than this version,\n the installer will trigger a webview2 update", + "minimumWebview2Version": { + "description": "Try to ensure that the WebView2 version is equal to or newer than this version,\n if the user's WebView2 is older than this version,\n the installer will try to trigger a WebView2 update.", "type": [ "string", "null" diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs index cfac86421e19..d91bcc810cec 100644 --- a/core/tauri-utils/src/config.rs +++ b/core/tauri-utils/src/config.rs @@ -838,11 +838,11 @@ pub struct NsisConfig { /// ``` #[serde(alias = "installer-hooks")] pub installer_hooks: Option, - /// Ensure webview2 version to be newer than this version, - /// if the user's webview2 is older than this version, - /// the installer will trigger a webview2 update + /// Try to ensure that the WebView2 version is equal to or newer than this version, + /// if the user's WebView2 is older than this version, + /// the installer will try to trigger a WebView2 update. #[serde(alias = "ensure-webview2-version")] - pub ensure_webview2_version: Option, + pub minimum_webview2_version: Option, } /// Install modes for the Webview2 runtime. diff --git a/tooling/bundler/src/bundle/settings.rs b/tooling/bundler/src/bundle/settings.rs index afa7b095fc74..7c262afb308a 100644 --- a/tooling/bundler/src/bundle/settings.rs +++ b/tooling/bundler/src/bundle/settings.rs @@ -457,10 +457,10 @@ pub struct NsisSettings { /// !macroend /// ``` pub installer_hooks: Option, - /// Ensure webview2 version to be newer than this version, - /// if the user's webview2 is older than this version, - /// the installer will trigger a webview2 update - pub ensure_webview2_version: Option, + /// Try to ensure that the WebView2 version is equal to or newer than this version, + /// if the user's WebView2 is older than this version, + /// the installer will try to trigger a WebView2 update. + pub minimum_webview2_version: Option, } /// The Custom Signing Command Settings for Windows exe diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 4f34eaaba381..079601bc1890 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -257,7 +257,7 @@ fn build_nsis_app_installer( if let Some(start_menu_folder) = &nsis.start_menu_folder { data.insert("start_menu_folder", to_json(start_menu_folder)); } - if let Some(minimum_webview2_version) = &nsis.ensure_webview2_version { + if let Some(minimum_webview2_version) = &nsis.minimum_webview2_version { data.insert( "minimum_webview2_version", to_json(minimum_webview2_version), diff --git a/tooling/cli/schema.json b/tooling/cli/schema.json index c75ae23dd828..540673714d6f 100644 --- a/tooling/cli/schema.json +++ b/tooling/cli/schema.json @@ -2367,8 +2367,8 @@ "null" ] }, - "ensureWebview2Version": { - "description": "Ensure webview2 version to be newer than this version,\n if the user's webview2 is older than this version,\n the installer will trigger a webview2 update", + "minimumWebview2Version": { + "description": "Try to ensure that the WebView2 version is equal to or newer than this version,\n if the user's WebView2 is older than this version,\n the installer will try to trigger a WebView2 update.", "type": [ "string", "null" diff --git a/tooling/cli/src/helpers/config.rs b/tooling/cli/src/helpers/config.rs index 14d09a62f9f3..a784611ad76f 100644 --- a/tooling/cli/src/helpers/config.rs +++ b/tooling/cli/src/helpers/config.rs @@ -107,7 +107,7 @@ pub fn nsis_settings(config: NsisConfig) -> tauri_bundler::NsisSettings { compression: config.compression, start_menu_folder: config.start_menu_folder, installer_hooks: config.installer_hooks, - ensure_webview2_version: config.ensure_webview2_version, + minimum_webview2_version: config.minimum_webview2_version, } }