Merge pull request #3 from HakamFostok/dev

Dev
HakamFostok · May 5, 2020 · 7c13730 · 7c13730
2 parents 7622397 + b77bed7
commit 7c13730
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 40 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Prism.Core" Version="7.2.0.1422" />
+    <PackageReference Include="Prism.Wpf" Version="7.2.0.1422" />
+  </ItemGroup>
+
+</Project>
diff --git a/...edModule/Interfaces/IFileDialogService.cs → Core/Interfaces/IFileDialogService.cs b/...edModule/Interfaces/IFileDialogService.cs → Core/Interfaces/IFileDialogService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SharedModule
+namespace Core
 {
     public interface IFileDialogService
     {

diff --git a/SharedModule/Interfaces/ILog.cs → Core/Interfaces/ILog.cs b/SharedModule/Interfaces/ILog.cs → Core/Interfaces/ILog.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SharedModule
+namespace Core
 {
     public interface ILogService
     {

diff --git a/...edModule/Interfaces/IMessageBoxService.cs → Core/Interfaces/IMessageBoxService.cs b/...edModule/Interfaces/IMessageBoxService.cs → Core/Interfaces/IMessageBoxService.cs
@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace SharedModule
+namespace Core
 {
     /// <summary>
     /// Service which provide access to the MessageBox methods and FileDialogs

diff --git a/SharedModule/Utility/BaseDialogViewModel.cs → Core/Utility/BaseDialogViewModel.cs b/SharedModule/Utility/BaseDialogViewModel.cs → Core/Utility/BaseDialogViewModel.cs
@@ -1,7 +1,7 @@
 using Prism.Services.Dialogs;
 using System;
 
-namespace SharedModule
+namespace Core
 {
     public class BaseDialogViewModel : BaseViewModel, IDialogAware
     {

diff --git a/SharedModule/Utility/BaseViewModel.cs → Core/Utility/BaseViewModel.cs b/SharedModule/Utility/BaseViewModel.cs → Core/Utility/BaseViewModel.cs
@@ -1,5 +1,4 @@
 using CommonServiceLocator;
-using Domain;
 using Prism;
 using Prism.Events;
 using Prism.Mvvm;
@@ -9,7 +8,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace SharedModule
+namespace Core
 {
     public abstract class BaseViewModel : BindableBase, IActiveAware
     {
@@ -25,7 +24,7 @@ public abstract class BaseViewModel : BindableBase, IActiveAware
 
         protected BaseViewModel()
         {
-            _messageBoxService = ServiceLocator.Current.GetInstance<IMessageBoxService>(); 
+            _messageBoxService = ServiceLocator.Current.GetInstance<IMessageBoxService>();
             _fileDialogService = ServiceLocator.Current.GetInstance<IFileDialogService>();
             _logService = ServiceLocator.Current.GetInstance<ILogService>();
 
@@ -42,8 +41,7 @@ protected void ShowParameterNullError([CallerMemberName] string callerName = nul
         protected void HandleException(Exception ex)
         {
             _messageBoxService.ShowError(ex.Message);
-            if (!(ex is BusinessException))
-                _logService.LogError(ex.ToString());
+            _logService.LogError(ex.ToString());
         }
 
         protected void ActivateRegionWithView<T>(string regionName)

diff --git a/SharedModule/Utility/Events.cs → Core/Utility/Events.cs b/SharedModule/Utility/Events.cs → Core/Utility/Events.cs
@@ -3,8 +3,8 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SharedModule
+namespace Core
 {
     // define all the events of the application here
-    // public class SomeEvent : PubSubEvent { }
+    public class SomeEvent : PubSubEvent { }
 }
diff --git a/SharedModule/Utility/Extensions.cs → Core/Utility/Extensions.cs b/SharedModule/Utility/Extensions.cs → Core/Utility/Extensions.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Text;
 
-namespace SharedModule
+namespace Core
 {
     public static class Extensions
     {

diff --git a/SharedModule/Utility/RegionNames.cs → Core/Utility/RegionNames.cs b/SharedModule/Utility/RegionNames.cs → Core/Utility/RegionNames.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SharedModule
+namespace Core
 {
     public static class RegionNames
     {

diff --git a/SharedModule/SharedModule.cs → ...monServicesModule/CommonServicesModule.cs b/SharedModule/SharedModule.cs → ...monServicesModule/CommonServicesModule.cs
@@ -1,11 +1,12 @@
-using NLog;
+using Core;
+using NLog;
 using Prism.Ioc;
 using Prism.Modularity;
 using System;
 
 namespace SharedModule
 {
-    public class SharedModule : IModule
+    public class CommonServicesModule : IModule
     {
         public void OnInitialized(IContainerProvider containerProvider)
         {

diff --git a/SharedModule/SharedModule.csproj → ...ervicesModule/CommonServicesModule.csproj b/SharedModule/SharedModule.csproj → ...ervicesModule/CommonServicesModule.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -12,6 +12,10 @@
     <PackageReference Include="Prism.Wpf" Version="7.2.0.1422" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Core.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="nlog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/...dule/Implementations/FileDialogService.cs → ...dule/Implementations/FileDialogService.cs b/...dule/Implementations/FileDialogService.cs → ...dule/Implementations/FileDialogService.cs
@@ -1,4 +1,5 @@
-using Microsoft.Win32;
+using Core;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/SharedModule/Implementations/Log.cs → ...mmonServicesModule/Implementations/Log.cs b/SharedModule/Implementations/Log.cs → ...mmonServicesModule/Implementations/Log.cs
@@ -1,4 +1,5 @@
-using NLog;
+using Core;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/...dule/Implementations/MessageBoxService.cs → ...dule/Implementations/MessageBoxService.cs b/...dule/Implementations/MessageBoxService.cs → ...dule/Implementations/MessageBoxService.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using Core;
+using System.Windows;
 
 namespace SharedModule
 {

diff --git a/SharedModule/nlog.config → Modules/CommonServicesModule/nlog.config b/SharedModule/nlog.config → Modules/CommonServicesModule/nlog.config
diff --git a/MainModule/DialogServiceExtensions.cs → ...les/MainModule/DialogServiceExtensions.cs b/MainModule/DialogServiceExtensions.cs → ...les/MainModule/DialogServiceExtensions.cs
diff --git a/MainModule/MainModule.cs → Modules/MainModule/MainModule.cs b/MainModule/MainModule.cs → Modules/MainModule/MainModule.cs
@@ -1,8 +1,8 @@
-using MainModule.Views;
+using Core;
+using MainModule.Views;
 using Prism.Ioc;
 using Prism.Modularity;
 using Prism.Regions;
-using SharedModule;
 using System;
 
 namespace MainModule

diff --git a/MainModule/MainModule.csproj → Modules/MainModule/MainModule.csproj b/MainModule/MainModule.csproj → Modules/MainModule/MainModule.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SharedModule\SharedModule.csproj" />
+    <ProjectReference Include="..\..\Core\Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/MainModule/ViewModels/MainRegionViewModel.cs → ...nModule/ViewModels/MainRegionViewModel.cs b/MainModule/ViewModels/MainRegionViewModel.cs → ...nModule/ViewModels/MainRegionViewModel.cs
@@ -1,7 +1,7 @@
-using MainModule.Views;
+using Core;
+using MainModule.Views;
 using Prism.Commands;
 using Prism.Services.Dialogs;
-using SharedModule;
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/MainModule/ViewModels/WindowTestViewModel.cs → ...nModule/ViewModels/WindowTestViewModel.cs b/MainModule/ViewModels/WindowTestViewModel.cs → ...nModule/ViewModels/WindowTestViewModel.cs
@@ -1,7 +1,4 @@
-using SharedModule;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Core;
 
 namespace MainModule.ViewModels
 {

diff --git a/MainModule/Views/MainRegionView.xaml → Modules/MainModule/Views/MainRegionView.xaml b/MainModule/Views/MainRegionView.xaml → Modules/MainModule/Views/MainRegionView.xaml
diff --git a/MainModule/Views/MainRegionView.xaml.cs → ...s/MainModule/Views/MainRegionView.xaml.cs b/MainModule/Views/MainRegionView.xaml.cs → ...s/MainModule/Views/MainRegionView.xaml.cs
diff --git a/MainModule/Views/WindowTestView.xaml → Modules/MainModule/Views/WindowTestView.xaml b/MainModule/Views/WindowTestView.xaml → Modules/MainModule/Views/WindowTestView.xaml
diff --git a/MainModule/Views/WindowTestView.xaml.cs → ...s/MainModule/Views/WindowTestView.xaml.cs b/MainModule/Views/WindowTestView.xaml.cs → ...s/MainModule/Views/WindowTestView.xaml.cs
diff --git a/WpfCoreApp/App.xaml → Shell/App.xaml b/WpfCoreApp/App.xaml → Shell/App.xaml
diff --git a/WpfCoreApp/App.xaml.cs → Shell/App.xaml.cs b/WpfCoreApp/App.xaml.cs → Shell/App.xaml.cs
@@ -1,5 +1,6 @@
 using Prism.Ioc;
 using Prism.Modularity;
+using SharedModule;
 using System.Windows;
 
 namespace WpfCoreApp
@@ -21,9 +22,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
 
         protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
         {
-            base.ConfigureModuleCatalog(moduleCatalog);
-
-            moduleCatalog.AddModule<SharedModule.SharedModule>();
+            moduleCatalog.AddModule<CommonServicesModule>();
             moduleCatalog.AddModule<MainModule.MainModule>();
         }
     }

diff --git a/WpfCoreApp/AssemblyInfo.cs → Shell/AssemblyInfo.cs b/WpfCoreApp/AssemblyInfo.cs → Shell/AssemblyInfo.cs
diff --git a/WpfCoreApp/MainWindow.xaml → Shell/MainWindow.xaml b/WpfCoreApp/MainWindow.xaml → Shell/MainWindow.xaml
@@ -4,11 +4,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:prism="http://prismlibrary.com/"
-        xmlns:shared="clr-namespace:SharedModule;assembly=SharedModule"
+        xmlns:core="clr-namespace:Core;assembly=Core"
         prism:ViewModelLocator.AutoWireViewModel="True"
         mc:Ignorable="d"
-        Title="First WPF Core App" Height="450" Width="800">
+        Title="WPF .NET Core Shell" Height="450" Width="800">
     <Grid>
-        <ContentControl prism:RegionManager.RegionName="{x:Static shared:RegionNames.MainRegion}" />
+        <ContentControl prism:RegionManager.RegionName="{x:Static core:RegionNames.MainRegion}" />
     </Grid>
 </Window>
diff --git a/WpfCoreApp/MainWindow.xaml.cs → Shell/MainWindow.xaml.cs b/WpfCoreApp/MainWindow.xaml.cs → Shell/MainWindow.xaml.cs
diff --git a/WpfCoreApp/WpfCoreApp.csproj → Shell/Shell.csproj b/WpfCoreApp/WpfCoreApp.csproj → Shell/Shell.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MainModule\MainModule.csproj" />
-    <ProjectReference Include="..\SharedModule\SharedModule.csproj" />
+    <ProjectReference Include="..\Modules\CommonServicesModule\CommonServicesModule.csproj" />
+    <ProjectReference Include="..\Modules\MainModule\MainModule.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/WpfCoreApp.sln b/WpfCoreApp.sln
@@ -3,13 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfCoreApp", "WpfCoreApp\WpfCoreApp.csproj", "{CFC5C94B-87FB-46D3-AA88-87372A1D5314}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shell", "Shell\Shell.csproj", "{CFC5C94B-87FB-46D3-AA88-87372A1D5314}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{C61A656E-515E-4911-AE99-A84B699992BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedModule", "SharedModule\SharedModule.csproj", "{249554B8-60F8-4AEB-A033-F533D8C07B48}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonServicesModule", "Modules\CommonServicesModule\CommonServicesModule.csproj", "{249554B8-60F8-4AEB-A033-F533D8C07B48}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MainModule", "MainModule\MainModule.csproj", "{7DF4675C-FD41-4B91-8F55-09CBA0791211}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MainModule", "Modules\MainModule\MainModule.csproj", "{7DF4675C-FD41-4B91-8F55-09CBA0791211}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{E274215D-3212-4598-ADC7-2CB224331B71}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,6 +31,10 @@ Global
 		{7DF4675C-FD41-4B91-8F55-09CBA0791211}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DF4675C-FD41-4B91-8F55-09CBA0791211}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DF4675C-FD41-4B91-8F55-09CBA0791211}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E274215D-3212-4598-ADC7-2CB224331B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E274215D-3212-4598-ADC7-2CB224331B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E274215D-3212-4598-ADC7-2CB224331B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E274215D-3212-4598-ADC7-2CB224331B71}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE