changes requested

tr3ysmith · Feb 8, 2024 · 7d36fe9 · 7d36fe9
1 parent 5ac257b
commit 7d36fe9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/tooling/bundler/src/bundle/windows/msi/wix.rs b/tooling/bundler/src/bundle/windows/msi/wix.rs
@@ -788,6 +788,7 @@ pub fn build_wix_app_installer(
     if let Some(sign_params) = settings.sign_params() {
       sign_params.sign(&msi_path)?;
     }
+    output_paths.push(msi_path);
   }
 
   Ok(output_paths)

diff --git a/tooling/bundler/src/bundle/windows/sign.rs b/tooling/bundler/src/bundle/windows/sign.rs
@@ -26,14 +26,6 @@ pub enum SignParams {
 }
 
 impl SignParams {
-  /// Locates the signing tool executable
-  fn locate_tool(&self) -> crate::Result<PathBuf> {
-    match self {
-      SignParams::SignTool(_) => locate_signtool(),
-      SignParams::Azure(_) => locate_azuresigntool(),
-    }
-  }
-
   /// Check if binary is already signed.
   /// Used to skip sidecar binaries that are already signed.
   /// If we're using AzureSignTool, we'll always return false because we can't check if it's already signed.

diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml
@@ -6,7 +6,6 @@ name = "tauri-cli"
 version = "1.5.9"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
-rust-version = "1.72"
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
 homepage = "https://tauri.app"

diff --git a/tooling/cli/ENVIRONMENT_VARIABLES.md b/tooling/cli/ENVIRONMENT_VARIABLES.md
@@ -32,6 +32,13 @@ These environment variables are inputs to the CLI which may have an equivalent C
 - `APPLE_API_KEY_PATH` - path to the API key `.p8` file. If not specified, the bundler searches the following directories in sequence for a private key file with the name of 'AuthKey_<api_key>.p8': './private_keys', '~/private_keys', '~/.private_keys', and '~/.appstoreconnect/private_keys'.
 - `APPLE_SIGNING_IDENTITY` — The identity used to code sign. Overwrites `tauri.conf.json > tauri > bundle > macOS > signingIdentity`.
 - `APPLE_PROVIDER_SHORT_NAME` — If your Apple ID is connected to multiple teams, you have to specify the provider short name of the team you want to use to notarize your app. Overwrites `tauri.conf.json > tauri > bundle > macOS > providerShortName`.
+- `AZURE_CERTIFICATE_NAME` - If using `azuresigntool`, This is the name of the certificate in Azure Key Vault that will be used to sign the code.
+- `AZURE_KEYVAULT_URL` - This will be the URL of your Azure Key Vault. You can locate this under the 'Overview' page on Azure Key Vault. Required if `AZURE_CERTIFICATE_NAME` is specified.
+- `AZURE_CLIENT_ID` - The client ID of the app registration in Azure that has access to Azure Key Vault. Required if `AZURE_CERTIFICATE_NAME` is specified.
+- `AZURE_CLIENT_SECRET` - The client secret of the app registration in Azure that has access to Azure Key Vault. Required if `AZURE_CERTIFICATE_NAME` is specified.
+- `AZURE_TENANT_ID` - Your azure tenant ID. Required if `AZURE_CERTIFICATE_NAME` is specified.
+- `AZURE_DESCRIPTION_URL` - This is the URL of a website to append to the code signing when using `azuresigntool`. This is optional.
+- `AZURE_TIMESTAMP_URL` - A Timestamp server URL for your certificate in RFC3161 format. This is used for `azuresigntool`. This can be optained from your certificate issuer. This is optional.
 - `CI` — If set, the CLI will run in CI mode and won't require any user interaction.
 
 ### Tauri CLI Hook Commands