Merge pull request #100 from PrismLibrary/dev/ds/ci-build

chore: adding ci build
PrismLibrary · Oct 28, 2023 · 9587b47 · 9587b47
2 parents 706e65c + 69120d2
commit 9587b47
Show file tree

Hide file tree

Showing 143 changed files with 183 additions and 125 deletions.
diff --git a/.github/workflows/ci.yml 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: ''
diff --git a/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj b/01-BootstrapperShell/BootstrapperShell/BootstrapperShell.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>BootstrapperShell</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/02-Regions/Regions/Regions.csproj b/02-Regions/Regions/Regions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Regions</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Regions</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj b/04-ViewDiscovery/ViewDiscovery/ViewDiscovery.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ViewDiscovery</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>BootstrapperShell</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ActiviationDeactiviation</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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/...odules - AppConfig/ModuleA/ModuleA.csproj → 07-Modules-AppConfig/ModuleA/ModuleA.csproj b/...odules - AppConfig/ModuleA/ModuleA.csproj → 07-Modules-AppConfig/ModuleA/ModuleA.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Prism.Wpf" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetDir)*.*&quot; &quot;$(SolutionDir)\$(SolutionName)\bin\Debug\net6.0-windows\&quot; /Y" />
+    <Exec Command="xcopy &quot;$(TargetDir)*.*&quot; &quot;$(SolutionDir)\$(SolutionName)\bin\Debug\$(PrismTargetFramework)\&quot; /Y" />
   </Target>
 </Project>
