Apply Version Updates From Current Changes (v1) (#8377)

Co-authored-by: amrbashir <amrbashir@users.noreply.github.com>

.github/workflows/publish-cli-js.yml

@@ -297,14 +297,10 @@ jobs:
       - name: List packages
         run: ls -R .
         shell: bash
-      - name: Install system dependencies
-        run: |
-          apk add openssl-dev musl-dev glib-dev cairo-dev pkgconfig gdk-pixbuf-dev webkit2gtk-dev curl gtk+3.0-dev
       - name: Setup and run tests
         run: |
           yarn tauri --help
           ls -la
-      # TODO: fix this test: https://github.com/tauri-apps/tauri/runs/5145729140?check_suite_focus=true#step:9:704
       #- name: Setup and run tests
       #  run: |
       #    rustup install stable

core/tauri-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[1.5.3]
+
+### New Features
+
+- [`b3e53e72`](https://www.github.com/tauri-apps/tauri/commit/b3e53e7243311a2659b7569dddc20c56ac9f9d8e)([#8288](https://www.github.com/tauri-apps/tauri/pull/8288)) Added `Assets::iter` to iterate on all embedded assets.
+
 ## \[1.5.0]
 
 ### New Features

core/tauri-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-utils"
-version = "1.5.0"
+version = "1.5.1"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 license = "Apache-2.0 OR MIT"
 homepage = "https://tauri.app"

tooling/api/package.json

@@ -28,7 +28,7 @@
   "scripts": {
     "build": "rollup -c --configPlugin typescript",
     "npm-pack": "yarn build && cd ./dist && npm pack",
-    "npm-publish": "yarn build && cd ./dist && yarn publish --access public --loglevel silly --tag next",
+    "npm-publish": "yarn build && cd ./dist && yarn publish --access public --loglevel silly",
     "ts:check": "tsc -noEmit",
     "lint": "eslint --ext ts \"./src/**/*.ts\"",
     "lint:fix": "eslint --fix --ext ts \"./src/**/*.ts\"",

tooling/bundler/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[1.4.7]
+
+### Bug Fixes
+
+- [`777ddf43`](https://www.github.com/tauri-apps/tauri/commit/777ddf434a966966dc8918322c1ec9ee3f822ee2)([#8376](https://www.github.com/tauri-apps/tauri/pull/8376)) Unset `NSISDIR` and `NSISCONFDIR` when running `makensis.exe` so it doesn't conflict with NSIS installed by the user.
+- [`5ff9d459`](https://www.github.com/tauri-apps/tauri/commit/5ff9d4592a6dd8fc93165012ef367d78ea06e4ce)([#8390](https://www.github.com/tauri-apps/tauri/pull/8390)) NSIS perUser installers will now only check if the app is running on the current user.
+
 ## \[1.4.6]
 
 ### Bug Fixes

tooling/bundler/Cargo.toml

@@ -2,7 +2,7 @@ workspace = { }
 
 [package]
 name = "tauri-bundler"
-version = "1.4.6"
+version = "1.4.7"
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "Tauri Programme within The Commons Conservancy"

tooling/bundler/src/bundle/windows/nsis.rs

@@ -37,8 +37,8 @@ const NSIS_URL: &str =
 const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4";
 const NSIS_APPLICATIONID_URL: &str = "https://github.com/tauri-apps/binary-releases/releases/download/nsis-plugins-v0/NSIS-ApplicationID.zip";
 const NSIS_TAURI_UTILS: &str =
-  "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.2.1/nsis_tauri_utils.dll";
-const NSIS_TAURI_UTILS_SHA1: &str = "53A7CFAEB6A4A9653D6D5FBFF02A3C3B8720130A";
+  "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.2.2/nsis_tauri_utils.dll";
+const NSIS_TAURI_UTILS_SHA1: &str = "16DF1D1A5B4D5DF3859447279C55BE36D4109DFB";
 
 #[cfg(target_os = "windows")]
 const NSIS_REQUIRED_FILES: &[&str] = &[
@@ -457,6 +457,8 @@ fn build_nsis_app_installer(
       _ => "-V4",
     })
     .arg(installer_nsi_path)
+    .env_remove("NSISDIR")
+    .env_remove("NSISCONFDIR")
     .current_dir(output_path)
     .piped()
     .context("error running makensis.exe")?;

tooling/bundler/src/bundle/windows/templates/installer.nsi

@@ -493,13 +493,21 @@ Section WebView2
 SectionEnd
 
 !macro CheckIfAppIsRunning
-  nsis_tauri_utils::FindProcess "${MAINBINARYNAME}.exe"
+  !if "${INSTALLMODE}" == "currentUser"
+    nsis_tauri_utils::FindProcessCurrentUser "${MAINBINARYNAME}.exe"
+  !else
+    nsis_tauri_utils::FindProcess "${MAINBINARYNAME}.exe"
+  !endif
   Pop $R0
   ${If} $R0 = 0
       IfSilent kill 0
       ${IfThen} $PassiveMode != 1 ${|} MessageBox MB_OKCANCEL "$(appRunningOkKill)" IDOK kill IDCANCEL cancel ${|}
       kill:
-        nsis_tauri_utils::KillProcess "${MAINBINARYNAME}.exe"
+        !if "${INSTALLMODE}" == "currentUser"
+          nsis_tauri_utils::KillProcessCurrentUser "${MAINBINARYNAME}.exe"
+        !else
+          nsis_tauri_utils::KillProcess "${MAINBINARYNAME}.exe"
+        !endif
         Pop $R0
         Sleep 500
         ${If} $R0 = 0

tooling/cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[1.5.8]
+
+### Dependencies
+
+- Upgraded to `tauri-bundler@1.4.7`
+
 ## \[1.5.7]
 
 ### Bug Fixes

tooling/cli/Cargo.toml

@@ -3,7 +3,7 @@ members = [ "node" ]
 
 [package]
 name = "tauri-cli"
-version = "1.5.7"
+version = "1.5.8"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 rust-version = "1.60"
@@ -42,7 +42,7 @@ path = "src/main.rs"
 clap_complete = "4"
 clap = { version = "4.4", features = [ "derive" ] }
 anyhow = "1.0"
-tauri-bundler = { version = "1.4.6", path = "../bundler", default-features = false }
+tauri-bundler = { version = "1.4.7", path = "../bundler", default-features = false }
 colored = "2.0"
 once_cell = "1"
 serde = { version = "1.0", features = [ "derive" ] }

tooling/cli/metadata.json

@@ -1,6 +1,6 @@
 {
   "cli.js": {
-    "version": "1.5.7",
+    "version": "1.5.8",
     "node": ">= 10.0.0"
   },
   "tauri": "1.5.3",

tooling/cli/node/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[1.5.8]
+
+### Dependencies
+
+- Upgraded to `tauri-cli@1.5.8`
+
 ## \[1.5.7]
 
 ### Bug Fixes

tooling/cli/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",