3.0.11-beta - .NET MAUI controls package upgrade to 9.0.21

adospace · Dec 20, 2024 · 1aab520 · 1aab520
1 parent 3a865e5
commit 1aab520
Show file tree

Hide file tree

Showing 37 changed files with 642 additions and 235 deletions.
diff --git a/.github/workflows/build-deploy-beta.yml b/.github/workflows/build-deploy-beta.yml
@@ -16,7 +16,7 @@ jobs:
       Solution_Name: ./src/MauiReactor.Build.sln
       Test_Project: ./samples/UnitTests/UnitTests.csproj
       TemplatePack_Name: ./src/MauiReactor.TemplatePack/MauiReactor.TemplatePack.csproj
-      Version: 3.0.10-beta
+      Version: 3.0.11-beta
 
     steps:
     - name: Checkout

diff --git a/samples/Calculator/Calculator.csproj b/samples/Calculator/Calculator.csproj
@@ -48,8 +48,8 @@
     <ProjectReference Include="..\..\src\MauiReactor.ScaffoldGenerator\MauiReactor.ScaffoldGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ChartApp/ChartApp.csproj b/samples/ChartApp/ChartApp.csproj
@@ -44,8 +44,8 @@
     <ProjectReference Include="..\..\src\MauiReactor.ScaffoldGenerator\MauiReactor.ScaffoldGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Contentics/Contentics.csproj b/samples/Contentics/Contentics.csproj
@@ -68,8 +68,8 @@
     <ProjectReference Include="..\..\src\MauiReactor.Canvas\MauiReactor.Canvas.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/IntegrationTest/IntegrationTest.csproj b/samples/IntegrationTest/IntegrationTest.csproj
@@ -56,8 +56,8 @@
 	  <ProjectReference Include="..\..\src\MauiReactor\MauiReactor.csproj" />
 	</ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 

diff --git a/samples/MauiReactor.Calendar/MauiReactor.Calendar.csproj b/samples/MauiReactor.Calendar/MauiReactor.Calendar.csproj
@@ -43,8 +43,8 @@
     <ProjectReference Include="..\..\src\MauiReactor\MauiReactor.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MauiReactor.MapsDemo/MauiReactor.MapsDemo.csproj b/samples/MauiReactor.MapsDemo/MauiReactor.MapsDemo.csproj
@@ -43,8 +43,8 @@
     <ProjectReference Include="..\..\src\MauiReactor\MauiReactor.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MauiReactor.TestApp/MauiReactor.TestApp.csproj b/samples/MauiReactor.TestApp/MauiReactor.TestApp.csproj
@@ -75,8 +75,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/MauiReactor.TestAppWindow/MauiReactor.TestAppWindow.csproj b/samples/MauiReactor.TestAppWindow/MauiReactor.TestAppWindow.csproj
@@ -41,8 +41,8 @@
     <ProjectReference Include="..\..\src\MauiReactor\MauiReactor.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MauiReactor.WeatherTwentyOne/MauiReactor.WeatherTwentyOne.csproj b/samples/MauiReactor.WeatherTwentyOne/MauiReactor.WeatherTwentyOne.csproj
@@ -46,8 +46,8 @@
     <ProjectReference Include="..\..\src\MauiReactor\MauiReactor.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 

diff --git a/samples/SlidingPuzzle/SlidingPuzzle.csproj b/samples/SlidingPuzzle/SlidingPuzzle.csproj
@@ -51,8 +51,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/UnitTests/UnitTests.csproj b/samples/UnitTests/UnitTests.csproj
@@ -31,8 +31,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiReactor.Blazor.TestApp/MauiReactor.Blazor.TestApp.csproj b/src/MauiReactor.Blazor.TestApp/MauiReactor.Blazor.TestApp.csproj
@@ -58,9 +58,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.14" />
+        <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.21" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     </ItemGroup>
 

diff --git a/src/MauiReactor.Blazor/MauiReactor.Blazor.csproj b/src/MauiReactor.Blazor/MauiReactor.Blazor.csproj
@@ -35,9 +35,9 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.14" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.21" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/MauiReactor.Canvas/MauiReactor.Canvas.csproj b/src/MauiReactor.Canvas/MauiReactor.Canvas.csproj
@@ -40,8 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiReactor.FigmaPlugin/MauiReactor.FigmaPlugin.csproj b/src/MauiReactor.FigmaPlugin/MauiReactor.FigmaPlugin.csproj
@@ -57,8 +57,8 @@
     <ProjectReference Include="..\MauiReactor\MauiReactor.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiReactor.Maps/MauiReactor.Maps.csproj b/src/MauiReactor.Maps/MauiReactor.Maps.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="9.0.14" />
+	  <PackageReference Include="Microsoft.Maui.Controls.Maps" Version="9.0.21" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -43,8 +43,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiReactor.Scaffold/MauiReactor.Scaffold.csproj b/src/MauiReactor.Scaffold/MauiReactor.Scaffold.csproj
@@ -46,8 +46,8 @@
 	</ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.14" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.21" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiReactor.ScaffoldGenerator/MauiReactor.ScaffoldGenerator.csproj b/src/MauiReactor.ScaffoldGenerator/MauiReactor.ScaffoldGenerator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

diff --git a/src/MauiReactor.ScaffoldGenerator/Properties/launchSettings.json b/src/MauiReactor.ScaffoldGenerator/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Profile 1": {
       "commandName": "DebugRoslynComponent",
-      "targetProject": "..\\..\\..\\mauireactor-integration\\DevExpress\\DevExpressIntApp\\DevExpressIntApp.csproj"
+      "targetProject": "..\\..\\..\\..\\rtr\\fws-borg\\src\\FwsBorgApp\\FwsBorgApp.csproj"
     }
   }
 }
