Merge pull request #2944 from PrismLibrary/dev/ds/region-core-migration

PrismLibrary · Sep 12, 2023 · 91beae0 · 91beae0
2 parents 2ff1836 + fa30fb4
commit 91beae0
Show file tree

Hide file tree

Showing 362 changed files with 1,721 additions and 4,878 deletions.
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -21,10 +21,10 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run dotnet format
-        id: format
-        uses: jfversluis/dotnet-format@v1.0.9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          only-changed-files: true
-          workspace: "PrismLibrary.sln"
+      # - name: Run dotnet format
+      #   id: format
+      #   uses: jfversluis/dotnet-format@v1.0.9
+      #   with:
+      #     repo-token: ${{ secrets.GITHUB_TOKEN }}
+      #     only-changed-files: false
+      #     workspace: "PrismLibrary.sln"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -95,6 +95,11 @@
     </When>
   </Choose>
 
+  <ItemGroup>
+    <None Include="build\Package.props" Pack="true" PackagePath="buildTransitive\$(PackageId).props" Condition="exists('build\Package.props')"/>
+    <None Include="build\Package.targets" Pack="true" PackagePath="buildTransitive\$(PackageId).targets" Condition="exists('build\Package.targets')"/>
+  </ItemGroup>
+
   <ItemGroup Condition=" $(IsTestProject) ">
     <None Include="$(MSBuildThisFileDirectory)xunit.runner.json"
           CopyToOutputDirectory="PreserveNewest" />

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,43 +7,42 @@
     <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>
-
   <!-- Maui -->
   <ItemGroup Condition=" $(UseMaui) == 'true' ">
     <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
   </ItemGroup>
   <!-- Uno -->
   <ItemGroup Condition=" $(IsUnoProject) == 'true' ">
-    <PackageVersion Include="Uno.WinUI" Version="4.9.26" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.9.26" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.26" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.9.26" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.26" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.26" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
+    <PackageVersion Include="Uno.WinUI" Version="4.9.45" />
+    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="4.9.45" />
+    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.9.45" />
+    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="4.9.45" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
+    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
+    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="4.9.45" />
+    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="4.9.45" />
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.45" />
     <PackageVersion Include="Uno.Core" Version="4.0.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0" />
     <PackageVersion Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.221109.1" Condition="$(MSBuildProjectName.Contains('Prism'))" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.2.230118.102" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" Condition="!$(MSBuildProjectName.Contains('Prism'))" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.3" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.1.0" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.5" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.5" />
+    <PackageVersion Include="Uno.Resizetizer" Version="1.1.2" />
     <PackageVersion Include="Uno.Extensions.Core" Version="2.4.2" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WinUI" Version="2.4.2" />
     <PackageVersion Include="Uno.Extensions.Logging.Serilog" Version="2.4.2" />
-    <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
+    <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
     <PackageVersion Include="Uno.Material.WinUI" Version="2.6.1" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.0.4" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="3.0.4" />
+    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.0.5" />
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="3.0.5" />
     <PackageVersion Include="Uno.Extensions.Hosting.WinUI" Version="2.4.2" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.7.0.2" />

diff --git a/e2e/Forms/src/HelloRegions/RegionDemoModule.cs b/e2e/Forms/src/HelloRegions/RegionDemoModule.cs
@@ -1,4 +1,3 @@
-using System;
 using HelloRegions.ViewModels;
 using HelloRegions.Views;
 using Prism.Ioc;

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs
@@ -3,7 +3,7 @@
 using System.Windows.Input;
 using Prism.Commands;
 using Prism.Navigation;
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions.Navigation;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions.Navigation;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions.Navigation;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs
@@ -1,9 +1,7 @@
-using System;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Navigation;
-using Prism.Regions;
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {
@@ -26,7 +24,7 @@ private void Navigate(string target)
             _regionManager.RequestNavigate(RegionName, target, NavigationCallback);
         }
 
