chore: update samples

PrismLibrary · Sep 4, 2023 · 0e6147f · 0e6147f
1 parent e4a9f09
commit 0e6147f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
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/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.Navigation.Regions;
-using Prism.Navigation.Regions.Navigation;
 
 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/ViewModelBase.cs b/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs
@@ -1,7 +1,7 @@
 using System;
 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Navigation.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/Uno/Directory.Build.targets b/e2e/Uno/Directory.Build.targets
@@ -1,4 +1,3 @@
 <Project ToolsVersion="15.0">
-  <Import Project="..\..\src\Prism.Core\build\Prism.Uno.WinUI.targets" />
-  <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"