diff --git a/...les - LoadManual/ModuleA/ModuleAModule.cs → ...odules-AppConfig/ModuleA/ModuleAModule.cs b/...les - LoadManual/ModuleA/ModuleAModule.cs → ...odules-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/...ules - AppConfig/ModuleA/Views/ViewA.xaml → ...odules-AppConfig/ModuleA/Views/ViewA.xaml b/...ules - AppConfig/ModuleA/Views/ViewA.xaml → ...odules-AppConfig/ModuleA/Views/ViewA.xaml
diff --git a/...s - AppConfig/ModuleA/Views/ViewA.xaml.cs → ...les-AppConfig/ModuleA/Views/ViewA.xaml.cs b/...s - AppConfig/ModuleA/Views/ViewA.xaml.cs → ...les-AppConfig/ModuleA/Views/ViewA.xaml.cs
diff --git a/07-Modules - AppConfig/Modules.sln → 07-Modules-AppConfig/Modules.sln b/07-Modules - AppConfig/Modules.sln → 07-Modules-AppConfig/Modules.sln
diff --git a/07-Modules - AppConfig/Modules/App.config → 07-Modules-AppConfig/Modules/App.config b/07-Modules - AppConfig/Modules/App.config → 07-Modules-AppConfig/Modules/App.config
diff --git a/07-Modules - AppConfig/Modules/App.xaml → 07-Modules-AppConfig/Modules/App.xaml b/07-Modules - AppConfig/Modules/App.xaml → 07-Modules-AppConfig/Modules/App.xaml
diff --git a/07-Modules - AppConfig/Modules/App.xaml.cs → 07-Modules-AppConfig/Modules/App.xaml.cs b/07-Modules - AppConfig/Modules/App.xaml.cs → 07-Modules-AppConfig/Modules/App.xaml.cs
diff --git a/...odules - Directory/Modules/Modules.csproj → 07-Modules-AppConfig/Modules/Modules.csproj b/...odules - Directory/Modules/Modules.csproj → 07-Modules-AppConfig/Modules/Modules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Modules</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/...- AppConfig/Modules/Views/MainWindow.xaml → ...s-AppConfig/Modules/Views/MainWindow.xaml b/...- AppConfig/Modules/Views/MainWindow.xaml → ...s-AppConfig/Modules/Views/MainWindow.xaml
diff --git a/...ppConfig/Modules/Views/MainWindow.xaml.cs → ...ppConfig/Modules/Views/MainWindow.xaml.cs b/...ppConfig/Modules/Views/MainWindow.xaml.cs → ...ppConfig/Modules/Views/MainWindow.xaml.cs
diff --git a/07-Modules - Xaml/ModuleA/ModuleA.csproj → 07-Modules-Code/ModuleA/ModuleA.csproj b/07-Modules - Xaml/ModuleA/ModuleA.csproj → 07-Modules-Code/ModuleA/ModuleA.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/...ules - AppConfig/ModuleA/ModuleAModule.cs → 07-Modules-Code/ModuleA/ModuleAModule.cs b/...ules - AppConfig/ModuleA/ModuleAModule.cs → 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 → 07-Modules-Code/ModuleA/Views/ViewA.xaml b/07-Modules - Code/ModuleA/Views/ViewA.xaml → 07-Modules-Code/ModuleA/Views/ViewA.xaml
diff --git a/...odules - Code/ModuleA/Views/ViewA.xaml.cs → 07-Modules-Code/ModuleA/Views/ViewA.xaml.cs b/...odules - Code/ModuleA/Views/ViewA.xaml.cs → 07-Modules-Code/ModuleA/Views/ViewA.xaml.cs
diff --git a/07-Modules - Code/Modules.sln → 07-Modules-Code/Modules.sln b/07-Modules - Code/Modules.sln → 07-Modules-Code/Modules.sln
diff --git a/07-Modules - Code/Modules/App.xaml → 07-Modules-Code/Modules/App.xaml b/07-Modules - Code/Modules/App.xaml → 07-Modules-Code/Modules/App.xaml
diff --git a/07-Modules - Code/Modules/App.xaml.cs → 07-Modules-Code/Modules/App.xaml.cs b/07-Modules - Code/Modules/App.xaml.cs → 07-Modules-Code/Modules/App.xaml.cs
diff --git a/07-Modules - Code/Modules/Modules.csproj → 07-Modules-Code/Modules/Modules.csproj b/07-Modules - Code/Modules/Modules.csproj → 07-Modules-Code/Modules/Modules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Modules</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/...ules - Code/Modules/Views/MainWindow.xaml → ...odules-Code/Modules/Views/MainWindow.xaml b/...ules - Code/Modules/Views/MainWindow.xaml → ...odules-Code/Modules/Views/MainWindow.xaml
diff --git a/...s - Code/Modules/Views/MainWindow.xaml.cs → ...les-Code/Modules/Views/MainWindow.xaml.cs b/...s - Code/Modules/Views/MainWindow.xaml.cs → ...les-Code/Modules/Views/MainWindow.xaml.cs
diff --git a/...odules - Directory/ModuleA/ModuleA.csproj → 07-Modules-Directory/ModuleA/ModuleA.csproj b/...odules - Directory/ModuleA/ModuleA.csproj → 07-Modules-Directory/ModuleA/ModuleA.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Prism.Wpf" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy &quot;$(TargetDir)$(TargetName)*$(TargetExt)&quot; &quot;$(SolutionDir)$(SolutionName)\bin\Debug\net6.0-windows\Modules\&quot; /Y /S" />
+    <Exec Command="xcopy &quot;$(TargetDir)$(TargetName)*$(TargetExt)&quot; &quot;$(SolutionDir)$(SolutionName)\bin\Debug\$(PrismTargetFramework)\Modules\&quot; /Y /S" />
   </Target>
 </Project>