-        private void NavigationCallback(IRegionNavigationResult result)
+        private void NavigationCallback(NavigationResult result)
         {
 
         }

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {

diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs b/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs
@@ -1,7 +1,7 @@
 using System;
 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions;
 
 namespace HelloRegions.ViewModels
 {
@@ -38,28 +38,28 @@ public bool IsActive
             set => SetProperty(ref _isActive, value, OnIsActiveChanged);
         }
 
-        private INavigationContext _context;
-        private INavigationContext Context
+        private NavigationContext _context;
+        private NavigationContext Context
         {
             get => _context;
             set => SetProperty(ref _context, value);
         }
 
-        public bool IsNavigationTarget(INavigationContext navigationContext)
+        public bool IsNavigationTarget(NavigationContext navigationContext)
         {
             Console.WriteLine($"{GetType().Name} IsNavigationTarget called");
             var lookingFor = navigationContext.NavigatedName();
             return _contextName == lookingFor;
         }
 
-        public void OnNavigatedFrom(INavigationContext navigationContext)
+        public void OnNavigatedFrom(NavigationContext navigationContext)
         {
             Context = navigationContext;
             Console.WriteLine($"{GetType().Name} NavigatedFrom");
         }
 
         private string _contextName;
-        public void OnNavigatedTo(INavigationContext navigationContext)
+        public void OnNavigatedTo(NavigationContext navigationContext)
         {
             Context = navigationContext;
             _contextName = navigationContext.NavigatedName();

diff --git a/e2e/Maui/Directory.Build.targets b/e2e/Maui/Directory.Build.targets
@@ -1,3 +1,4 @@
 <Project>
-  <Import Project="..\..\src\Maui\Prism.Maui\build\Prism.Maui.targets" />
+  <Import Project="..\..\src\Prism.Core\build\Package.targets" />
+  <Import Project="..\..\src\Maui\Prism.Maui\build\Package.targets" />
 </Project>
diff --git a/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs b/e2e/Maui/MauiRegionsModule/MauiTestRegionsModule.cs
@@ -8,7 +8,7 @@ public class MauiTestRegionsModule : IModule
     public void OnInitialized(IContainerProvider containerProvider)
     {
         var regionManager = containerProvider.Resolve<IRegionManager>();
-        regionManager.RegisterViewWithRegion("ContentRegion", "RegionViewA");
+        regionManager.RegisterViewWithRegion<RegionViewA>("ContentRegion");
     }
 
     public void RegisterTypes(IContainerRegistry containerRegistry)
@@ -23,4 +23,4 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
             .RegisterForRegionNavigation<RegionViewB, RegionViewBViewModel>()
             .RegisterForRegionNavigation<RegionViewC, RegionViewCViewModel>();
     }
-}
+}
diff --git a/e2e/Maui/MauiRegionsModule/ViewModels/RegionViewModelBase.cs b/e2e/Maui/MauiRegionsModule/ViewModels/RegionViewModelBase.cs
@@ -15,7 +15,7 @@ protected RegionViewModelBase(INavigationService navigationService, IPageAccesso
         _pageAccessor = pageAccessor;
     }
 
-    public bool IsNavigationTarget(INavigationContext navigationContext) =>
+    public bool IsNavigationTarget(NavigationContext navigationContext) =>
         navigationContext.NavigatedName() == Name;
 
     private string? _message;
@@ -34,12 +34,12 @@ public int ViewCount
 
     public string? PageName => _pageAccessor.Page?.GetType()?.Name;
 
-    public void OnNavigatedFrom(INavigationContext navigationContext)
+    public void OnNavigatedFrom(NavigationContext navigationContext)
     {
 
     }
 
