diff --git a/MvvmAppCore/Interfaces/IDemoService.cs b/MvvmAppCore/Interfaces/IDemoService.cs new file mode 100644 index 0000000..d5c7616 --- /dev/null +++ b/MvvmAppCore/Interfaces/IDemoService.cs @@ -0,0 +1,10 @@ + +namespace MvvmAppCore.Interfaces +{ + public interface IDemoService + { + string Name { get; } + + void Show(string name); + } +} diff --git a/MvvmAppCore/MvvmAppCore.csproj b/MvvmAppCore/MvvmAppCore.csproj new file mode 100644 index 0000000..9d3f84d --- /dev/null +++ b/MvvmAppCore/MvvmAppCore.csproj @@ -0,0 +1,13 @@ + + + + net6.0-windows + enable + true + + + + + + + diff --git a/MvvmCommunityApp/viewmodels/IocPageViewModel.cs b/MvvmAppCore/ViewModels/IocPageViewModel.cs similarity index 57% rename from MvvmCommunityApp/viewmodels/IocPageViewModel.cs rename to MvvmAppCore/ViewModels/IocPageViewModel.cs index ba9c757..337dc4a 100644 --- a/MvvmCommunityApp/viewmodels/IocPageViewModel.cs +++ b/MvvmAppCore/ViewModels/IocPageViewModel.cs @@ -1,11 +1,7 @@ -using MvvmCommunityApp.interfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using MvvmAppCore.Interfaces; -namespace MvvmCommunityApp.viewmodels + +namespace MvvmAppCore.ViewModels { public class IocPageViewModel : SamplePageViewModel { diff --git a/MvvmCommunityApp/viewmodels/MainWindowViewModel.cs b/MvvmAppCore/ViewModels/MainWindowViewModel.cs similarity index 94% rename from MvvmCommunityApp/viewmodels/MainWindowViewModel.cs rename to MvvmAppCore/ViewModels/MainWindowViewModel.cs index 79b3065..a5c08ae 100644 --- a/MvvmCommunityApp/viewmodels/MainWindowViewModel.cs +++ b/MvvmAppCore/ViewModels/MainWindowViewModel.cs @@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.Input; using System; -namespace MvvmCommunityApp.viewmodels +namespace MvvmAppCore.ViewModels { public partial class MainWindowViewModel : ObservableObject { diff --git a/MvvmCommunityApp/viewmodels/SamplePageViewModel.cs b/MvvmAppCore/ViewModels/SamplePageViewModel.cs similarity index 80% rename from MvvmCommunityApp/viewmodels/SamplePageViewModel.cs rename to MvvmAppCore/ViewModels/SamplePageViewModel.cs index f6855ab..895c03f 100644 --- a/MvvmCommunityApp/viewmodels/SamplePageViewModel.cs +++ b/MvvmAppCore/ViewModels/SamplePageViewModel.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; -using MvvmCommunityApp.interfaces; +using MvvmAppCore.Interfaces; -namespace MvvmCommunityApp.viewmodels +namespace MvvmAppCore.ViewModels { public class SamplePageViewModel : ObservableObject { diff --git a/MvvmCommunityApp.sln b/MvvmCommunityApp.sln index 82999ce..3fb52fa 100644 --- a/MvvmCommunityApp.sln +++ b/MvvmCommunityApp.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCommunityApp", "MvvmCommunityApp\MvvmCommunityApp.csproj", "{A9F79E7F-91A0-4A7D-B2AD-2AF6D3C80B4B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmAppCore", "MvvmAppCore\MvvmAppCore.csproj", "{8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {A9F79E7F-91A0-4A7D-B2AD-2AF6D3C80B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {A9F79E7F-91A0-4A7D-B2AD-2AF6D3C80B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {A9F79E7F-91A0-4A7D-B2AD-2AF6D3C80B4B}.Release|Any CPU.Build.0 = Release|Any CPU + {8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8CFB1DAE-0565-4A86-B0CC-2D7E3C9ED053}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MvvmCommunityApp/App.xaml.cs b/MvvmCommunityApp/App.xaml.cs index 7c04f32..25fdcdf 100644 --- a/MvvmCommunityApp/App.xaml.cs +++ b/MvvmCommunityApp/App.xaml.cs @@ -1,8 +1,8 @@ using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.Extensions.DependencyInjection; -using MvvmCommunityApp.interfaces; +using MvvmAppCore.ViewModels; using MvvmCommunityApp.services; -using MvvmCommunityApp.viewmodels; +using MvvmAppCore.Interfaces; using System; using System.Windows; diff --git a/MvvmCommunityApp/MainWindow.xaml.cs b/MvvmCommunityApp/MainWindow.xaml.cs index 04ba1f5..89097c4 100644 --- a/MvvmCommunityApp/MainWindow.xaml.cs +++ b/MvvmCommunityApp/MainWindow.xaml.cs @@ -1,9 +1,5 @@ using CommunityToolkit.Mvvm.DependencyInjection; -using MvvmCommunityApp.viewmodels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using MvvmAppCore.ViewModels; using System.Windows; diff --git a/MvvmCommunityApp/MvvmCommunityApp.csproj b/MvvmCommunityApp/MvvmCommunityApp.csproj index 5de3dc8..2b799d2 100644 --- a/MvvmCommunityApp/MvvmCommunityApp.csproj +++ b/MvvmCommunityApp/MvvmCommunityApp.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/MvvmCommunityApp/interfaces/IDemoService.cs b/MvvmCommunityApp/interfaces/IDemoService.cs deleted file mode 100644 index 774ed02..0000000 --- a/MvvmCommunityApp/interfaces/IDemoService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MvvmCommunityApp.interfaces -{ - public interface IDemoService - { - string Name { get; } - - void Show(string name); - } -} diff --git a/MvvmCommunityApp/services/DemoService.cs b/MvvmCommunityApp/services/DemoService.cs index 48bea03..b60058c 100644 --- a/MvvmCommunityApp/services/DemoService.cs +++ b/MvvmCommunityApp/services/DemoService.cs @@ -1,4 +1,4 @@ -using MvvmCommunityApp.interfaces; +using MvvmAppCore.Interfaces; using System; using System.Collections.Generic; using System.Linq;