Skip to content

Commit a70e690

Browse files
apply version updates (#12425)
Co-authored-by: FabianLars <[email protected]>
1 parent 72748cc commit a70e690

File tree

16 files changed

+38
-32
lines changed

16 files changed

+38
-32
lines changed

.changes/fix-bundler-msi-install-dir-lookup.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changes/fix-bundler-wix-dlls.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changes/fix-nsis-webviewloaderdll.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changes/initialization_scripts_order.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/tauri-bundler/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## \[2.2.2]
4+
5+
### Bug Fixes
6+
7+
- [`72748cc45`](https://www.github.com/tauri-apps/tauri/commit/72748cc45cf670dd03c86c8deceb5942598f5ad9) ([#12365](https://www.github.com/tauri-apps/tauri/pull/12365) by [@don41382](https://www.github.com/tauri-apps/tauri/../../don41382)) Fixed an issue that caused the `.msi` installer not to lookup the `INSTALLDIR` set in the `nsis` installer.
8+
- [`cf771bf69`](https://www.github.com/tauri-apps/tauri/commit/cf771bf69aa26b62d11a54a69131c631505d8c55) ([#12402](https://www.github.com/tauri-apps/tauri/pull/12402) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused the .msi installer to not contain root resources when there were .dll files present in the target directory.
9+
- [`07ccdc499`](https://www.github.com/tauri-apps/tauri/commit/07ccdc499c3240e7240be3abf95ef2d7d00b2dc7) ([#12324](https://www.github.com/tauri-apps/tauri/pull/12324) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue leading to NSIS based installers to not contain the `WebView2Loader.dll` file when targetting `windows-gnu`.
10+
311
## \[2.2.1]
412

513
### Bug Fixes

crates/tauri-bundler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-bundler"
3-
version = "2.2.1"
3+
version = "2.2.2"
44
authors = [
55
"George Burton <[email protected]>",
66
"Tauri Programme within The Commons Conservancy",

crates/tauri-cli/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[2.2.5]
4+
5+
### Dependencies
6+
7+
- Upgraded to `[email protected]`
8+
39
## \[2.2.4]
410

511
### Bug Fixes

crates/tauri-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "tauri-cli"
3-
version = "2.2.4"
3+
version = "2.2.5"
44
authors = ["Tauri Programme within The Commons Conservancy"]
55
edition = "2021"
66
rust-version = "1.77.2"
@@ -47,7 +47,7 @@ sublime_fuzzy = "0.7"
4747
clap_complete = "4"
4848
clap = { version = "4", features = ["derive", "env"] }
4949
anyhow = "1"
50-
tauri-bundler = { version = "2.2.1", default-features = false, path = "../tauri-bundler" }
50+
tauri-bundler = { version = "2.2.2", default-features = false, path = "../tauri-bundler" }
5151
colored = "2"
5252
serde = { version = "1", features = ["derive"] }
5353
serde_json = { version = "1", features = ["preserve_order"] }

crates/tauri-cli/config.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "https://schema.tauri.app/config/2.2.2",
3+
"$id": "https://schema.tauri.app/config/2.2.3",
44
"title": "Config",
55
"description": "The Tauri configuration object.\n It is read from a file where you can define your frontend assets,\n configure the bundler and define a tray icon.\n\n The configuration file is generated by the\n [`tauri init`](https://v2.tauri.app/reference/cli/#init) command that lives in\n your Tauri application source directory (src-tauri).\n\n Once generated, you may modify it at will to customize your Tauri application.\n\n ## File Formats\n\n By default, the configuration is defined as a JSON file named `tauri.conf.json`.\n\n Tauri also supports JSON5 and TOML files via the `config-json5` and `config-toml` Cargo features, respectively.\n The JSON5 file name must be either `tauri.conf.json` or `tauri.conf.json5`.\n The TOML file name is `Tauri.toml`.\n\n ## Platform-Specific Configuration\n\n In addition to the default configuration file, Tauri can\n read a platform-specific configuration from `tauri.linux.conf.json`,\n `tauri.windows.conf.json`, `tauri.macos.conf.json`, `tauri.android.conf.json` and `tauri.ios.conf.json`\n (or `Tauri.linux.toml`, `Tauri.windows.toml`, `Tauri.macos.toml`, `Tauri.android.toml` and `Tauri.ios.toml` if the `Tauri.toml` format is used),\n which gets merged with the main configuration object.\n\n ## Configuration Structure\n\n The configuration is composed of the following objects:\n\n - [`app`](#appconfig): The Tauri configuration\n - [`build`](#buildconfig): The build configuration\n - [`bundle`](#bundleconfig): The bundle configurations\n - [`plugins`](#pluginconfig): The plugins configuration\n\n Example tauri.config.json file:\n\n ```json\n {\n \"productName\": \"tauri-app\",\n \"version\": \"0.1.0\",\n \"build\": {\n \"beforeBuildCommand\": \"\",\n \"beforeDevCommand\": \"\",\n \"devUrl\": \"../dist\",\n \"frontendDist\": \"../dist\"\n },\n \"app\": {\n \"security\": {\n \"csp\": null\n },\n \"windows\": [\n {\n \"fullscreen\": false,\n \"height\": 600,\n \"resizable\": true,\n \"title\": \"Tauri App\",\n \"width\": 800\n }\n ]\n },\n \"bundle\": {},\n \"plugins\": {}\n }\n ```",
66
"type": "object",

0 commit comments

Comments
 (0)