Prism Avalonia Toolkit

Directory.Packages.props

@@ -26,6 +26,9 @@
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
   </ItemGroup>
   <!-- Tests -->
   <ItemGroup>

Prism.Avalonia.sln

@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia", "src\Prism
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.DryIoc.Avalonia", "src\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj", "{A379E2C8-BD9A-42A1-8218-CED3C0D75E64}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.Avalonia.Toolkit", "src\Prism.Avalonia.Toolkit\Prism.Avalonia.Toolkit.csproj", "{95D737A5-18AA-4397-A8A3-B2E293ACE97E}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{70B9D432-E8BD-4EB9-9CA8-E63E2C804F3F}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
@@ -76,6 +78,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Prism.Container.Avalonia.Sh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleBaseApp", "e2e\SampleBaseApp\SampleBaseApp.csproj", "{0C5B43D7-BCC0-4D7D-98AD-C60AE1A1FC11}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleToolkitApp", "e2e\SampleToolkitApp\SampleToolkitApp.csproj", "{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -90,6 +94,10 @@ Global
 		{A379E2C8-BD9A-42A1-8218-CED3C0D75E64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A379E2C8-BD9A-42A1-8218-CED3C0D75E64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A379E2C8-BD9A-42A1-8218-CED3C0D75E64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95D737A5-18AA-4397-A8A3-B2E293ACE97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95D737A5-18AA-4397-A8A3-B2E293ACE97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95D737A5-18AA-4397-A8A3-B2E293ACE97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95D737A5-18AA-4397-A8A3-B2E293ACE97E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ABBB169C-A49A-46C7-A920-3F0780CBCA04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ABBB169C-A49A-46C7-A920-3F0780CBCA04}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABBB169C-A49A-46C7-A920-3F0780CBCA04}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -142,13 +150,18 @@ Global
 		{0C5B43D7-BCC0-4D7D-98AD-C60AE1A1FC11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C5B43D7-BCC0-4D7D-98AD-C60AE1A1FC11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C5B43D7-BCC0-4D7D-98AD-C60AE1A1FC11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{F4A9F2F0-979F-4964-8BC8-A39F4816803B} = {9FF880E7-B56A-4E8E-9226-90A928FDE3AB}
 		{A379E2C8-BD9A-42A1-8218-CED3C0D75E64} = {9FF880E7-B56A-4E8E-9226-90A928FDE3AB}
+		{95D737A5-18AA-4397-A8A3-B2E293ACE97E} = {9FF880E7-B56A-4E8E-9226-90A928FDE3AB}
 		{ABBB169C-A49A-46C7-A920-3F0780CBCA04} = {5F8D330E-F611-4E17-8217-F2D6CDB8E1F7}
 		{5D9978C6-2D59-4040-BCF5-56A49AB586E8} = {5F8D330E-F611-4E17-8217-F2D6CDB8E1F7}
 		{E03DB670-BFA9-4E7B-A69C-D1E6B8E1691F} = {47BC0E69-AF2D-4C4F-886E-31B61E05C57A}
@@ -166,6 +179,7 @@ Global
 		{4F7E8EC6-D5E5-4DD9-8DC0-F03ADDD508CF} = {966DDDE9-D31A-404B-9F24-5378DE8A12C8}
 		{BD42A7D6-A84D-4D27-9C28-7F6A2EC477F1} = {966DDDE9-D31A-404B-9F24-5378DE8A12C8}
 		{0C5B43D7-BCC0-4D7D-98AD-C60AE1A1FC11} = {5F8D330E-F611-4E17-8217-F2D6CDB8E1F7}
+		{DF9B5997-76D5-4FEC-A3CF-BCEC0285973E} = {5F8D330E-F611-4E17-8217-F2D6CDB8E1F7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D260344D-8648-441D-B85B-9D280005F098}

e2e/SampleMvvmApp/App.axaml.cs

@@ -1,11 +1,11 @@
 using System.Diagnostics;
 using Avalonia;
 using Avalonia.Controls;
+using Prism.Avalonia;
 using Prism.DryIoc;
 using Prism.Ioc;
 using Prism.Modularity;
 using Prism.Navigation.Regions;
-using SampleMvvmApp.Services;
 using SampleMvvmApp.ViewModels;
 using SampleMvvmApp.Views;
 
@@ -86,7 +86,7 @@ protected override void OnInitialized()
 
         // WARNING: Prism v11.0.0-prev4
         // - DataTemplates MUST define a DataType or else an XAML error will be thrown
-        // - Error: DataTemplate inside of DataTemplates must have a DataType set
+        // - The View's DataTemplates.DataTemplate must have a DataType set or an error will be thrown
         regionManager.RegisterViewWithRegion(RegionNames.ContentRegion, typeof(DashboardView));
         regionManager.RegisterViewWithRegion(RegionNames.SidebarRegion, typeof(SidebarView));
 

e2e/SampleMvvmApp/SampleMvvmApp.csproj

@@ -7,5 +7,5 @@
   </PropertyGroup>
 
   <Import Project="../../build/SampleApp.props" />
-
+  
 </Project>

e2e/SampleMvvmApp/ViewModels/DashboardViewModel.cs

@@ -2,8 +2,8 @@
 using System.Collections.ObjectModel;
 using Avalonia;
 using Avalonia.Styling;
+using Prism.Avalonia;
 using Prism.Commands;
-using SampleMvvmApp.Services;
 
 namespace SampleMvvmApp.ViewModels
 {

e2e/SampleMvvmApp/Views/DashboardView.axaml.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
+using Prism.Avalonia;
 using Prism.Ioc;
-using SampleMvvmApp.Services;
 
 namespace SampleMvvmApp.Views;