diff --git a/...ules - Directory/ModuleA/ModuleAModule.cs → ...odules-Directory/ModuleA/ModuleAModule.cs b/...ules - Directory/ModuleA/ModuleAModule.cs → ...odules-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/...ules - Directory/ModuleA/Views/ViewA.xaml → ...odules-Directory/ModuleA/Views/ViewA.xaml b/...ules - Directory/ModuleA/Views/ViewA.xaml → ...odules-Directory/ModuleA/Views/ViewA.xaml
diff --git a/...s - Directory/ModuleA/Views/ViewA.xaml.cs → ...les-Directory/ModuleA/Views/ViewA.xaml.cs b/...s - Directory/ModuleA/Views/ViewA.xaml.cs → ...les-Directory/ModuleA/Views/ViewA.xaml.cs
diff --git a/07-Modules - Directory/Modules.sln → 07-Modules-Directory/Modules.sln b/07-Modules - Directory/Modules.sln → 07-Modules-Directory/Modules.sln
diff --git a/07-Modules - Directory/Modules/App.xaml → 07-Modules-Directory/Modules/App.xaml b/07-Modules - Directory/Modules/App.xaml → 07-Modules-Directory/Modules/App.xaml
diff --git a/07-Modules - Directory/Modules/App.xaml.cs → 07-Modules-Directory/Modules/App.xaml.cs b/07-Modules - Directory/Modules/App.xaml.cs → 07-Modules-Directory/Modules/App.xaml.cs
diff --git a/...odules - AppConfig/Modules/Modules.csproj → 07-Modules-Directory/Modules/Modules.csproj b/...odules - AppConfig/Modules/Modules.csproj → 07-Modules-Directory/Modules/Modules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Modules</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/...- Directory/Modules/Views/MainWindow.xaml → ...s-Directory/Modules/Views/MainWindow.xaml b/...- Directory/Modules/Views/MainWindow.xaml → ...s-Directory/Modules/Views/MainWindow.xaml
diff --git a/...irectory/Modules/Views/MainWindow.xaml.cs → ...irectory/Modules/Views/MainWindow.xaml.cs b/...irectory/Modules/Views/MainWindow.xaml.cs → ...irectory/Modules/Views/MainWindow.xaml.cs
diff --git a/...dules - LoadManual/ModuleA/ModuleA.csproj → 07-Modules-LoadManual/ModuleA/ModuleA.csproj b/...dules - LoadManual/ModuleA/ModuleA.csproj → 07-Modules-LoadManual/ModuleA/ModuleA.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/07-Modules - Code/ModuleA/ModuleAModule.cs → ...dules-LoadManual/ModuleA/ModuleAModule.cs b/07-Modules - Code/ModuleA/ModuleAModule.cs → ...dules-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/...les - LoadManual/ModuleA/Views/ViewA.xaml → ...dules-LoadManual/ModuleA/Views/ViewA.xaml b/...les - LoadManual/ModuleA/Views/ViewA.xaml → ...dules-LoadManual/ModuleA/Views/ViewA.xaml
diff --git a/... - LoadManual/ModuleA/Views/ViewA.xaml.cs → ...es-LoadManual/ModuleA/Views/ViewA.xaml.cs b/... - LoadManual/ModuleA/Views/ViewA.xaml.cs → ...es-LoadManual/ModuleA/Views/ViewA.xaml.cs
diff --git a/07-Modules - LoadManual/Modules.sln → 07-Modules-LoadManual/Modules.sln b/07-Modules - LoadManual/Modules.sln → 07-Modules-LoadManual/Modules.sln
diff --git a/07-Modules - LoadManual/Modules/App.xaml → 07-Modules-LoadManual/Modules/App.xaml b/07-Modules - LoadManual/Modules/App.xaml → 07-Modules-LoadManual/Modules/App.xaml
diff --git a/07-Modules - LoadManual/Modules/App.xaml.cs → 07-Modules-LoadManual/Modules/App.xaml.cs b/07-Modules - LoadManual/Modules/App.xaml.cs → 07-Modules-LoadManual/Modules/App.xaml.cs
diff --git a/...dules - LoadManual/Modules/Modules.csproj → 07-Modules-LoadManual/Modules/Modules.csproj b/...dules - LoadManual/Modules/Modules.csproj → 07-Modules-LoadManual/Modules/Modules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Modules</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/... LoadManual/Modules/Views/MainWindow.xaml → ...-LoadManual/Modules/Views/MainWindow.xaml b/... LoadManual/Modules/Views/MainWindow.xaml → ...-LoadManual/Modules/Views/MainWindow.xaml
diff --git a/...adManual/Modules/Views/MainWindow.xaml.cs → ...adManual/Modules/Views/MainWindow.xaml.cs b/...adManual/Modules/Views/MainWindow.xaml.cs → ...adManual/Modules/Views/MainWindow.xaml.cs
diff --git a/07-Modules - Code/ModuleA/ModuleA.csproj → 07-Modules-Xaml/ModuleA/ModuleA.csproj b/07-Modules - Code/ModuleA/ModuleA.csproj → 07-Modules-Xaml/ModuleA/ModuleA.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/07-Modules - Xaml/ModuleA/ModuleAModule.cs → 07-Modules-Xaml/ModuleA/ModuleAModule.cs b/07-Modules - Xaml/ModuleA/ModuleAModule.cs → 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 → 07-Modules-Xaml/ModuleA/Views/ViewA.xaml b/07-Modules - Xaml/ModuleA/Views/ViewA.xaml → 07-Modules-Xaml/ModuleA/Views/ViewA.xaml
diff --git a/...odules - Xaml/ModuleA/Views/ViewA.xaml.cs → 07-Modules-Xaml/ModuleA/Views/ViewA.xaml.cs b/...odules - Xaml/ModuleA/Views/ViewA.xaml.cs → 07-Modules-Xaml/ModuleA/Views/ViewA.xaml.cs
diff --git a/07-Modules - Xaml/Modules.sln → 07-Modules-Xaml/Modules.sln b/07-Modules - Xaml/Modules.sln → 07-Modules-Xaml/Modules.sln
diff --git a/07-Modules - Xaml/Modules/App.config → 07-Modules-Xaml/Modules/App.config b/07-Modules - Xaml/Modules/App.config → 07-Modules-Xaml/Modules/App.config
diff --git a/07-Modules - Xaml/Modules/App.xaml → 07-Modules-Xaml/Modules/App.xaml b/07-Modules - Xaml/Modules/App.xaml → 07-Modules-Xaml/Modules/App.xaml
diff --git a/07-Modules - Xaml/Modules/App.xaml.cs → 07-Modules-Xaml/Modules/App.xaml.cs b/07-Modules - Xaml/Modules/App.xaml.cs → 07-Modules-Xaml/Modules/App.xaml.cs
diff --git a/07-Modules - Xaml/Modules/ModuleCatalog.xaml → 07-Modules-Xaml/Modules/ModuleCatalog.xaml b/07-Modules - Xaml/Modules/ModuleCatalog.xaml → 07-Modules-Xaml/Modules/ModuleCatalog.xaml
diff --git a/07-Modules - Xaml/Modules/Modules.csproj → 07-Modules-Xaml/Modules/Modules.csproj b/07-Modules - Xaml/Modules/Modules.csproj → 07-Modules-Xaml/Modules/Modules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>Modules</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/...ules - Xaml/Modules/Views/MainWindow.xaml → ...odules-Xaml/Modules/Views/MainWindow.xaml b/...ules - Xaml/Modules/Views/MainWindow.xaml → ...odules-Xaml/Modules/Views/MainWindow.xaml
diff --git a/...s - Xaml/Modules/Views/MainWindow.xaml.cs → ...les-Xaml/Modules/Views/MainWindow.xaml.cs b/...s - Xaml/Modules/Views/MainWindow.xaml.cs → ...les-Xaml/Modules/Views/MainWindow.xaml.cs
diff --git a/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj b/08-ViewModelLocator/ViewModelLocator/ViewModelLocator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ViewModelLocator</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj b/09-ChangeConvention/ViewModelLocator/ViewModelLocator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ViewModelLocator</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj b/10-CustomRegistrations/ViewModelLocator/ViewModelLocator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ViewModelLocator</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj b/11-UsingDelegateCommands/UsingDelegateCommands/UsingDelegateCommands.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>UsingDelegateCommands</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/12-UsingCompositeCommands/ModuleA/ModuleA.csproj b/12-UsingCompositeCommands/ModuleA/ModuleA.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>UsingCompositeCommands.Core</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj b/12-UsingCompositeCommands/UsingCompositeCommands/UsingCompositeCommands.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>UsingCompositeCommands</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/13-IActiveAwareCommands/ModuleA/ModuleA.csproj b/13-IActiveAwareCommands/ModuleA/ModuleA.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>ModuleA</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git 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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>UsingCompositeCommands.Core</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>

diff --git a/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj b/13-IActiveAwareCommands/UsingCompositeCommands/UsingCompositeCommands.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>$(PrismTargetFramework)</TargetFramework>
     <AssemblyName>UsingCompositeCommands</AssemblyName>
     <UseWPF>true</UseWPF>
   </PropertyGroup>