Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump DBus stack #15568

Merged
Merged

Conversation

affederaffe
Copy link
Contributor

What does the pull request do?

Bump Tmds.DBus.Protocol and Tmds.DBus.SourceGenerator.
This uses the "official" Variant system instead of the SourceGenerator provided one (which was removed).

What is the current behavior?

What is the updated/expected behavior with this PR?

How was the solution implemented (if it's not obvious)?

Checklist

Breaking changes

None

Obsoletions / Deprecations

None

Fixed issues

None

- Use new Variant system
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0047931-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@cla-avalonia
Copy link
Collaborator

cla-avalonia commented Apr 30, 2024

  • All contributors have signed the CLA.

@affederaffe
Copy link
Contributor Author

@cla-avalonia agree

@maxkatz6 maxkatz6 requested a review from jmacato May 1, 2024 02:39
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0047972-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

Copy link
Member

@jmacato jmacato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested LGTM

@jmacato jmacato added this pull request to the merge queue May 1, 2024
Merged via the queue into AvaloniaUI:master with commit 5956ae7 May 1, 2024
11 checks passed
@maxkatz6 maxkatz6 added the backport-candidate-11.1.x Consider this PR for backporting to 11.1 branch label May 2, 2024
@kekekeks
Copy link
Member

kekekeks commented May 8, 2024

System.InvalidOperationException: Type UInt32 can not be retrieved as Array/Struct.
   at Tmds.DBus.Protocol.VariantValue.ThrowCannotRetrieveAs(String from, IEnumerable`1 to)
   at Tmds.DBus.Protocol.VariantValue.ThrowCannotRetrieveAs(VariantValueType from, VariantValueType[] to)
   at Tmds.DBus.Protocol.VariantValue.GetItem(Int32 i)
   at Avalonia.FreeDesktop.DBusPlatformSettings.TryGetThemeVariantAsync()

Can we please actually check returned types instead of assuming those? We are dealing with Linux DEs after all, those aren't really known for following specs.

jmacato added a commit that referenced this pull request May 8, 2024
@maxkatz6 maxkatz6 removed the backport-candidate-11.1.x Consider this PR for backporting to 11.1 branch label May 8, 2024
github-merge-queue bot pushed a commit that referenced this pull request May 8, 2024
jmacato pushed a commit that referenced this pull request Jun 7, 2024
* Bump DBus stack
- Use new Variant system

* Fix merge issues

(cherry picked from commit 5956ae7)
jmacato added a commit that referenced this pull request Jun 8, 2024
jmacato added a commit that referenced this pull request Jun 25, 2024
jmacato added a commit that referenced this pull request Jun 26, 2024
jmacato added a commit that referenced this pull request Jun 26, 2024
* Reapply "Bump DBus stack (#15568)" (#15656)

This reverts commit e787bb4.

* Bump dbus libs versions again

* Fix PathHandler usages

* Add suppression for FreeDesktop lib

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
jmacato added a commit that referenced this pull request Jun 26, 2024
* Add private app init

* add todo

* update TrayIcon.cs

* add debugging message for now

* Reapply "Bump DBus stack (#15568)" (#15656)

This reverts commit e787bb4.

* update dbus stuff

* DBus init and usage fixes

* revert application class changes

* Revert "DBus init and usage fixes"

This reverts commit 833da08.

* dont dispose the thrown exception on DBusTrayIconImpl.cs

* Update src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs

Co-authored-by: Max Katz <maxkatz6@outlook.com>

---------

Co-authored-by: Nikita Tsukanov <keks9n@gmail.com>
Co-authored-by: Max Katz <maxkatz6@outlook.com>
kekekeks added a commit that referenced this pull request Jun 30, 2024
kekekeks added a commit that referenced this pull request Jun 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants