From 819f7a2c00b02b261bc60ea98451c7ee5a074f8c Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sat, 29 Jul 2023 11:27:22 +0300 Subject: [PATCH 1/5] build: Add explicit dependency to fix canaries --- src/Directory.Packages.props | 1 + .../Uno.Extensions.Navigation.WinUI.Markup.csproj | 3 ++- .../Uno.Extensions.Reactive.WinUI.Markup.csproj | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 2d886825e9..64eee8b21a 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -41,6 +41,7 @@ + diff --git a/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj b/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj index eebef14b3b..03665bca69 100644 --- a/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj @@ -12,6 +12,7 @@ + @@ -22,4 +23,4 @@ A set of C# for Markup helpers for Uno.Extensions.Navigation.WinUI - \ No newline at end of file + diff --git a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj index 4aeb3bf8fe..99f0f55659 100644 --- a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj @@ -11,6 +11,7 @@ + @@ -21,4 +22,4 @@ A set of C# for Markup helpers for Uno.Extensions.Reactive.WinUI - \ No newline at end of file + From c790c63b36374e632ae3a597e7b4f752261576e4 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Sun, 30 Jul 2023 10:32:06 +0300 Subject: [PATCH 2/5] chore(deps): Update packages --- .../MauiEmbedding/Directory.Packages.props | 10 +++--- samples/Playground/Directory.Packages.props | 16 +++++----- src/Directory.Packages.props | 14 ++++---- ...no.Extensions.Reactive.WinUI.Markup.csproj | 2 +- .../Uno.Extensions.RuntimeTests.Mobile.csproj | 8 ++--- ...no.Extensions.RuntimeTests.Skia.Gtk.csproj | 8 ++--- ...no.Extensions.RuntimeTests.Skia.Wpf.csproj | 8 ++--- .../Uno.Extensions.RuntimeTests.Wasm.csproj | 8 ++--- testing/TestHarness/Directory.Packages.props | 32 +++++++++---------- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props index 52d4140fb5..5357d2d5bb 100644 --- a/samples/MauiEmbedding/Directory.Packages.props +++ b/samples/MauiEmbedding/Directory.Packages.props @@ -15,17 +15,17 @@ - + - - - + + + - + diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props index 05e0097f2e..4bc702d236 100644 --- a/samples/Playground/Directory.Packages.props +++ b/samples/Playground/Directory.Packages.props @@ -29,16 +29,16 @@ - - - - - - - + + + + + + + - + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 64eee8b21a..e222bfbb4e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -46,15 +46,15 @@ - - - - + + + + - + - - + + diff --git a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj index 99f0f55659..68e90c6430 100644 --- a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj @@ -6,7 +6,7 @@ $(WarningsNotAsErrors);CS1591 $(DefineConstants);WINUI - 1.2.221109.1 + 1.3.230602002 diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj index 169dc05f8f..2ff358f6c5 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Mobile/Uno.Extensions.RuntimeTests.Mobile.csproj @@ -30,11 +30,11 @@ - - - + + + - + diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj index f1c630f6c4..7ca76b70c7 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Uno.Extensions.RuntimeTests.Skia.Gtk.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj index 4bb4e5d5aa..99b8bbe884 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/Uno.Extensions.RuntimeTests.Skia.Wpf.csproj @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj index e871449ee4..194616032d 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Wasm/Uno.Extensions.RuntimeTests.Wasm.csproj @@ -49,12 +49,12 @@ - - - + + + - + diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props index 3543ee34c2..0e9f75e965 100644 --- a/testing/TestHarness/Directory.Packages.props +++ b/testing/TestHarness/Directory.Packages.props @@ -44,15 +44,15 @@ - - - - - - - - - + + + + + + + + + @@ -60,13 +60,13 @@ - - - - - - - + + + + + + + From 1521786fc1a767e97376104f0cd4d607226af032 Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Mon, 31 Jul 2023 14:38:56 +1000 Subject: [PATCH 3/5] chore: Reverting update to winappsdk --- .../Uno.Extensions.Reactive.WinUI.Markup.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj index 68e90c6430..99f0f55659 100644 --- a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj @@ -6,7 +6,7 @@ $(WarningsNotAsErrors);CS1591 $(DefineConstants);WINUI - 1.3.230602002 + 1.2.221109.1 From 94c2c02bd681e1ffe59bba6138472262e9d6373e Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Mon, 31 Jul 2023 16:13:58 +1000 Subject: [PATCH 4/5] chore: Fix namespaces --- samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs | 2 +- samples/Playground/Playground.Skia.Gtk/Program.cs | 2 +- .../Uno.Extensions.RuntimeTests.Skia.Gtk/Program.cs | 2 +- testing/TestHarness/TestHarness.Legacy.Skia.Gtk/Program.cs | 2 +- testing/TestHarness/TestHarness.Skia.Gtk/Program.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs index 03392a6b0c..d5564320f7 100644 --- a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs +++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs @@ -1,6 +1,6 @@ using System; using GLib; -using Uno.UI.Runtime.Skia; +using Uno.UI.Runtime.Skia.Gtk; namespace MauiEmbedding.Skia.Gtk; diff --git a/samples/Playground/Playground.Skia.Gtk/Program.cs b/samples/Playground/Playground.Skia.Gtk/Program.cs index 05ee304329..3d0b5d153e 100644 --- a/samples/Playground/Playground.Skia.Gtk/Program.cs +++ b/samples/Playground/Playground.Skia.Gtk/Program.cs @@ -1,6 +1,6 @@ using GLib; using System; -using Uno.UI.Runtime.Skia; +using Uno.UI.Runtime.Skia.Gtk; namespace Playground.Skia.Gtk { diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Program.cs b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Program.cs index 6ce2f3ab65..38f92cab8f 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Program.cs +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/Program.cs @@ -1,6 +1,6 @@ using System; using GLib; -using Uno.UI.Runtime.Skia; +using Uno.UI.Runtime.Skia.Gtk; namespace Uno.Extensions.RuntimeTests.Skia.Gtk { diff --git a/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/Program.cs b/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/Program.cs index 4233f9e458..79f71794ab 100644 --- a/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/Program.cs +++ b/testing/TestHarness/TestHarness.Legacy.Skia.Gtk/Program.cs @@ -1,6 +1,6 @@ using System; using GLib; -using Uno.UI.Runtime.Skia; +using Uno.UI.Runtime.Skia.Gtk; namespace TestHarness.Legacy.Skia.Gtk { diff --git a/testing/TestHarness/TestHarness.Skia.Gtk/Program.cs b/testing/TestHarness/TestHarness.Skia.Gtk/Program.cs index 00823f8a93..62dfd91bb3 100644 --- a/testing/TestHarness/TestHarness.Skia.Gtk/Program.cs +++ b/testing/TestHarness/TestHarness.Skia.Gtk/Program.cs @@ -1,6 +1,6 @@ using System; using GLib; -using Uno.UI.Runtime.Skia; +using Uno.UI.Runtime.Skia.Gtk; namespace TestHarness.Skia.Gtk { From a6f27ed1e786a88a961e3ccec85cd623a76e4573 Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Mon, 31 Jul 2023 17:01:30 +1000 Subject: [PATCH 5/5] chore: Fixing WPF namespaces --- samples/Playground/Playground.Skia.Wpf.Host/MainWindow.xaml.cs | 2 +- .../Uno.Extensions.RuntimeTests.Skia.Wpf/MainWindow.xaml.cs | 2 +- .../TestHarness.Legacy.Skia.WPF.Host/MainWindow.xaml.cs | 2 +- .../TestHarness/TestHarness.Skia.WPF.Host/MainWindow.xaml.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/Playground/Playground.Skia.Wpf.Host/MainWindow.xaml.cs b/samples/Playground/Playground.Skia.Wpf.Host/MainWindow.xaml.cs index 912523a608..47045262f8 100644 --- a/samples/Playground/Playground.Skia.Wpf.Host/MainWindow.xaml.cs +++ b/samples/Playground/Playground.Skia.Wpf.Host/MainWindow.xaml.cs @@ -24,7 +24,7 @@ public MainWindow() { InitializeComponent(); - root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new Playground.App()); + root.Content = new global::Uno.UI.Runtime.Skia.Wpf.WpfHost(Dispatcher, () => new Playground.App()); } } } diff --git a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/MainWindow.xaml.cs b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/MainWindow.xaml.cs index b8c4a8c918..86616cd255 100644 --- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/MainWindow.xaml.cs +++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Wpf/MainWindow.xaml.cs @@ -24,7 +24,7 @@ public MainWindow() { InitializeComponent(); - root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new Uno.Extensions.RuntimeTests.App()); + root.Content = new global::Uno.UI.Runtime.Skia.Wpf.WpfHost(Dispatcher, () => new Uno.Extensions.RuntimeTests.App()); } } } diff --git a/testing/TestHarness/TestHarness.Legacy.Skia.WPF.Host/MainWindow.xaml.cs b/testing/TestHarness/TestHarness.Legacy.Skia.WPF.Host/MainWindow.xaml.cs index 1ca972e6b7..d0f9232817 100644 --- a/testing/TestHarness/TestHarness.Legacy.Skia.WPF.Host/MainWindow.xaml.cs +++ b/testing/TestHarness/TestHarness.Legacy.Skia.WPF.Host/MainWindow.xaml.cs @@ -24,7 +24,7 @@ public MainWindow() { InitializeComponent(); - root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new TestHarness.App()); + root.Content = new global::Uno.UI.Runtime.Skia.Wpf.WpfHost(Dispatcher, () => new TestHarness.App()); } } } diff --git a/testing/TestHarness/TestHarness.Skia.WPF.Host/MainWindow.xaml.cs b/testing/TestHarness/TestHarness.Skia.WPF.Host/MainWindow.xaml.cs index 97837629ce..7a0c3a4526 100644 --- a/testing/TestHarness/TestHarness.Skia.WPF.Host/MainWindow.xaml.cs +++ b/testing/TestHarness/TestHarness.Skia.WPF.Host/MainWindow.xaml.cs @@ -24,7 +24,7 @@ public MainWindow() { InitializeComponent(); - root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new TestHarness.App()); + root.Content = new global::Uno.UI.Runtime.Skia.Wpf.WpfHost(Dispatcher, () => new TestHarness.App()); } } }