From 78b4a5a8521a498ea10affe926f5a31ee82d8a4e Mon Sep 17 00:00:00 2001 From: busec0 Date: Tue, 1 Apr 2025 02:44:02 +0300 Subject: [PATCH 1/3] Add Windows support --- DittoHeartbeat/DittoHeartbeat.csproj | 2 +- DittoPresenceViewer/DittoPresenceViewer.csproj | 3 +-- SampleApp/MauiProgram.cs | 12 ++++++++++-- SampleApp/SampleApp.csproj | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/DittoHeartbeat/DittoHeartbeat.csproj b/DittoHeartbeat/DittoHeartbeat.csproj index 628680d..fdc6c76 100644 --- a/DittoHeartbeat/DittoHeartbeat.csproj +++ b/DittoHeartbeat/DittoHeartbeat.csproj @@ -1,7 +1,7 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0 enable enable diff --git a/DittoPresenceViewer/DittoPresenceViewer.csproj b/DittoPresenceViewer/DittoPresenceViewer.csproj index 0aa7ebf..53afc09 100644 --- a/DittoPresenceViewer/DittoPresenceViewer.csproj +++ b/DittoPresenceViewer/DittoPresenceViewer.csproj @@ -1,8 +1,7 @@ - net8.0-android;net8.0-ios;net8.0-maccatalyst - + net8.0-android;net8.0-ios;net8.0-maccatalyst;net8.0-windows10.0.19041.0 true true enable diff --git a/SampleApp/MauiProgram.cs b/SampleApp/MauiProgram.cs index 8543960..e45750f 100644 --- a/SampleApp/MauiProgram.cs +++ b/SampleApp/MauiProgram.cs @@ -31,9 +31,17 @@ public static MauiApp CreateMauiApp() private static Ditto SetupDitto() { - var id = DittoIdentity.OnlinePlayground("", "", false); + var appId = ""; + var id = DittoIdentity.OnlinePlayground(appId, "", true); + + var ditto = new Ditto(id, Path.Combine(FileSystem.Current.AppDataDirectory, "ditto")); + + var config = ditto.TransportConfig; + config.Connect.WebsocketUrls.Add($"wss://{appId}.cloud.ditto.live"); + config.EnableAllPeerToPeer(); + + ditto.TransportConfig = config; - var ditto = new Ditto(id); ditto.DisableSyncWithV3(); ditto.StartSync(); diff --git a/SampleApp/SampleApp.csproj b/SampleApp/SampleApp.csproj index 89a2027..f03fdf8 100644 --- a/SampleApp/SampleApp.csproj +++ b/SampleApp/SampleApp.csproj @@ -2,7 +2,7 @@ net8.0-android;net8.0-ios;net8.0-maccatalyst - + $(TargetFrameworks);net8.0-windows10.0.19041.0 From e3e6ae8585a1ac2dcaa009fc0fca735eaeb8dbf5 Mon Sep 17 00:00:00 2001 From: busec0 Date: Tue, 1 Apr 2025 02:47:51 +0300 Subject: [PATCH 2/3] Ensure macOS building works. --- DittoHeartbeat/DittoHeartbeat.csproj | 2 ++ DittoPresenceViewer/DittoPresenceViewer.csproj | 1 + 2 files changed, 3 insertions(+) diff --git a/DittoHeartbeat/DittoHeartbeat.csproj b/DittoHeartbeat/DittoHeartbeat.csproj index fdc6c76..f805a77 100644 --- a/DittoHeartbeat/DittoHeartbeat.csproj +++ b/DittoHeartbeat/DittoHeartbeat.csproj @@ -15,7 +15,9 @@ https://ditto.live https://github.com/getditto/DittoDotnetTools git + <_DittoIncludeNativeAndroidLibs>False + true diff --git a/DittoPresenceViewer/DittoPresenceViewer.csproj b/DittoPresenceViewer/DittoPresenceViewer.csproj index 53afc09..c1b2191 100644 --- a/DittoPresenceViewer/DittoPresenceViewer.csproj +++ b/DittoPresenceViewer/DittoPresenceViewer.csproj @@ -25,6 +25,7 @@ git <_DittoIncludeNativeAndroidLibs>False + true From 571f815df124292e149e6aef0ec8683dcffecca9 Mon Sep 17 00:00:00 2001 From: Bulzan Sergiu Date: Tue, 10 Jun 2025 22:13:17 +0300 Subject: [PATCH 3/3] Update SampleApp/MauiProgram.cs --- SampleApp/MauiProgram.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SampleApp/MauiProgram.cs b/SampleApp/MauiProgram.cs index 62b7445..3d89464 100644 --- a/SampleApp/MauiProgram.cs +++ b/SampleApp/MauiProgram.cs @@ -37,7 +37,7 @@ private static Ditto SetupDitto() var ditto = new Ditto(id, Path.Combine(FileSystem.Current.AppDataDirectory, "ditto")); var config = ditto.TransportConfig; - config.Connect.WebsocketUrls.Add($"wss://{appId}.cloud.ditto.live"); + config.Connect.WebsocketUrls.Add(""); config.EnableAllPeerToPeer(); ditto.TransportConfig = config;