-    public void OnNavigatedTo(INavigationContext navigationContext)
+    public void OnNavigatedTo(NavigationContext navigationContext)
     {
         if (navigationContext.Parameters.ContainsKey(nameof(Message)))
             Message = navigationContext.Parameters.GetValue<string>(nameof(Message));

diff --git a/e2e/Uno/Directory.Build.targets b/e2e/Uno/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project ToolsVersion="15.0">
-  <Import Project="..\..\src\Uno\Prism.Uno\build\Prism.Uno.WinUI.targets" />
+  <Import Project="..\..\src\Prism.Core\build\Package.targets" />
 </Project>
diff --git a/e2e/Uno/HelloWorld/Views/Shell.xaml b/e2e/Uno/HelloWorld/Views/Shell.xaml
@@ -2,7 +2,7 @@
     x:Class="HelloWorld.Views.Shell"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:pr="using:Prism.Regions"
+    xmlns:pr="using:Prism.Navigation.Regions"
     xmlns:pvm="using:Prism.Mvvm"
     pvm:ViewModelLocator.AutowireViewModel="true"
     xmlns:local="using:HelloWorld.Views"

diff --git a/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs b/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs
@@ -2,7 +2,7 @@
 using HelloWorld.Core;
 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using Prism.Dialogs;
 
 namespace HelloWorld.ViewModels
@@ -35,7 +35,7 @@ public MainWindowViewModel(IDialogService dialogService, IRegionManager regionMa
         {
             _dialogService = dialogService;
             _regionManager = regionManager;
-            ShowDialogCommand = new DelegateCommand(ShowDialog);            
+            ShowDialogCommand = new DelegateCommand(ShowDialog);
         }
 
         private void ShowDialog()

diff --git a/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs b/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs
@@ -1,7 +1,6 @@
 using System;
 using Prism.Ioc;
-using Prism.Regions;
-using Prism.Regions.Xaml;
+using Prism.Navigation.Regions;
 using Xamarin.Forms;
 
 namespace Prism.Behaviors

diff --git a/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs b/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs
@@ -1,5 +1,5 @@
 using System;
-using Prism.Regions.Navigation;
+using Prism.Navigation.Regions;
 using Xamarin.Forms;
 
 namespace Prism.Common
@@ -34,7 +34,7 @@ public static T GetImplementerFromViewOrViewModel<T>(object view)
             return null;
         }
 
-        public static bool IsNavigationTarget(object view, INavigationContext navigationContext)
+        public static bool IsNavigationTarget(object view, NavigationContext navigationContext)
         {
             if (view is IRegionAware viewAsRegionAware)
             {
@@ -55,12 +55,12 @@ public static bool IsNavigationTarget(object view, INavigationContext navigation
             return path == viewType.Name || path == viewType.FullName;
         }
 
-        public static void OnNavigatedFrom(object view, INavigationContext navigationContext)
+        public static void OnNavigatedFrom(object view, NavigationContext navigationContext)
         {
             ViewAndViewModelAction<IRegionAware>(view, x => x.OnNavigatedFrom(navigationContext));
         }
 
-        public static void OnNavigatedTo(object view, INavigationContext navigationContext)
+        public static void OnNavigatedTo(object view, NavigationContext navigationContext)
         {
             ViewAndViewModelAction<IRegionAware>(view, x => x.OnNavigatedTo(navigationContext));
         }

diff --git a/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs b/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs
@@ -1,8 +1,8 @@
-using System;
-using Prism.Regions;
-using Prism.Regions.Adapters;
-using Prism.Regions.Behaviors;
-using Prism.Regions.Navigation;
+using System;
+using Prism.Navigation.Regions;
+using Prism.Navigation.Regions.Adapters;
+using Prism.Navigation.Regions.Behaviors;
+using Prism.Navigation.Regions.Navigation;
 using Xamarin.Forms;
 
 namespace Prism.Ioc

diff --git a/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs b/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Prism.Navigation;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace Prism.Ioc
 {

diff --git a/...ons/Adapters/CarouselViewRegionAdapter.cs → ...ons/Adapters/CarouselViewRegionAdapter.cs b/...ons/Adapters/CarouselViewRegionAdapter.cs → ...ons/Adapters/CarouselViewRegionAdapter.cs
@@ -1,18 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using Prism.Behaviors;
 using Prism.Common;
 using Prism.Ioc;
-using Prism.Navigation;
 using Prism.Properties;
-using Prism.Regions.Behaviors;
-using Prism.Regions.Navigation;
 using Xamarin.Forms;
 
-namespace Prism.Regions.Adapters
+namespace Prism.Navigation.Regions.Adapters
 {
     /// <summary>
     /// Adapter that creates a new <see cref="SingleActiveRegion"/> and monitors its
@@ -56,7 +51,7 @@ protected override void Adapt(IRegion region, CarouselView regionTarget)
 
             region.ActiveViews.CollectionChanged += delegate
             {
-                var activeView = region.ActiveViews.FirstOrDefault();
+                var activeView = region.ActiveViews.OfType<VisualElement>().FirstOrDefault();
                 regionBehavior.CurrentView = activeView;
                 regionTarget.CurrentItem = activeView;
             };