Merge pull request #22592 from ramezgerges/tmds_generator

Author: agneszitte

src/Uno.UI.Runtime.Skia.X11/DBus/Desktop.DBus.cs

@@ -0,0 +1,10 @@
+namespace Uno.WinUI.Runtime.Skia.X11.DBus
+{
+	// From https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Request.html#signals
+	enum Response : uint
+	{
+		Success = 0,
+		UserCancelled = 1,
+		Other = 2
+	}
+}

src/Uno.UI.Runtime.Skia.X11/DBus/Response.cs

@@ -51,7 +51,7 @@ public async Task Init()
 	{
 		try
 		{
-			var sessionsAddressBus = Address.Session;
+			var sessionsAddressBus = DBusAddress.Session;
 			if (sessionsAddressBus is null)
 			{
 				if (this.Log().IsEnabled(LogLevel.Error))
@@ -61,10 +61,10 @@ public async Task Init()
 				return;
 			}
 
-			var connection = new Connection(sessionsAddressBus);
+			var connection = new DBusConnection(sessionsAddressBus);
 			await connection.ConnectAsync();
 
-			var desktopService = new DesktopService(connection, Service);
+			var desktopService = new DBusService(connection, Service);
 			var settings = desktopService.CreateSettings(ObjectPath);
 
 			var version = await settings.GetVersionAsync();

src/Uno.UI.Runtime.Skia.X11/Helpers/Theming/LinuxSystemThemeHelper.cs

@@ -19,7 +19,6 @@
 namespace Uno.WinUI.Runtime.Skia.X11;
 
 // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.FileChooser.html
-// https://github.com/tmds/Tmds.DBus/blob/main/docs/modelling.md#argument-types
 
 /// <summary>
 /// This class implements v3 of the org.freedesktop.portal.FileChooser portal for files as defined by freedesktop.org.
@@ -45,7 +44,7 @@ public async Task<IReadOnlyList<StorageFile>> PickMultipleFilesAsync(Cancellatio
 
 	public async Task<IReadOnlyList<string>> PickFilesAsync(CancellationToken token, bool multiple, bool directory)
 	{
-		var sessionsAddressBus = Address.Session;
+		var sessionsAddressBus = DBusAddress.Session;
 		if (sessionsAddressBus is null)
 		{
 			if (this.Log().IsEnabled(LogLevel.Error))
@@ -60,7 +59,7 @@ public async Task<IReadOnlyList<string>> PickFilesAsync(CancellationToken token,
 			return ImmutableList<string>.Empty;
 		}
 
-		using var connection = new Connection(sessionsAddressBus);
+		using var connection = new DBusConnection(sessionsAddressBus);
 		var connectionTcs = new TaskCompletionSource();
 		// ConnectAsync calls ConfigureAwait(false), so we need this TCS dance to make the continuation continue on the UI thread
 		_ = connection.ConnectAsync().AsTask().ContinueWith(_ => connectionTcs.TrySetResult(), token);
@@ -77,7 +76,7 @@ public async Task<IReadOnlyList<string>> PickFilesAsync(CancellationToken token,
 
 		try
 		{
-			var desktopService = new DesktopService(connection, Service);
+			var desktopService = new DBusService(connection, Service);
 			var chooser = desktopService.CreateFileChooser(ObjectPath);
 
 			if (token.IsCancellationRequested)

src/Uno.UI.Runtime.Skia.X11/Storage/Pickers/LinuxFilePickerExtension.cs

@@ -18,7 +18,6 @@
 namespace Uno.WinUI.Runtime.Skia.X11;
 
 // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.FileChooser.html
-// https://github.com/tmds/Tmds.DBus/blob/main/docs/modelling.md#argument-types
 
 /// <summary>
 /// This class implements v4 of the org.freedesktop.portal.FileChooser portal for files as defined by freedesktop.org
@@ -32,7 +31,7 @@ internal class LinuxFileSaverExtension(FileSavePicker picker) : IFileSavePickerE
 
 	public async Task<StorageFile?> PickSaveFileAsync(CancellationToken token)
 	{
-		var sessionsAddressBus = Address.Session;
+		var sessionsAddressBus = DBusAddress.Session;
 		if (sessionsAddressBus is null)
 		{
 			if (this.Log().IsEnabled(LogLevel.Error))
@@ -47,7 +46,7 @@ internal class LinuxFileSaverExtension(FileSavePicker picker) : IFileSavePickerE
 			return null;
 		}
 
-		using var connection = new Connection(sessionsAddressBus);
+		using var connection = new DBusConnection(sessionsAddressBus);
 		var connectionTcs = new TaskCompletionSource();
 		// ConnectAsync calls ConfigureAwait(false), so we need this TCS dance to make the continuation continue on the UI thread
 		_ = connection.ConnectAsync().AsTask().ContinueWith(_ => connectionTcs.TrySetResult(), token);
@@ -64,7 +63,7 @@ internal class LinuxFileSaverExtension(FileSavePicker picker) : IFileSavePickerE
 
 		try
 		{
-			var desktopService = new DesktopService(connection, Service);
+			var desktopService = new DBusService(connection, Service);
 			var chooser = desktopService.CreateFileChooser(ObjectPath);
 
 			if (token.IsCancellationRequested)

src/Uno.UI.Runtime.Skia.X11/Storage/Pickers/LinuxFileSaverExtension.cs

@@ -22,7 +22,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Tmds.DBus.Protocol" Version="0.21.2" />
+		<PackageReference Include="Tmds.DBus.Protocol" Version="0.90.2" />
+		<PackageReference Include="Tmds.DBus.Generator" Version="0.90.2" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<AdditionalFiles Include="dbus-interfaces/org.freedesktop.portal.FileChooser.xml" Namespace="Uno.WinUI.Runtime.Skia.X11.DBus" GenerateDBusTypes="true" />
+		<AdditionalFiles Include="dbus-interfaces/org.freedesktop.portal.Request.xml" Namespace="Uno.WinUI.Runtime.Skia.X11.DBus" GenerateDBusTypes="true" />
+		<AdditionalFiles Include="dbus-interfaces/org.freedesktop.portal.Settings.xml" Namespace="Uno.WinUI.Runtime.Skia.X11.DBus" GenerateDBusTypes="true" />
 	</ItemGroup>
 
 	<ItemGroup>