diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..14a1bd8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,54 @@ +name: build_wpf_samples + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build-sample: + strategy: + fail-fast: false + matrix: + solution-path: [ + '01-BootstrapperShell/BootstrapperShell.sln', + '02-Regions/Regions.sln', + '03-CustomRegions/Regions.sln', + '04-ViewDiscovery/ViewDiscovery.sln', + '05-ViewInjection/ViewInjection.sln', + '06-ViewActivationDeactivation/ActivationDeactivation.sln', + '07-Modules-AppConfig/Modules.sln', + '07-Modules-Code/Modules.sln', + '07-Modules-Directory/Modules.sln', + '07-Modules-LoadManual/Modules.sln', + '07-Modules-Xaml/Modules.sln', + '08-ViewModelLocator/ViewModelLocator.sln', + '09-ChangeConvention/ViewModelLocator.sln', + '10-CustomRegistrations/ViewModelLocator.sln', + '11-UsingDelegateCommands/UsingDelegateCommands.sln', + '12-UsingCompositeCommands/UsingCompositeCommands.sln', + '13-IActiveAwareCommands/UsingCompositeCommands.sln', + '14-UsingEventAggregator/UsingEventAggregator.sln', + '15-FilteringEvents/UsingEventAggregator.sln', + '16-RegionContext/RegionContext.sln', + '17-BasicRegionNavigation/BasicRegionNavigation.sln', + '18-NavigationCallback/BasicRegionNavigation.sln', + '19-NavigationParticipation/NavigationParticipation.sln', + '20-NavigateToExistingViews/NavigationParticipation.sln', + '21-PassingParameters/PassingParameters.sln', + '22-ConfirmCancelNavigation/ConfirmCancelNavigation.sln', + '23-RegionMemberLifetime/RegionMemberLifetime.sln', + '24-NavigationJournal/NavigationJournal.sln', + '26-UsingDialogService/UsingDialogService.sln', + '27-StylingDialog/StylingDialog.sln', + '28-UsingCustomWindow/UsingCustomWindow.sln', + '29-InvokeCommandAction/UsingInvokeCommandAction.sln', + ] + uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@master + with: + name: Build Sample + solution-path: ${{ matrix.solution-path }} + dotnet-version: 6.0.x + run-tests: false + artifact-name: '' \ No newline at end of file diff --git a/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj b/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj index 033d4b0..83ef1ff 100644 --- a/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj +++ b/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) BootstrapperShell true diff --git a/02-Regions/Regions/Regions.csproj b/02-Regions/Regions/Regions.csproj index 6c2a4a6..d2ea86e 100644 --- a/02-Regions/Regions/Regions.csproj +++ b/02-Regions/Regions/Regions.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Regions true diff --git a/03-CustomRegions/Regions/App.xaml.cs b/03-CustomRegions/Regions/App.xaml.cs index 8e50913..1c9e57b 100644 --- a/03-CustomRegions/Regions/App.xaml.cs +++ b/03-CustomRegions/Regions/App.xaml.cs @@ -1,5 +1,5 @@ using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Unity; using Regions.Views; using System.Windows; diff --git a/03-CustomRegions/Regions/Prism/StackPanelRegionAdapter.cs b/03-CustomRegions/Regions/Prism/StackPanelRegionAdapter.cs index 5685cbd..b4a605a 100644 --- a/03-CustomRegions/Regions/Prism/StackPanelRegionAdapter.cs +++ b/03-CustomRegions/Regions/Prism/StackPanelRegionAdapter.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using System.Windows; using System.Windows.Controls; diff --git a/03-CustomRegions/Regions/Regions.csproj b/03-CustomRegions/Regions/Regions.csproj index 6c2a4a6..d2ea86e 100644 --- a/03-CustomRegions/Regions/Regions.csproj +++ b/03-CustomRegions/Regions/Regions.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Regions true diff --git a/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj b/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj index 5668a6d..ea79a9f 100644 --- a/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj +++ b/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ViewDiscovery true diff --git a/04-ViewDiscovery/ViewDiscovery/Views/MainWindow.xaml.cs b/04-ViewDiscovery/ViewDiscovery/Views/MainWindow.xaml.cs index 2e464ef..0518a53 100644 --- a/04-ViewDiscovery/ViewDiscovery/Views/MainWindow.xaml.cs +++ b/04-ViewDiscovery/ViewDiscovery/Views/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using System.Windows; namespace ViewDiscovery.Views diff --git a/05-ViewInjection/ViewInjection/ViewInjection.csproj b/05-ViewInjection/ViewInjection/ViewInjection.csproj index 033d4b0..83ef1ff 100644 --- a/05-ViewInjection/ViewInjection/ViewInjection.csproj +++ b/05-ViewInjection/ViewInjection/ViewInjection.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) BootstrapperShell true diff --git a/05-ViewInjection/ViewInjection/Views/MainWindow.xaml.cs b/05-ViewInjection/ViewInjection/Views/MainWindow.xaml.cs index ac9b679..f9b375a 100644 --- a/05-ViewInjection/ViewInjection/Views/MainWindow.xaml.cs +++ b/05-ViewInjection/ViewInjection/Views/MainWindow.xaml.cs @@ -1,5 +1,5 @@ using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using System.Windows; namespace ViewInjection.Views diff --git a/06-ViewActivationDeactivation/ActivationDeactivation/ActivationDeactivation.csproj b/06-ViewActivationDeactivation/ActivationDeactivation/ActivationDeactivation.csproj index 6919ff8..a9e86d9 100644 --- a/06-ViewActivationDeactivation/ActivationDeactivation/ActivationDeactivation.csproj +++ b/06-ViewActivationDeactivation/ActivationDeactivation/ActivationDeactivation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ActiviationDeactiviation true diff --git a/06-ViewActivationDeactivation/ActivationDeactivation/Views/MainWindow.xaml.cs b/06-ViewActivationDeactivation/ActivationDeactivation/Views/MainWindow.xaml.cs index 9e25f25..91c32c6 100644 --- a/06-ViewActivationDeactivation/ActivationDeactivation/Views/MainWindow.xaml.cs +++ b/06-ViewActivationDeactivation/ActivationDeactivation/Views/MainWindow.xaml.cs @@ -1,5 +1,5 @@ using Unity; -using Prism.Regions; +using Prism.Navigation.Regions; using System.Windows; using Prism.Ioc; diff --git a/07-Modules - AppConfig/ModuleA/ModuleA.csproj b/07-Modules-AppConfig/ModuleA/ModuleA.csproj similarity index 72% rename from 07-Modules - AppConfig/ModuleA/ModuleA.csproj rename to 07-Modules-AppConfig/ModuleA/ModuleA.csproj index 11e68d2..1d4f329 100644 --- a/07-Modules - AppConfig/ModuleA/ModuleA.csproj +++ b/07-Modules-AppConfig/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/07-Modules - LoadManual/ModuleA/ModuleAModule.cs b/07-Modules-AppConfig/ModuleA/ModuleAModule.cs similarity index 93% rename from 07-Modules - LoadManual/ModuleA/ModuleAModule.cs rename to 07-Modules-AppConfig/ModuleA/ModuleAModule.cs index 8273f37..c5cb2ca 100644 --- a/07-Modules - LoadManual/ModuleA/ModuleAModule.cs +++ b/07-Modules-AppConfig/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/07-Modules - AppConfig/ModuleA/Views/ViewA.xaml b/07-Modules-AppConfig/ModuleA/Views/ViewA.xaml similarity index 100% rename from 07-Modules - AppConfig/ModuleA/Views/ViewA.xaml rename to 07-Modules-AppConfig/ModuleA/Views/ViewA.xaml diff --git a/07-Modules - AppConfig/ModuleA/Views/ViewA.xaml.cs b/07-Modules-AppConfig/ModuleA/Views/ViewA.xaml.cs similarity index 100% rename from 07-Modules - AppConfig/ModuleA/Views/ViewA.xaml.cs rename to 07-Modules-AppConfig/ModuleA/Views/ViewA.xaml.cs diff --git a/07-Modules - AppConfig/Modules.sln b/07-Modules-AppConfig/Modules.sln similarity index 100% rename from 07-Modules - AppConfig/Modules.sln rename to 07-Modules-AppConfig/Modules.sln diff --git a/07-Modules - AppConfig/Modules/App.config b/07-Modules-AppConfig/Modules/App.config similarity index 100% rename from 07-Modules - AppConfig/Modules/App.config rename to 07-Modules-AppConfig/Modules/App.config diff --git a/07-Modules - AppConfig/Modules/App.xaml b/07-Modules-AppConfig/Modules/App.xaml similarity index 100% rename from 07-Modules - AppConfig/Modules/App.xaml rename to 07-Modules-AppConfig/Modules/App.xaml diff --git a/07-Modules - AppConfig/Modules/App.xaml.cs b/07-Modules-AppConfig/Modules/App.xaml.cs similarity index 100% rename from 07-Modules - AppConfig/Modules/App.xaml.cs rename to 07-Modules-AppConfig/Modules/App.xaml.cs diff --git a/07-Modules - Directory/Modules/Modules.csproj b/07-Modules-AppConfig/Modules/Modules.csproj similarity index 80% rename from 07-Modules - Directory/Modules/Modules.csproj rename to 07-Modules-AppConfig/Modules/Modules.csproj index 752d783..965d70e 100644 --- a/07-Modules - Directory/Modules/Modules.csproj +++ b/07-Modules-AppConfig/Modules/Modules.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Modules true diff --git a/07-Modules - AppConfig/Modules/Views/MainWindow.xaml b/07-Modules-AppConfig/Modules/Views/MainWindow.xaml similarity index 100% rename from 07-Modules - AppConfig/Modules/Views/MainWindow.xaml rename to 07-Modules-AppConfig/Modules/Views/MainWindow.xaml diff --git a/07-Modules - AppConfig/Modules/Views/MainWindow.xaml.cs b/07-Modules-AppConfig/Modules/Views/MainWindow.xaml.cs similarity index 100% rename from 07-Modules - AppConfig/Modules/Views/MainWindow.xaml.cs rename to 07-Modules-AppConfig/Modules/Views/MainWindow.xaml.cs diff --git a/07-Modules - Xaml/ModuleA/ModuleA.csproj b/07-Modules-Code/ModuleA/ModuleA.csproj similarity index 78% rename from 07-Modules - Xaml/ModuleA/ModuleA.csproj rename to 07-Modules-Code/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/07-Modules - Xaml/ModuleA/ModuleA.csproj +++ b/07-Modules-Code/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/07-Modules - AppConfig/ModuleA/ModuleAModule.cs b/07-Modules-Code/ModuleA/ModuleAModule.cs similarity index 93% rename from 07-Modules - AppConfig/ModuleA/ModuleAModule.cs rename to 07-Modules-Code/ModuleA/ModuleAModule.cs index 8273f37..c5cb2ca 100644 --- a/07-Modules - AppConfig/ModuleA/ModuleAModule.cs +++ b/07-Modules-Code/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/07-Modules - Code/ModuleA/Views/ViewA.xaml b/07-Modules-Code/ModuleA/Views/ViewA.xaml similarity index 100% rename from 07-Modules - Code/ModuleA/Views/ViewA.xaml rename to 07-Modules-Code/ModuleA/Views/ViewA.xaml diff --git a/07-Modules - Code/ModuleA/Views/ViewA.xaml.cs b/07-Modules-Code/ModuleA/Views/ViewA.xaml.cs similarity index 100% rename from 07-Modules - Code/ModuleA/Views/ViewA.xaml.cs rename to 07-Modules-Code/ModuleA/Views/ViewA.xaml.cs diff --git a/07-Modules - Code/Modules.sln b/07-Modules-Code/Modules.sln similarity index 100% rename from 07-Modules - Code/Modules.sln rename to 07-Modules-Code/Modules.sln diff --git a/07-Modules - Code/Modules/App.xaml b/07-Modules-Code/Modules/App.xaml similarity index 100% rename from 07-Modules - Code/Modules/App.xaml rename to 07-Modules-Code/Modules/App.xaml diff --git a/07-Modules - Code/Modules/App.xaml.cs b/07-Modules-Code/Modules/App.xaml.cs similarity index 100% rename from 07-Modules - Code/Modules/App.xaml.cs rename to 07-Modules-Code/Modules/App.xaml.cs diff --git a/07-Modules - Code/Modules/Modules.csproj b/07-Modules-Code/Modules/Modules.csproj similarity index 84% rename from 07-Modules - Code/Modules/Modules.csproj rename to 07-Modules-Code/Modules/Modules.csproj index 3ac55bb..9c87fa9 100644 --- a/07-Modules - Code/Modules/Modules.csproj +++ b/07-Modules-Code/Modules/Modules.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Modules true diff --git a/07-Modules - Code/Modules/Views/MainWindow.xaml b/07-Modules-Code/Modules/Views/MainWindow.xaml similarity index 100% rename from 07-Modules - Code/Modules/Views/MainWindow.xaml rename to 07-Modules-Code/Modules/Views/MainWindow.xaml diff --git a/07-Modules - Code/Modules/Views/MainWindow.xaml.cs b/07-Modules-Code/Modules/Views/MainWindow.xaml.cs similarity index 100% rename from 07-Modules - Code/Modules/Views/MainWindow.xaml.cs rename to 07-Modules-Code/Modules/Views/MainWindow.xaml.cs diff --git a/07-Modules - Directory/ModuleA/ModuleA.csproj b/07-Modules-Directory/ModuleA/ModuleA.csproj similarity index 67% rename from 07-Modules - Directory/ModuleA/ModuleA.csproj rename to 07-Modules-Directory/ModuleA/ModuleA.csproj index 594ed62..a0ccd41 100644 --- a/07-Modules - Directory/ModuleA/ModuleA.csproj +++ b/07-Modules-Directory/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/07-Modules - Directory/ModuleA/ModuleAModule.cs b/07-Modules-Directory/ModuleA/ModuleAModule.cs similarity index 93% rename from 07-Modules - Directory/ModuleA/ModuleAModule.cs rename to 07-Modules-Directory/ModuleA/ModuleAModule.cs index 35fbb31..ed8737e 100644 --- a/07-Modules - Directory/ModuleA/ModuleAModule.cs +++ b/07-Modules-Directory/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/07-Modules - Directory/ModuleA/Views/ViewA.xaml b/07-Modules-Directory/ModuleA/Views/ViewA.xaml similarity index 100% rename from 07-Modules - Directory/ModuleA/Views/ViewA.xaml rename to 07-Modules-Directory/ModuleA/Views/ViewA.xaml diff --git a/07-Modules - Directory/ModuleA/Views/ViewA.xaml.cs b/07-Modules-Directory/ModuleA/Views/ViewA.xaml.cs similarity index 100% rename from 07-Modules - Directory/ModuleA/Views/ViewA.xaml.cs rename to 07-Modules-Directory/ModuleA/Views/ViewA.xaml.cs diff --git a/07-Modules - Directory/Modules.sln b/07-Modules-Directory/Modules.sln similarity index 100% rename from 07-Modules - Directory/Modules.sln rename to 07-Modules-Directory/Modules.sln diff --git a/07-Modules - Directory/Modules/App.xaml b/07-Modules-Directory/Modules/App.xaml similarity index 100% rename from 07-Modules - Directory/Modules/App.xaml rename to 07-Modules-Directory/Modules/App.xaml diff --git a/07-Modules - Directory/Modules/App.xaml.cs b/07-Modules-Directory/Modules/App.xaml.cs similarity index 100% rename from 07-Modules - Directory/Modules/App.xaml.cs rename to 07-Modules-Directory/Modules/App.xaml.cs diff --git a/07-Modules - AppConfig/Modules/Modules.csproj b/07-Modules-Directory/Modules/Modules.csproj similarity index 80% rename from 07-Modules - AppConfig/Modules/Modules.csproj rename to 07-Modules-Directory/Modules/Modules.csproj index 752d783..965d70e 100644 --- a/07-Modules - AppConfig/Modules/Modules.csproj +++ b/07-Modules-Directory/Modules/Modules.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Modules true diff --git a/07-Modules - Directory/Modules/Views/MainWindow.xaml b/07-Modules-Directory/Modules/Views/MainWindow.xaml similarity index 100% rename from 07-Modules - Directory/Modules/Views/MainWindow.xaml rename to 07-Modules-Directory/Modules/Views/MainWindow.xaml diff --git a/07-Modules - Directory/Modules/Views/MainWindow.xaml.cs b/07-Modules-Directory/Modules/Views/MainWindow.xaml.cs similarity index 100% rename from 07-Modules - Directory/Modules/Views/MainWindow.xaml.cs rename to 07-Modules-Directory/Modules/Views/MainWindow.xaml.cs diff --git a/07-Modules - LoadManual/ModuleA/ModuleA.csproj b/07-Modules-LoadManual/ModuleA/ModuleA.csproj similarity index 78% rename from 07-Modules - LoadManual/ModuleA/ModuleA.csproj rename to 07-Modules-LoadManual/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/07-Modules - LoadManual/ModuleA/ModuleA.csproj +++ b/07-Modules-LoadManual/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/07-Modules - Code/ModuleA/ModuleAModule.cs b/07-Modules-LoadManual/ModuleA/ModuleAModule.cs similarity index 93% rename from 07-Modules - Code/ModuleA/ModuleAModule.cs rename to 07-Modules-LoadManual/ModuleA/ModuleAModule.cs index 8273f37..c5cb2ca 100644 --- a/07-Modules - Code/ModuleA/ModuleAModule.cs +++ b/07-Modules-LoadManual/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/07-Modules - LoadManual/ModuleA/Views/ViewA.xaml b/07-Modules-LoadManual/ModuleA/Views/ViewA.xaml similarity index 100% rename from 07-Modules - LoadManual/ModuleA/Views/ViewA.xaml rename to 07-Modules-LoadManual/ModuleA/Views/ViewA.xaml diff --git a/07-Modules - LoadManual/ModuleA/Views/ViewA.xaml.cs b/07-Modules-LoadManual/ModuleA/Views/ViewA.xaml.cs similarity index 100% rename from 07-Modules - LoadManual/ModuleA/Views/ViewA.xaml.cs rename to 07-Modules-LoadManual/ModuleA/Views/ViewA.xaml.cs diff --git a/07-Modules - LoadManual/Modules.sln b/07-Modules-LoadManual/Modules.sln similarity index 100% rename from 07-Modules - LoadManual/Modules.sln rename to 07-Modules-LoadManual/Modules.sln diff --git a/07-Modules - LoadManual/Modules/App.xaml b/07-Modules-LoadManual/Modules/App.xaml similarity index 100% rename from 07-Modules - LoadManual/Modules/App.xaml rename to 07-Modules-LoadManual/Modules/App.xaml diff --git a/07-Modules - LoadManual/Modules/App.xaml.cs b/07-Modules-LoadManual/Modules/App.xaml.cs similarity index 100% rename from 07-Modules - LoadManual/Modules/App.xaml.cs rename to 07-Modules-LoadManual/Modules/App.xaml.cs diff --git a/07-Modules - LoadManual/Modules/Modules.csproj b/07-Modules-LoadManual/Modules/Modules.csproj similarity index 84% rename from 07-Modules - LoadManual/Modules/Modules.csproj rename to 07-Modules-LoadManual/Modules/Modules.csproj index 3ac55bb..9c87fa9 100644 --- a/07-Modules - LoadManual/Modules/Modules.csproj +++ b/07-Modules-LoadManual/Modules/Modules.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Modules true diff --git a/07-Modules - LoadManual/Modules/Views/MainWindow.xaml b/07-Modules-LoadManual/Modules/Views/MainWindow.xaml similarity index 100% rename from 07-Modules - LoadManual/Modules/Views/MainWindow.xaml rename to 07-Modules-LoadManual/Modules/Views/MainWindow.xaml diff --git a/07-Modules - LoadManual/Modules/Views/MainWindow.xaml.cs b/07-Modules-LoadManual/Modules/Views/MainWindow.xaml.cs similarity index 100% rename from 07-Modules - LoadManual/Modules/Views/MainWindow.xaml.cs rename to 07-Modules-LoadManual/Modules/Views/MainWindow.xaml.cs diff --git a/07-Modules - Code/ModuleA/ModuleA.csproj b/07-Modules-Xaml/ModuleA/ModuleA.csproj similarity index 78% rename from 07-Modules - Code/ModuleA/ModuleA.csproj rename to 07-Modules-Xaml/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/07-Modules - Code/ModuleA/ModuleA.csproj +++ b/07-Modules-Xaml/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/07-Modules - Xaml/ModuleA/ModuleAModule.cs b/07-Modules-Xaml/ModuleA/ModuleAModule.cs similarity index 93% rename from 07-Modules - Xaml/ModuleA/ModuleAModule.cs rename to 07-Modules-Xaml/ModuleA/ModuleAModule.cs index 8273f37..c5cb2ca 100644 --- a/07-Modules - Xaml/ModuleA/ModuleAModule.cs +++ b/07-Modules-Xaml/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/07-Modules - Xaml/ModuleA/Views/ViewA.xaml b/07-Modules-Xaml/ModuleA/Views/ViewA.xaml similarity index 100% rename from 07-Modules - Xaml/ModuleA/Views/ViewA.xaml rename to 07-Modules-Xaml/ModuleA/Views/ViewA.xaml diff --git a/07-Modules - Xaml/ModuleA/Views/ViewA.xaml.cs b/07-Modules-Xaml/ModuleA/Views/ViewA.xaml.cs similarity index 100% rename from 07-Modules - Xaml/ModuleA/Views/ViewA.xaml.cs rename to 07-Modules-Xaml/ModuleA/Views/ViewA.xaml.cs diff --git a/07-Modules - Xaml/Modules.sln b/07-Modules-Xaml/Modules.sln similarity index 100% rename from 07-Modules - Xaml/Modules.sln rename to 07-Modules-Xaml/Modules.sln diff --git a/07-Modules - Xaml/Modules/App.config b/07-Modules-Xaml/Modules/App.config similarity index 100% rename from 07-Modules - Xaml/Modules/App.config rename to 07-Modules-Xaml/Modules/App.config diff --git a/07-Modules - Xaml/Modules/App.xaml b/07-Modules-Xaml/Modules/App.xaml similarity index 100% rename from 07-Modules - Xaml/Modules/App.xaml rename to 07-Modules-Xaml/Modules/App.xaml diff --git a/07-Modules - Xaml/Modules/App.xaml.cs b/07-Modules-Xaml/Modules/App.xaml.cs similarity index 100% rename from 07-Modules - Xaml/Modules/App.xaml.cs rename to 07-Modules-Xaml/Modules/App.xaml.cs diff --git a/07-Modules - Xaml/Modules/ModuleCatalog.xaml b/07-Modules-Xaml/Modules/ModuleCatalog.xaml similarity index 100% rename from 07-Modules - Xaml/Modules/ModuleCatalog.xaml rename to 07-Modules-Xaml/Modules/ModuleCatalog.xaml diff --git a/07-Modules - Xaml/Modules/Modules.csproj b/07-Modules-Xaml/Modules/Modules.csproj similarity index 89% rename from 07-Modules - Xaml/Modules/Modules.csproj rename to 07-Modules-Xaml/Modules/Modules.csproj index ee30167..1262a31 100644 --- a/07-Modules - Xaml/Modules/Modules.csproj +++ b/07-Modules-Xaml/Modules/Modules.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) Modules true diff --git a/07-Modules - Xaml/Modules/Views/MainWindow.xaml b/07-Modules-Xaml/Modules/Views/MainWindow.xaml similarity index 100% rename from 07-Modules - Xaml/Modules/Views/MainWindow.xaml rename to 07-Modules-Xaml/Modules/Views/MainWindow.xaml diff --git a/07-Modules - Xaml/Modules/Views/MainWindow.xaml.cs b/07-Modules-Xaml/Modules/Views/MainWindow.xaml.cs similarity index 100% rename from 07-Modules - Xaml/Modules/Views/MainWindow.xaml.cs rename to 07-Modules-Xaml/Modules/Views/MainWindow.xaml.cs diff --git a/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj b/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj index ad74625..8f2d354 100644 --- a/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj +++ b/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ViewModelLocator true diff --git a/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj b/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj index ad74625..8f2d354 100644 --- a/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj +++ b/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ViewModelLocator true diff --git a/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj b/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj index ad74625..8f2d354 100644 --- a/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj +++ b/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ViewModelLocator true diff --git a/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj b/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj index 7ea6e04..17cdba1 100644 --- a/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj +++ b/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingDelegateCommands true diff --git a/12-UsingCompositeCommands/ModuleA/ModuleA.csproj b/12-UsingCompositeCommands/ModuleA/ModuleA.csproj index eb00c30..77be0c1 100644 --- a/12-UsingCompositeCommands/ModuleA/ModuleA.csproj +++ b/12-UsingCompositeCommands/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/12-UsingCompositeCommands/ModuleA/ModuleAModule.cs b/12-UsingCompositeCommands/ModuleA/ModuleAModule.cs index 84d6e44..b7506a9 100644 --- a/12-UsingCompositeCommands/ModuleA/ModuleAModule.cs +++ b/12-UsingCompositeCommands/ModuleA/ModuleAModule.cs @@ -2,7 +2,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/12-UsingCompositeCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj b/12-UsingCompositeCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj index 8202fd7..a158b38 100644 --- a/12-UsingCompositeCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj +++ b/12-UsingCompositeCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) UsingCompositeCommands.Core true diff --git a/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj b/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj index 812e551..8bbf26c 100644 --- a/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj +++ b/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingCompositeCommands true diff --git a/13-IActiveAwareCommands/ModuleA/ModuleA.csproj b/13-IActiveAwareCommands/ModuleA/ModuleA.csproj index eb00c30..77be0c1 100644 --- a/13-IActiveAwareCommands/ModuleA/ModuleA.csproj +++ b/13-IActiveAwareCommands/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/13-IActiveAwareCommands/ModuleA/ModuleAModule.cs b/13-IActiveAwareCommands/ModuleA/ModuleAModule.cs index 84d6e44..b7506a9 100644 --- a/13-IActiveAwareCommands/ModuleA/ModuleAModule.cs +++ b/13-IActiveAwareCommands/ModuleA/ModuleAModule.cs @@ -2,7 +2,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/13-IActiveAwareCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj b/13-IActiveAwareCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj index 8202fd7..a158b38 100644 --- a/13-IActiveAwareCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj +++ b/13-IActiveAwareCommands/UsingCompositeCommands.Core/UsingCompositeCommands.Core.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) UsingCompositeCommands.Core true diff --git a/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj b/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj index 812e551..8bbf26c 100644 --- a/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj +++ b/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingCompositeCommands true diff --git a/14-UsingEventAggregator/ModuleA/ModuleA.csproj b/14-UsingEventAggregator/ModuleA/ModuleA.csproj index 2b19a62..0248958 100644 --- a/14-UsingEventAggregator/ModuleA/ModuleA.csproj +++ b/14-UsingEventAggregator/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/14-UsingEventAggregator/ModuleA/ModuleAModule.cs b/14-UsingEventAggregator/ModuleA/ModuleAModule.cs index ce44342..e3fb5a3 100644 --- a/14-UsingEventAggregator/ModuleA/ModuleAModule.cs +++ b/14-UsingEventAggregator/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/14-UsingEventAggregator/ModuleB/ModuleB.csproj b/14-UsingEventAggregator/ModuleB/ModuleB.csproj index 588f8c5..b2f65da 100644 --- a/14-UsingEventAggregator/ModuleB/ModuleB.csproj +++ b/14-UsingEventAggregator/ModuleB/ModuleB.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleB true diff --git a/14-UsingEventAggregator/ModuleB/ModuleBModule.cs b/14-UsingEventAggregator/ModuleB/ModuleBModule.cs index 098986a..032af2c 100644 --- a/14-UsingEventAggregator/ModuleB/ModuleBModule.cs +++ b/14-UsingEventAggregator/ModuleB/ModuleBModule.cs @@ -1,7 +1,7 @@ using ModuleB.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleB { diff --git a/14-UsingEventAggregator/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj b/14-UsingEventAggregator/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj index 680f17f..e1d93e0 100644 --- a/14-UsingEventAggregator/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj +++ b/14-UsingEventAggregator/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) UsingEventAggregator.Core true diff --git a/14-UsingEventAggregator/UsingEventAggregator/UsingEventAggregator.csproj b/14-UsingEventAggregator/UsingEventAggregator/UsingEventAggregator.csproj index 75de930..62f8bb3 100644 --- a/14-UsingEventAggregator/UsingEventAggregator/UsingEventAggregator.csproj +++ b/14-UsingEventAggregator/UsingEventAggregator/UsingEventAggregator.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingEventAggregator true diff --git a/15-FilteringEvents/ModuleA/ModuleA.csproj b/15-FilteringEvents/ModuleA/ModuleA.csproj index 2b19a62..0248958 100644 --- a/15-FilteringEvents/ModuleA/ModuleA.csproj +++ b/15-FilteringEvents/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/15-FilteringEvents/ModuleA/ModuleAModule.cs b/15-FilteringEvents/ModuleA/ModuleAModule.cs index d136052..a0a2e3f 100644 --- a/15-FilteringEvents/ModuleA/ModuleAModule.cs +++ b/15-FilteringEvents/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/15-FilteringEvents/ModuleB/ModuleB.csproj b/15-FilteringEvents/ModuleB/ModuleB.csproj index 588f8c5..b2f65da 100644 --- a/15-FilteringEvents/ModuleB/ModuleB.csproj +++ b/15-FilteringEvents/ModuleB/ModuleB.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleB true diff --git a/15-FilteringEvents/ModuleB/ModuleBModule.cs b/15-FilteringEvents/ModuleB/ModuleBModule.cs index 9d64fcf..d09cd7c 100644 --- a/15-FilteringEvents/ModuleB/ModuleBModule.cs +++ b/15-FilteringEvents/ModuleB/ModuleBModule.cs @@ -1,7 +1,7 @@ using ModuleB.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleB { diff --git a/15-FilteringEvents/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj b/15-FilteringEvents/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj index b14304d..4238b8e 100644 --- a/15-FilteringEvents/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj +++ b/15-FilteringEvents/UsingEventAggregator.Core/UsingEventAggregator.Core.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) BootstrapperShell true diff --git a/15-FilteringEvents/UsingEventAggregator/UsingEventAggregator.csproj b/15-FilteringEvents/UsingEventAggregator/UsingEventAggregator.csproj index 75de930..62f8bb3 100644 --- a/15-FilteringEvents/UsingEventAggregator/UsingEventAggregator.csproj +++ b/15-FilteringEvents/UsingEventAggregator/UsingEventAggregator.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingEventAggregator true diff --git a/16-RegionContext/ModuleA/ModuleA.csproj b/16-RegionContext/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/16-RegionContext/ModuleA/ModuleA.csproj +++ b/16-RegionContext/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/16-RegionContext/ModuleA/ModuleAModule.cs b/16-RegionContext/ModuleA/ModuleAModule.cs index cd11dc1..d312147 100644 --- a/16-RegionContext/ModuleA/ModuleAModule.cs +++ b/16-RegionContext/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/16-RegionContext/ModuleA/Views/PersonDetail.xaml.cs b/16-RegionContext/ModuleA/Views/PersonDetail.xaml.cs index 51e2da5..9dd0aff 100644 --- a/16-RegionContext/ModuleA/Views/PersonDetail.xaml.cs +++ b/16-RegionContext/ModuleA/Views/PersonDetail.xaml.cs @@ -1,7 +1,7 @@ using ModuleA.Business; using ModuleA.ViewModels; using Prism.Common; -using Prism.Regions; +using Prism.Navigation.Regions; using System.Windows.Controls; namespace ModuleA.Views diff --git a/16-RegionContext/RegionContext/RegionContext.csproj b/16-RegionContext/RegionContext/RegionContext.csproj index e1c3d70..71a925d 100644 --- a/16-RegionContext/RegionContext/RegionContext.csproj +++ b/16-RegionContext/RegionContext/RegionContext.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) RegionContext true diff --git a/17-BasicRegionNavigation/BasicRegionNavigation/BasicRegionNavigation.csproj b/17-BasicRegionNavigation/BasicRegionNavigation/BasicRegionNavigation.csproj index 531c02c..11e5cf6 100644 --- a/17-BasicRegionNavigation/BasicRegionNavigation/BasicRegionNavigation.csproj +++ b/17-BasicRegionNavigation/BasicRegionNavigation/BasicRegionNavigation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) BasicRegionNavigation true diff --git a/17-BasicRegionNavigation/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs b/17-BasicRegionNavigation/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs index 8c82d17..865499c 100644 --- a/17-BasicRegionNavigation/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs +++ b/17-BasicRegionNavigation/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace BasicRegionNavigation.ViewModels { diff --git a/17-BasicRegionNavigation/ModuleA/ModuleA.csproj b/17-BasicRegionNavigation/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/17-BasicRegionNavigation/ModuleA/ModuleA.csproj +++ b/17-BasicRegionNavigation/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/18-NavigationCallback/BasicRegionNavigation/BasicRegionNavigation.csproj b/18-NavigationCallback/BasicRegionNavigation/BasicRegionNavigation.csproj index 531c02c..11e5cf6 100644 --- a/18-NavigationCallback/BasicRegionNavigation/BasicRegionNavigation.csproj +++ b/18-NavigationCallback/BasicRegionNavigation/BasicRegionNavigation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) BasicRegionNavigation true diff --git a/18-NavigationCallback/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs b/18-NavigationCallback/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs index 78f3e19..512c1eb 100644 --- a/18-NavigationCallback/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs +++ b/18-NavigationCallback/BasicRegionNavigation/ViewModels/MainWindowViewModel.cs @@ -1,7 +1,7 @@ using System; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace BasicRegionNavigation.ViewModels { diff --git a/18-NavigationCallback/ModuleA/ModuleA.csproj b/18-NavigationCallback/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/18-NavigationCallback/ModuleA/ModuleA.csproj +++ b/18-NavigationCallback/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/19-NavigationParticipation/ModuleA/ModuleA.csproj b/19-NavigationParticipation/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/19-NavigationParticipation/ModuleA/ModuleA.csproj +++ b/19-NavigationParticipation/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/19-NavigationParticipation/ModuleA/ViewModels/ViewAViewModel.cs b/19-NavigationParticipation/ModuleA/ViewModels/ViewAViewModel.cs index e5cf5fa..8c749c9 100644 --- a/19-NavigationParticipation/ModuleA/ViewModels/ViewAViewModel.cs +++ b/19-NavigationParticipation/ModuleA/ViewModels/ViewAViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/19-NavigationParticipation/ModuleA/ViewModels/ViewBViewModel.cs b/19-NavigationParticipation/ModuleA/ViewModels/ViewBViewModel.cs index 549bafe..2235b38 100644 --- a/19-NavigationParticipation/ModuleA/ViewModels/ViewBViewModel.cs +++ b/19-NavigationParticipation/ModuleA/ViewModels/ViewBViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/19-NavigationParticipation/NavigationParticipation/NavigationParticipation.csproj b/19-NavigationParticipation/NavigationParticipation/NavigationParticipation.csproj index 5f86467..456a18b 100644 --- a/19-NavigationParticipation/NavigationParticipation/NavigationParticipation.csproj +++ b/19-NavigationParticipation/NavigationParticipation/NavigationParticipation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) NavigationParticipation true diff --git a/19-NavigationParticipation/NavigationParticipation/ViewModels/MainWindowViewModel.cs b/19-NavigationParticipation/NavigationParticipation/ViewModels/MainWindowViewModel.cs index b3aa862..9711616 100644 --- a/19-NavigationParticipation/NavigationParticipation/ViewModels/MainWindowViewModel.cs +++ b/19-NavigationParticipation/NavigationParticipation/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace NavigationParticipation.ViewModels { diff --git a/20-NavigateToExistingViews/ModuleA/ModuleA.csproj b/20-NavigateToExistingViews/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/20-NavigateToExistingViews/ModuleA/ModuleA.csproj +++ b/20-NavigateToExistingViews/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/20-NavigateToExistingViews/ModuleA/ViewModels/ViewAViewModel.cs b/20-NavigateToExistingViews/ModuleA/ViewModels/ViewAViewModel.cs index acbb59a..9f96dbf 100644 --- a/20-NavigateToExistingViews/ModuleA/ViewModels/ViewAViewModel.cs +++ b/20-NavigateToExistingViews/ModuleA/ViewModels/ViewAViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/20-NavigateToExistingViews/ModuleA/ViewModels/ViewBViewModel.cs b/20-NavigateToExistingViews/ModuleA/ViewModels/ViewBViewModel.cs index 607b97b..6756a56 100644 --- a/20-NavigateToExistingViews/ModuleA/ViewModels/ViewBViewModel.cs +++ b/20-NavigateToExistingViews/ModuleA/ViewModels/ViewBViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/20-NavigateToExistingViews/NavigationParticipation/NavigationParticipation.csproj b/20-NavigateToExistingViews/NavigationParticipation/NavigationParticipation.csproj index 5f86467..456a18b 100644 --- a/20-NavigateToExistingViews/NavigationParticipation/NavigationParticipation.csproj +++ b/20-NavigateToExistingViews/NavigationParticipation/NavigationParticipation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) NavigationParticipation true diff --git a/20-NavigateToExistingViews/NavigationParticipation/ViewModels/MainWindowViewModel.cs b/20-NavigateToExistingViews/NavigationParticipation/ViewModels/MainWindowViewModel.cs index b3aa862..9711616 100644 --- a/20-NavigateToExistingViews/NavigationParticipation/ViewModels/MainWindowViewModel.cs +++ b/20-NavigateToExistingViews/NavigationParticipation/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace NavigationParticipation.ViewModels { diff --git a/21-PassingParameters/ModuleA/ModuleA.csproj b/21-PassingParameters/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/21-PassingParameters/ModuleA/ModuleA.csproj +++ b/21-PassingParameters/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/21-PassingParameters/ModuleA/ModuleAModule.cs b/21-PassingParameters/ModuleA/ModuleAModule.cs index 0c8a3bd..a3eb181 100644 --- a/21-PassingParameters/ModuleA/ModuleAModule.cs +++ b/21-PassingParameters/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/21-PassingParameters/ModuleA/ViewModels/PersonDetailViewModel.cs b/21-PassingParameters/ModuleA/ViewModels/PersonDetailViewModel.cs index 449d8e6..3d3a17d 100644 --- a/21-PassingParameters/ModuleA/ViewModels/PersonDetailViewModel.cs +++ b/21-PassingParameters/ModuleA/ViewModels/PersonDetailViewModel.cs @@ -1,7 +1,7 @@ using System; using ModuleA.Business; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/21-PassingParameters/ModuleA/ViewModels/PersonListViewModel.cs b/21-PassingParameters/ModuleA/ViewModels/PersonListViewModel.cs index 8f1ff88..1a01bb4 100644 --- a/21-PassingParameters/ModuleA/ViewModels/PersonListViewModel.cs +++ b/21-PassingParameters/ModuleA/ViewModels/PersonListViewModel.cs @@ -1,7 +1,7 @@ using ModuleA.Business; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; using System; using System.Collections.ObjectModel; diff --git a/21-PassingParameters/PassingParameters/PassingParameters.csproj b/21-PassingParameters/PassingParameters/PassingParameters.csproj index fd6f351..3416edb 100644 --- a/21-PassingParameters/PassingParameters/PassingParameters.csproj +++ b/21-PassingParameters/PassingParameters/PassingParameters.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) PassingParameters true diff --git a/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ConfirmCancelNavigation.csproj b/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ConfirmCancelNavigation.csproj index c22e16e..3d82bf9 100644 --- a/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ConfirmCancelNavigation.csproj +++ b/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ConfirmCancelNavigation.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) ConfirmCancelNavigation true diff --git a/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ViewModels/MainWindowViewModel.cs b/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ViewModels/MainWindowViewModel.cs index 3bae905..ccebf33 100644 --- a/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ViewModels/MainWindowViewModel.cs +++ b/22-ConfirmCancelNavigation/ConfirmCancelNavigation/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ConfirmCancelNavigation.ViewModels { diff --git a/22-ConfirmCancelNavigation/ModuleA/ModuleA.csproj b/22-ConfirmCancelNavigation/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/22-ConfirmCancelNavigation/ModuleA/ModuleA.csproj +++ b/22-ConfirmCancelNavigation/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/22-ConfirmCancelNavigation/ModuleA/ViewModels/ViewAViewModel.cs b/22-ConfirmCancelNavigation/ModuleA/ViewModels/ViewAViewModel.cs index 12f5646..4fbc512 100644 --- a/22-ConfirmCancelNavigation/ModuleA/ViewModels/ViewAViewModel.cs +++ b/22-ConfirmCancelNavigation/ModuleA/ViewModels/ViewAViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; using System; using System.Windows; diff --git a/23-RegionMemberLifetime/ModuleA/ModuleA.csproj b/23-RegionMemberLifetime/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/23-RegionMemberLifetime/ModuleA/ModuleA.csproj +++ b/23-RegionMemberLifetime/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/23-RegionMemberLifetime/ModuleA/ViewModels/ViewAViewModel.cs b/23-RegionMemberLifetime/ModuleA/ViewModels/ViewAViewModel.cs index af6f7ac..6b93424 100644 --- a/23-RegionMemberLifetime/ModuleA/ViewModels/ViewAViewModel.cs +++ b/23-RegionMemberLifetime/ModuleA/ViewModels/ViewAViewModel.cs @@ -1,6 +1,6 @@ using System; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/23-RegionMemberLifetime/ModuleA/ViewModels/ViewBViewModel.cs b/23-RegionMemberLifetime/ModuleA/ViewModels/ViewBViewModel.cs index 85cc980..3053f08 100644 --- a/23-RegionMemberLifetime/ModuleA/ViewModels/ViewBViewModel.cs +++ b/23-RegionMemberLifetime/ModuleA/ViewModels/ViewBViewModel.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/23-RegionMemberLifetime/RegionMemberLifetime/RegionMemberLifetime.csproj b/23-RegionMemberLifetime/RegionMemberLifetime/RegionMemberLifetime.csproj index 02db6c1..983de72 100644 --- a/23-RegionMemberLifetime/RegionMemberLifetime/RegionMemberLifetime.csproj +++ b/23-RegionMemberLifetime/RegionMemberLifetime/RegionMemberLifetime.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) RegionMemberLifetime true diff --git a/23-RegionMemberLifetime/RegionMemberLifetime/ViewModels/MainWindowViewModel.cs b/23-RegionMemberLifetime/RegionMemberLifetime/ViewModels/MainWindowViewModel.cs index a191a53..202b026 100644 --- a/23-RegionMemberLifetime/RegionMemberLifetime/ViewModels/MainWindowViewModel.cs +++ b/23-RegionMemberLifetime/RegionMemberLifetime/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; using System.Collections.ObjectModel; using System.Collections.Specialized; diff --git a/24-NavigationJournal/ModuleA/ModuleA.csproj b/24-NavigationJournal/ModuleA/ModuleA.csproj index fc88120..bc2282b 100644 --- a/24-NavigationJournal/ModuleA/ModuleA.csproj +++ b/24-NavigationJournal/ModuleA/ModuleA.csproj @@ -1,6 +1,6 @@  - net6.0-windows + $(PrismTargetFramework) ModuleA true diff --git a/24-NavigationJournal/ModuleA/ModuleAModule.cs b/24-NavigationJournal/ModuleA/ModuleAModule.cs index 08eaef2..1541b14 100644 --- a/24-NavigationJournal/ModuleA/ModuleAModule.cs +++ b/24-NavigationJournal/ModuleA/ModuleAModule.cs @@ -1,7 +1,7 @@ using ModuleA.Views; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA { diff --git a/24-NavigationJournal/ModuleA/ViewModels/PersonDetailViewModel.cs b/24-NavigationJournal/ModuleA/ViewModels/PersonDetailViewModel.cs index 5682bd2..dc0a0ea 100644 --- a/24-NavigationJournal/ModuleA/ViewModels/PersonDetailViewModel.cs +++ b/24-NavigationJournal/ModuleA/ViewModels/PersonDetailViewModel.cs @@ -2,7 +2,7 @@ using ModuleA.Business; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; namespace ModuleA.ViewModels { diff --git a/24-NavigationJournal/ModuleA/ViewModels/PersonListViewModel.cs b/24-NavigationJournal/ModuleA/ViewModels/PersonListViewModel.cs index a9e621c..6681634 100644 --- a/24-NavigationJournal/ModuleA/ViewModels/PersonListViewModel.cs +++ b/24-NavigationJournal/ModuleA/ViewModels/PersonListViewModel.cs @@ -1,7 +1,7 @@ using ModuleA.Business; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; using System; using System.Collections.ObjectModel; diff --git a/24-NavigationJournal/NavigationJournal/NavigationJournal.csproj b/24-NavigationJournal/NavigationJournal/NavigationJournal.csproj index 8d17d9b..daac001 100644 --- a/24-NavigationJournal/NavigationJournal/NavigationJournal.csproj +++ b/24-NavigationJournal/NavigationJournal/NavigationJournal.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) NavigationJournal true diff --git a/26-UsingDialogService/UsingDialogService/UsingDialogService.csproj b/26-UsingDialogService/UsingDialogService/UsingDialogService.csproj index 7a394ec..81a1256 100644 --- a/26-UsingDialogService/UsingDialogService/UsingDialogService.csproj +++ b/26-UsingDialogService/UsingDialogService/UsingDialogService.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingDialogService true diff --git a/26-UsingDialogService/UsingDialogService/ViewModels/MainWindowViewModel.cs b/26-UsingDialogService/UsingDialogService/ViewModels/MainWindowViewModel.cs index 37ef22b..90d4639 100644 --- a/26-UsingDialogService/UsingDialogService/ViewModels/MainWindowViewModel.cs +++ b/26-UsingDialogService/UsingDialogService/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; namespace UsingDialogService.ViewModels { diff --git a/26-UsingDialogService/UsingDialogService/ViewModels/NotificationDialogViewModel.cs b/26-UsingDialogService/UsingDialogService/ViewModels/NotificationDialogViewModel.cs index 173c885..3344acc 100644 --- a/26-UsingDialogService/UsingDialogService/ViewModels/NotificationDialogViewModel.cs +++ b/26-UsingDialogService/UsingDialogService/ViewModels/NotificationDialogViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; using System; using System.Collections.Generic; using System.Linq; @@ -27,7 +27,7 @@ public string Title set { SetProperty(ref _title, value); } } - public event Action RequestClose; + public DialogCloseListener RequestClose { get; } protected virtual void CloseDialog(string parameter) { @@ -43,7 +43,7 @@ protected virtual void CloseDialog(string parameter) public virtual void RaiseRequestClose(IDialogResult dialogResult) { - RequestClose?.Invoke(dialogResult); + RequestClose.Invoke(dialogResult); } public virtual bool CanCloseDialog() diff --git a/27-StylingDialog/StylingDialog/StylingDialog.csproj b/27-StylingDialog/StylingDialog/StylingDialog.csproj index 651648a..d2595d7 100644 --- a/27-StylingDialog/StylingDialog/StylingDialog.csproj +++ b/27-StylingDialog/StylingDialog/StylingDialog.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) StylingDialog true diff --git a/27-StylingDialog/StylingDialog/ViewModels/MainWindowViewModel.cs b/27-StylingDialog/StylingDialog/ViewModels/MainWindowViewModel.cs index 5eac994..81c6f0e 100644 --- a/27-StylingDialog/StylingDialog/ViewModels/MainWindowViewModel.cs +++ b/27-StylingDialog/StylingDialog/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; namespace StylingDialog.ViewModels { diff --git a/27-StylingDialog/StylingDialog/ViewModels/NotificationDialogViewModel.cs b/27-StylingDialog/StylingDialog/ViewModels/NotificationDialogViewModel.cs index 117318d..8c14a09 100644 --- a/27-StylingDialog/StylingDialog/ViewModels/NotificationDialogViewModel.cs +++ b/27-StylingDialog/StylingDialog/ViewModels/NotificationDialogViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; using System; using System.Collections.Generic; using System.Linq; @@ -27,7 +27,7 @@ public string Title set { SetProperty(ref _title, value); } } - public event Action RequestClose; + public DialogCloseListener RequestClose { get; } protected virtual void CloseDialog(string parameter) { @@ -43,7 +43,7 @@ protected virtual void CloseDialog(string parameter) public virtual void RaiseRequestClose(IDialogResult dialogResult) { - RequestClose?.Invoke(dialogResult); + RequestClose.Invoke(dialogResult); } public virtual bool CanCloseDialog() diff --git a/28-UsingCustomWindow/UsingCustomWindow/UsingCustomWindow.csproj b/28-UsingCustomWindow/UsingCustomWindow/UsingCustomWindow.csproj index 04adbae..3a2da8a 100644 --- a/28-UsingCustomWindow/UsingCustomWindow/UsingCustomWindow.csproj +++ b/28-UsingCustomWindow/UsingCustomWindow/UsingCustomWindow.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingCustomWindow true diff --git a/28-UsingCustomWindow/UsingCustomWindow/ViewModels/MainWindowViewModel.cs b/28-UsingCustomWindow/UsingCustomWindow/ViewModels/MainWindowViewModel.cs index 26d7291..983a63d 100644 --- a/28-UsingCustomWindow/UsingCustomWindow/ViewModels/MainWindowViewModel.cs +++ b/28-UsingCustomWindow/UsingCustomWindow/ViewModels/MainWindowViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; namespace UsingCustomWindow.ViewModels { diff --git a/28-UsingCustomWindow/UsingCustomWindow/ViewModels/NotificationDialogViewModel.cs b/28-UsingCustomWindow/UsingCustomWindow/ViewModels/NotificationDialogViewModel.cs index 6d68569..f59deea 100644 --- a/28-UsingCustomWindow/UsingCustomWindow/ViewModels/NotificationDialogViewModel.cs +++ b/28-UsingCustomWindow/UsingCustomWindow/ViewModels/NotificationDialogViewModel.cs @@ -1,6 +1,6 @@ using Prism.Commands; using Prism.Mvvm; -using Prism.Services.Dialogs; +using Prism.Dialogs; using System; using System.Collections.Generic; using System.Text; @@ -27,7 +27,7 @@ public string Title set { SetProperty(ref _title, value); } } - public event Action RequestClose; + public DialogCloseListener RequestClose { get; } protected virtual void CloseDialog(string parameter) { @@ -43,7 +43,7 @@ protected virtual void CloseDialog(string parameter) public virtual void RaiseRequestClose(IDialogResult dialogResult) { - RequestClose?.Invoke(dialogResult); + RequestClose.Invoke(dialogResult); } public virtual bool CanCloseDialog() diff --git a/28-UsingCustomWindow/UsingCustomWindow/Views/MyCustomWindow.xaml.cs b/28-UsingCustomWindow/UsingCustomWindow/Views/MyCustomWindow.xaml.cs index 4eba6ec..4480253 100644 --- a/28-UsingCustomWindow/UsingCustomWindow/Views/MyCustomWindow.xaml.cs +++ b/28-UsingCustomWindow/UsingCustomWindow/Views/MyCustomWindow.xaml.cs @@ -1,4 +1,4 @@ -using Prism.Services.Dialogs; +using Prism.Dialogs; using System; using System.Collections.Generic; using System.Text; diff --git a/29-InvokeCommandAction/UsingInvokeCommandAction/UsingInvokeCommandAction.csproj b/29-InvokeCommandAction/UsingInvokeCommandAction/UsingInvokeCommandAction.csproj index 8afa863..27d95a1 100644 --- a/29-InvokeCommandAction/UsingInvokeCommandAction/UsingInvokeCommandAction.csproj +++ b/29-InvokeCommandAction/UsingInvokeCommandAction/UsingInvokeCommandAction.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + $(PrismTargetFramework) UsingInvokeCommandAction true diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..4a80d7e --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,7 @@ + + + enable + true + net6.0-windows + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets deleted file mode 100644 index 40ec7a9..0000000 --- a/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..926e16c --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,14 @@ + + + + 9.0.271-pre + + + + + + + + + + \ No newline at end of file diff --git a/Packages.props b/Packages.props deleted file mode 100644 index 5980b7b..0000000 --- a/Packages.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - 8.0.0.1909 - - - - - - - - - - \ No newline at end of file