Эх сурвалжийг харах

chore: rename webview2 offline installer guid consts for more clarity (#8001)

Amr Bashir 1 жил өмнө
parent
commit
d6e10e216e

+ 4 - 4
tooling/bundler/src/bundle/windows/msi/wix.rs

@@ -11,8 +11,8 @@ use crate::bundle::{
     sign::try_sign,
     util::{
       download, download_and_verify, extract_zip, HashAlgorithm, WEBVIEW2_BOOTSTRAPPER_URL,
-      WEBVIEW2_X64_INSTALLER_GUID, WEBVIEW2_X86_INSTALLER_GUID, WIX_OUTPUT_FOLDER_NAME,
-      WIX_UPDATER_OUTPUT_FOLDER_NAME,
+      WEBVIEW2_X64_OFFLINE_INSTALLER_GUID, WEBVIEW2_X86_OFFLINE_INSTALLER_GUID,
+      WIX_OUTPUT_FOLDER_NAME, WIX_UPDATER_OUTPUT_FOLDER_NAME,
     },
   },
 };
@@ -485,9 +485,9 @@ pub fn build_wix_app_installer(
     }
     WebviewInstallMode::OfflineInstaller { silent: _ } => {
       let guid = if arch == "x64" {
-        WEBVIEW2_X64_INSTALLER_GUID
+        WEBVIEW2_X64_OFFLINE_INSTALLER_GUID
       } else {
-        WEBVIEW2_X86_INSTALLER_GUID
+        WEBVIEW2_X86_OFFLINE_INSTALLER_GUID
       };
       let offline_installer_path = dirs_next::cache_dir()
         .unwrap()

+ 4 - 4
tooling/bundler/src/bundle/windows/nsis.rs

@@ -9,8 +9,8 @@ use crate::{
     common::CommandExt,
     windows::util::{
       download, download_and_verify, extract_zip, HashAlgorithm, NSIS_OUTPUT_FOLDER_NAME,
-      NSIS_UPDATER_OUTPUT_FOLDER_NAME, WEBVIEW2_BOOTSTRAPPER_URL, WEBVIEW2_X64_INSTALLER_GUID,
-      WEBVIEW2_X86_INSTALLER_GUID,
+      NSIS_UPDATER_OUTPUT_FOLDER_NAME, WEBVIEW2_BOOTSTRAPPER_URL,
+      WEBVIEW2_X64_OFFLINE_INSTALLER_GUID, WEBVIEW2_X86_OFFLINE_INSTALLER_GUID,
     },
   },
   Settings,
@@ -367,9 +367,9 @@ fn build_nsis_app_installer(
     }
     WebviewInstallMode::OfflineInstaller { silent: _ } => {
       let guid = if arch == "x64" {
-        WEBVIEW2_X64_INSTALLER_GUID
+        WEBVIEW2_X64_OFFLINE_INSTALLER_GUID
       } else {
-        WEBVIEW2_X86_INSTALLER_GUID
+        WEBVIEW2_X86_OFFLINE_INSTALLER_GUID
       };
       let offline_installer_path = tauri_tools_path
         .join("Webview2OfflineInstaller")

+ 2 - 2
tooling/bundler/src/bundle/windows/util.rs

@@ -13,8 +13,8 @@ use sha2::Digest;
 use zip::ZipArchive;
 
 pub const WEBVIEW2_BOOTSTRAPPER_URL: &str = "https://go.microsoft.com/fwlink/p/?LinkId=2124703";
-pub const WEBVIEW2_X86_INSTALLER_GUID: &str = "2c122012-898d-4a69-9ab6-aa50bbe81031";
-pub const WEBVIEW2_X64_INSTALLER_GUID: &str = "0af26c79-02f0-4f06-a12d-116bc05ca860";
+pub const WEBVIEW2_X86_OFFLINE_INSTALLER_GUID: &str = "2c122012-898d-4a69-9ab6-aa50bbe81031";
+pub const WEBVIEW2_X64_OFFLINE_INSTALLER_GUID: &str = "0af26c79-02f0-4f06-a12d-116bc05ca860";
 pub const NSIS_OUTPUT_FOLDER_NAME: &str = "nsis";
 pub const NSIS_UPDATER_OUTPUT_FOLDER_NAME: &str = "nsis-updater";
 pub const WIX_OUTPUT_FOLDER_NAME: &str = "msi";