diff --git a/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.partial.cs b/src/MauiReactor.ScaffoldGenerator/ScaffoldTypeGenerator.partial.cs
@@ -57,6 +57,8 @@ public ScaffoldTypeGenerator(
             .Where(_ => !_.Name.Contains("Command"))
             .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.DataTemplate")
             .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.DataTemplate?")
+            .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.ControlTemplate")
+            .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.ControlTemplate?")
             .Where(_ => _.Name != "ItemsSource")
             .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.IItemsLayout")
             .Where(_ => _.Type.GetFullyQualifiedName() != "Microsoft.Maui.Controls.LinearItemsLayout")

diff --git a/...Reactor.TemplatePack/templates/MauiReactor.StartupXaml/MauiReactorTemplate.Startup.csproj b/...Reactor.TemplatePack/templates/MauiReactor.StartupXaml/MauiReactorTemplate.Startup.csproj
@@ -59,8 +59,12 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="MauiReactor.HotReload" Value="true" Trim="true" />
+  </ItemGroup>  
+
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 		<PackageReference Include="Reactor.Maui" Version="3.0.5-beta" />
 	</ItemGroup>

diff --git a/...tor.TemplatePack/templates/MauiReactor.StartupXaml/MauiReactorTemplate.StartupXaml.csproj b/...tor.TemplatePack/templates/MauiReactor.StartupXaml/MauiReactorTemplate.StartupXaml.csproj
@@ -59,8 +59,12 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="MauiReactor.HotReload" Value="true" Trim="true" />
+  </ItemGroup>
+
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.14" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.21" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
     <PackageReference Include="Reactor.Maui" Version="3.0.5-beta" />
 	</ItemGroup>

diff --git a/src/MauiReactor/Animations/RxDoubleAnimation.cs b/src/MauiReactor/Animations/RxDoubleAnimation.cs
@@ -66,15 +66,15 @@ protected override void OnMigrateFrom(RxAnimation previousAnimation)
             StartValue = previousDoubleAnimation.CurrentValue();
             //System.Diagnostics.Debug.WriteLine($"Migrate StartValue from {StartValue} to {((RxDoubleAnimation)previousAnimation).TargetValue} (TargetValue={TargetValue})");
 
-            //if (!previousDoubleAnimation.IsCompleted())
-            //{
-            //    var duration = Duration ?? DefaultDuration;
-            //    var previousCompletion = previousDoubleAnimation.Completion();
-            //    StartTime -= (long)(duration * (previousCompletion));
-            //    //System.Diagnostics.Debug.WriteLine($"previousCompletion={previousDoubleAnimation.Completion()} -> completion={Completion()}");
-            //    //if (StartTime < 0)
-            //        //System.Diagnostics.Debug.Assert(StartTime > 0);
-            //}
+            if (!previousDoubleAnimation.IsCompleted())
+            {
+                var duration = Duration ?? DefaultDuration;
+                var previousCompletion = previousDoubleAnimation.Completion();
+                StartTime -= (long)(duration * (previousCompletion));
+                //System.Diagnostics.Debug.WriteLine($"previousCompletion={previousDoubleAnimation.Completion()} -> completion={Completion()}");
+                //if (StartTime < 0)
+                //System.Diagnostics.Debug.Assert(StartTime > 0);
+            }
 
             base.OnMigrateFrom(previousAnimation);
         }

diff --git a/src/MauiReactor/Component.cs b/src/MauiReactor/Component.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using MauiReactor.Internals;
 using MauiReactor.Parameters;
+using Microsoft.Extensions.Logging;
 
 namespace MauiReactor
 {
@@ -71,6 +72,10 @@ protected sealed override void OnRemoveChild(VisualNode widget, BindableObject n
 
         protected sealed override IEnumerable<VisualNode> RenderChildren()
         {
+            ServiceCollectionProvider
+                .ServiceProvider?
+                .GetService<ILogger<Component>>()?
+                .LogDebug("Rendering {Type}", GetType());
             yield return Render();
         }
 
@@ -146,27 +151,24 @@ protected virtual void OnMountedOrPropsChanged()
         }
 
         public INavigation Navigation
-            => (IsContainerPageAvailable ? ContainerPage.Navigation : null) ?? NavigationProvider.Navigation ?? throw new InvalidOperationException("Navigation not available");
+            => ContainerPage?.Navigation ?? NavigationProvider.Navigation ?? throw new InvalidOperationException("Navigation not available");
 
         public bool IsNavigationAvailable
-            => (IsContainerPageAvailable && ContainerPage.Navigation != null) || NavigationProvider.Navigation != null;
+            => ContainerPage?.Navigation != null || NavigationProvider.Navigation != null;
 
         private Microsoft.Maui.Controls.Page? _containerPage;
 
-        public Microsoft.Maui.Controls.Page ContainerPage
+        public Microsoft.Maui.Controls.Page? ContainerPage
         {
             get
             {
                 _containerPage ??= ((IVisualNode)this).GetContainerPage();
-                return _containerPage ?? throw new InvalidOperationException("ContainerPage not available");
+                return _containerPage;
             }
         }
 
-        public bool IsContainerPageAvailable
-            => _containerPage != null || ((IVisualNode)this).GetContainerPage() != null;
-
         public static IServiceProvider Services
-            => ServiceCollectionProvider.ServiceProvider;
+            => ServiceCollectionProvider.ServiceProvider ?? throw new InvalidOperationException("Services not available");
 
         internal void InvalidateComponent() => Invalidate();