Skip to content

chore: merge remote-tracking branch '1.x' into v2#9479

Merged
amrbashir merged 16 commits intodevfrom
chore/v1-into-v2
Apr 18, 2024
Merged

chore: merge remote-tracking branch '1.x' into v2#9479
amrbashir merged 16 commits intodevfrom
chore/v1-into-v2

Conversation

@FabianLars
Copy link
Member

No description provided.

amrbashir and others added 16 commits February 27, 2024 18:48
Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>
* fix(bundler): escape potentially problematic strings in an XML (#9030)

- replace characters invalid in XML with their escaped form to properly bundle resources with such characters in their pathnames.

* change file
…s ignored (#8903)

* fix: taurignore ignoreing folders not working for watch

* docs: add to changes

* fix: panic: path is expected to be under the root

* Update taurignore-ignoring-folders-not-working-for-watch.md

* Update taurignore-ignoring-folders-not-working-for-watch.md
* fix(cli): migrate to stable features of `log` crate

* to_cow_str
Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>
* fix(core/path): remove suffix in basename only once

ref: #9064

* Update tooling/api/src/path.ts

---------

Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.app>
…9281)

* fix(bundler): Fix nsis resource paths on non-windows build systems.

* remove leftover from alternative
@amrbashir amrbashir changed the title chore: Merge remote-tracking branch 'origin/1.x' into v2 chore: merge remote-tracking branch '1.x' into v2 Apr 18, 2024
@amrbashir amrbashir merged commit e64b8f1 into dev Apr 18, 2024
@amrbashir amrbashir deleted the chore/v1-into-v2 branch April 18, 2024 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants