From 8fd799f9c293058ae10404166c216979105ba3da Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 17 May 2024 17:59:11 -0500 Subject: [PATCH 1/9] Update tooling pointer --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index bf45e14d..8175202a 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit bf45e14d737a1132031673faf5ed8952f08dc508 +Subproject commit 8175202aa2f6f9f20e2435633e40a51169babca2 From c6bb4a9587283b48eb55c0668d9d62073817b71d Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Fri, 17 May 2024 17:59:20 -0500 Subject: [PATCH 2/9] Fixed new net8.0 compiler warnings/errors --- .../src/Extensions/CompositorExtensions.cs | 28 ++++++++++++++----- .../FrameworkElementExtensions.Mouse.cs | 3 ++ components/Helpers/src/ThemeListener.cs | 4 +-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/components/Animations/src/Extensions/CompositorExtensions.cs b/components/Animations/src/Extensions/CompositorExtensions.cs index 5358ab80..b9944195 100644 --- a/components/Animations/src/Extensions/CompositorExtensions.cs +++ b/components/Animations/src/Extensions/CompositorExtensions.cs @@ -109,7 +109,9 @@ public static BooleanKeyFrameAnimation CreateBooleanKeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -170,7 +172,9 @@ public static ScalarKeyFrameAnimation CreateScalarKeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -231,7 +235,9 @@ public static Vector2KeyFrameAnimation CreateVector2KeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -292,7 +298,9 @@ public static Vector3KeyFrameAnimation CreateVector3KeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -353,7 +361,9 @@ public static Vector4KeyFrameAnimation CreateVector4KeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -414,7 +424,9 @@ public static ColorKeyFrameAnimation CreateColorKeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; @@ -475,7 +487,9 @@ public static QuaternionKeyFrameAnimation CreateQuaternionKeyFrameAnimation( animation.InsertKeyFrame(0, from.Value); } - animation.Target = target; + if (target is not null) + animation.Target = target; + animation.Direction = direction; animation.IterationBehavior = iterationBehavior; animation.IterationCount = iterationCount; diff --git a/components/Extensions/src/Element/FrameworkElementExtensions.Mouse.cs b/components/Extensions/src/Element/FrameworkElementExtensions.Mouse.cs index d1bced06..a1d74a59 100644 --- a/components/Extensions/src/Element/FrameworkElementExtensions.Mouse.cs +++ b/components/Extensions/src/Element/FrameworkElementExtensions.Mouse.cs @@ -101,6 +101,7 @@ private static void Element_PointerEntered(object sender, PointerRoutedEventArgs CursorShape cursor = GetCursor((FrameworkElement)sender); #if !WINAPPSDK + if (Window.Current?.CoreWindow is not null) Window.Current.CoreWindow.PointerCursor = _cursors[cursor]; #endif } @@ -124,6 +125,7 @@ private static void Element_PointerExited(object sender, PointerRoutedEventArgs } #if !WINAPPSDK + if (Window.Current?.CoreWindow is not null) Window.Current.CoreWindow.PointerCursor = cursor; #endif } @@ -138,6 +140,7 @@ private static void ElementOnUnloaded(object sender, RoutedEventArgs routedEvent // when the element is programatically unloaded, reset the cursor back to default // this is necessary when click triggers immediate change in layout and PointerExited is not called #if !WINAPPSDK + if (Window.Current?.CoreWindow is not null) Window.Current.CoreWindow.PointerCursor = _defaultCursor; #endif } diff --git a/components/Helpers/src/ThemeListener.cs b/components/Helpers/src/ThemeListener.cs index 29b2c289..af35e3d9 100644 --- a/components/Helpers/src/ThemeListener.cs +++ b/components/Helpers/src/ThemeListener.cs @@ -76,7 +76,7 @@ public ThemeListener(DispatcherQueue? dispatcherQueue = null) DispatcherQueue = dispatcherQueue ?? DispatcherQueue.GetForCurrentThread(); - if (Window.Current != null) + if (Window.Current?.CoreWindow is not null) { _accessible.HighContrastChanged += Accessible_HighContrastChanged; _settings.ColorValuesChanged += Settings_ColorValuesChanged; @@ -163,7 +163,7 @@ public void Dispose() { _accessible.HighContrastChanged -= Accessible_HighContrastChanged; _settings.ColorValuesChanged -= Settings_ColorValuesChanged; - if (Window.Current != null) + if (Window.Current?.CoreWindow is not null) { Window.Current.CoreWindow.Activated -= CoreWindow_Activated; } From 3ac601ff31972f3e1826d954b2123c740e8c3fca Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 21 May 2024 10:31:19 -0500 Subject: [PATCH 3/9] Update tooling pointer --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 8175202a..266902e4 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 8175202aa2f6f9f20e2435633e40a51169babca2 +Subproject commit 266902e44223360a7165a0d1f7fe5b5249e0be22 From 9ed3e80dfb3b483edfe01459f3b13233cdb6cfde Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 30 May 2024 14:30:09 -0500 Subject: [PATCH 4/9] Align Android TFM with Uno.UI --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 266902e4..d924ad5d 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 266902e44223360a7165a0d1f7fe5b5249e0be22 +Subproject commit d924ad5d89822b9df2ced09407d78b2ca402b7f0 From 3aa99f3b710045d21f6efebeb89f159556a51990 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Thu, 30 May 2024 14:43:14 -0500 Subject: [PATCH 5/9] Use net8.0-android34.0 for Android TFM --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index d924ad5d..81ebdb14 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit d924ad5d89822b9df2ced09407d78b2ca402b7f0 +Subproject commit 81ebdb140547e6bc33c836b4869ac62006e9d2ac From 64e3b169be550cd1650d39853390a2a0e358b8de Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 3 Jun 2024 13:47:43 -0500 Subject: [PATCH 6/9] Fixed possible nullrefs on wasdk --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 81ebdb14..35189bd1 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 81ebdb140547e6bc33c836b4869ac62006e9d2ac +Subproject commit 35189bd1fe832be4c1c502eec38779807cd68dd4 From 46e83c356a44893dd57688d9e5ba459707318b7c Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 3 Jun 2024 15:42:08 -0500 Subject: [PATCH 7/9] Fixed possible nullrefs on WinAppSdk --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 35189bd1..80c2c77c 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 35189bd1fe832be4c1c502eec38779807cd68dd4 +Subproject commit 80c2c77cd3df8a316dcef5f6867bafc927edde71 From ab090d1bd941d52f979db7ac5475e620b2f3cdb7 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Mon, 3 Jun 2024 16:49:10 -0500 Subject: [PATCH 8/9] Fixed WinUIMajorVersion for single-component Wasdk head --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 80c2c77c..ee27670b 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 80c2c77cd3df8a316dcef5f6867bafc927edde71 +Subproject commit ee27670b2f1a288e09aefbf4852a81f8bb5ef6fb From f5154d04214110cbc6fc33889fa998e8d9179043 Mon Sep 17 00:00:00 2001 From: Arlo Godfrey Date: Tue, 4 Jun 2024 17:15:14 -0500 Subject: [PATCH 9/9] Update tooling pointer to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index ee27670b..e366657a 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit ee27670b2f1a288e09aefbf4852a81f8bb5ef6fb +Subproject commit e366657a924a745c6fb4162dc4c58d2e07fc0613