diff --git a/AdventureWorks.EntityLayer/EntityClasses/User.cs b/AdventureWorks.EntityLayer/EntityClasses/User.cs index 780fe6c..22a106f 100644 --- a/AdventureWorks.EntityLayer/EntityClasses/User.cs +++ b/AdventureWorks.EntityLayer/EntityClasses/User.cs @@ -1,6 +1,6 @@ using Common.Library; -namespace AdventureWorks.EntityLayer.EntityClasses; +namespace AdventureWorks.EntityLayer; public class User : EntityBase { diff --git a/AdventureWorks.MAUI.sln b/AdventureWorks.MAUI.sln index 382184e..485093d 100644 --- a/AdventureWorks.MAUI.sln +++ b/AdventureWorks.MAUI.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdventureWorks.EntityLayer" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Library", "Common.Library\Common.Library.csproj", "{FEDB6441-2564-4DD5-A3C9-1B2F0A761BB4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdventureWorks.ViewModelLayer", "AdventureWorks.ViewModelLayer\AdventureWorks.ViewModelLayer.csproj", "{3E3C685B-CA66-4E12-83BC-B872BC5FD933}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,6 +30,10 @@ Global {FEDB6441-2564-4DD5-A3C9-1B2F0A761BB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {FEDB6441-2564-4DD5-A3C9-1B2F0A761BB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {FEDB6441-2564-4DD5-A3C9-1B2F0A761BB4}.Release|Any CPU.Build.0 = Release|Any CPU + {3E3C685B-CA66-4E12-83BC-B872BC5FD933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E3C685B-CA66-4E12-83BC-B872BC5FD933}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E3C685B-CA66-4E12-83BC-B872BC5FD933}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3E3C685B-CA66-4E12-83BC-B872BC5FD933}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj b/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj index c379c49..7cc1bff 100644 --- a/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj +++ b/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj @@ -66,6 +66,7 @@ + diff --git a/AdventureWorks.MAUI/Views/UserDetailView.xaml b/AdventureWorks.MAUI/Views/UserDetailView.xaml index f667d6c..b88c88d 100644 --- a/AdventureWorks.MAUI/Views/UserDetailView.xaml +++ b/AdventureWorks.MAUI/Views/UserDetailView.xaml @@ -4,13 +4,13 @@ x:Class="AdventureWorks.MAUI.Views.UserDetailView" xmlns:partial="clr-namespace:AdventureWorks.MAUI.ViewsPartial" xmlns:converters="clr-namespace:AdventureWorks.MAUI.Converters" - xmlns:vm="clr-namespace:AdventureWorks.EntityLayer.EntityClasses;assembly=AdventureWorks.EntityLayer" - x:DataType="vm:User" + xmlns:vm="clr-namespace:AdventureWorks.ViewModelLayer;assembly=AdventureWorks.ViewModelLayer" + x:DataType="vm:UserViewModel" Title="User Information"> - + />--> - + -