NeverMorewd · NeverMorewd · Apr 10, 2025 · Apr 3, 2025 · Apr 10, 2025
diff --git a/src/.editorconfig → .editorconfig b/src/.editorconfig → .editorconfig
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -26,10 +26,10 @@ jobs:
         dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
-      working-directory: src/Lemon.ModuleNavigation.Sample.Desktop
+      working-directory: samples/Lemon.ModuleNavigation.Sample.Desktop
     - name: Build
       run: dotnet build --configuration Release --no-restore
-      working-directory: src/Lemon.ModuleNavigation.Sample.Desktop
+      working-directory: samples/Lemon.ModuleNavigation.Sample.Desktop
   build-wpf:
     runs-on: windows-2022
     steps:
@@ -40,7 +40,7 @@ jobs:
         dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
-      working-directory: src/Lemon.ModuleNavigation.WpfSample
+      working-directory: samples/Lemon.ModuleNavigation.WpfSample
     - name: Build WPF Sample
       run: dotnet build --configuration Release --no-restore
-      working-directory: src/Lemon.ModuleNavigation.WpfSample
+      working-directory: samples/Lemon.ModuleNavigation.WpfSample
diff --git a/src/Directory.Build.props → Directory.Build.props b/src/Directory.Build.props → Directory.Build.props
diff --git a/src/Lemon.ModuleNavigation.sln → Lemon.ModuleNavigation.sln b/src/Lemon.ModuleNavigation.sln → Lemon.ModuleNavigation.sln
@@ -3,26 +3,28 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation", "Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj", "{9E271C3B-0D09-4318-BF49-4BE2952759D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation", "src\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj", "{9E271C3B-0D09-4318-BF49-4BE2952759D8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6E1EE4BE-93AB-4A7D-B080-E054855DDEA6}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Avaloniaui", "Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj", "{3EDBF55F-6D3E-4BD0-A726-4BA84461C687}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Avaloniaui", "src\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj", "{3EDBF55F-6D3E-4BD0-A726-4BA84461C687}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample", "Lemon.ModuleNavigation.Sample\Lemon.ModuleNavigation.Sample.csproj", "{0CCB72E9-102B-41E2-80A4-67D580041508}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample", "samples\Lemon.ModuleNavigation.Sample\Lemon.ModuleNavigation.Sample.csproj", "{0CCB72E9-102B-41E2-80A4-67D580041508}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample.DesktopHosting", "Lemon.ModuleNavigation.Sample.DesktopHosting\Lemon.ModuleNavigation.Sample.DesktopHosting.csproj", "{48509E81-7077-402B-A208-2134A7476857}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample.DesktopHosting", "samples\Lemon.ModuleNavigation.Sample.DesktopHosting\Lemon.ModuleNavigation.Sample.DesktopHosting.csproj", "{48509E81-7077-402B-A208-2134A7476857}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample.Desktop", "Lemon.ModuleNavigation.Sample.Desktop\Lemon.ModuleNavigation.Sample.Desktop.csproj", "{AF18E2B0-7ED3-4BDA-81BA-6A23B3C89F39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lemon.ModuleNavigation.Sample.Desktop", "samples\Lemon.ModuleNavigation.Sample.Desktop\Lemon.ModuleNavigation.Sample.Desktop.csproj", "{AF18E2B0-7ED3-4BDA-81BA-6A23B3C89F39}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.Sample.Browser", "Lemon.ModuleNavigation.Sample.Browser\Lemon.ModuleNavigation.Sample.Browser.csproj", "{FDD2C508-3201-4659-8962-886C2CBF41BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.Sample.Browser", "samples\Lemon.ModuleNavigation.Sample.Browser\Lemon.ModuleNavigation.Sample.Browser.csproj", "{FDD2C508-3201-4659-8962-886C2CBF41BD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.Wpf", "Lemon.ModuleNavigation.Wpf\Lemon.ModuleNavigation.Wpf.csproj", "{2AE59E5E-900D-5CCB-0C30-F8DFAD324C9E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.Wpf", "src\Lemon.ModuleNavigation.Wpf\Lemon.ModuleNavigation.Wpf.csproj", "{2AE59E5E-900D-5CCB-0C30-F8DFAD324C9E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.WpfSample", "Lemon.ModuleNavigation.WpfSample\Lemon.ModuleNavigation.WpfSample.csproj", "{8EC545BD-E076-A2DF-A7A4-2F11221AF297}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.WpfSample", "samples\Lemon.ModuleNavigation.WpfSample\Lemon.ModuleNavigation.WpfSample.csproj", "{8EC545BD-E076-A2DF-A7A4-2F11221AF297}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.SampleViewModel", "samples\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj", "{99600F69-5901-4CEA-8C54-BFDC0751E207}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,6 +64,10 @@ Global
 		{8EC545BD-E076-A2DF-A7A4-2F11221AF297}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8EC545BD-E076-A2DF-A7A4-2F11221AF297}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EC545BD-E076-A2DF-A7A4-2F11221AF297}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99600F69-5901-4CEA-8C54-BFDC0751E207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99600F69-5901-4CEA-8C54-BFDC0751E207}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99600F69-5901-4CEA-8C54-BFDC0751E207}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99600F69-5901-4CEA-8C54-BFDC0751E207}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/breakdownchanges.md → breakdownchanges.md b/src/breakdownchanges.md → breakdownchanges.md
diff --git a/...uleNavigation.Sample/Assets/lemon-100.png → lemon-100.png b/...uleNavigation.Sample/Assets/lemon-100.png → lemon-100.png
diff --git a/...on.ModuleNavigation.Sample.Browser.csproj → ...on.ModuleNavigation.Sample.Browser.csproj b/...on.ModuleNavigation.Sample.Browser.csproj → ...on.ModuleNavigation.Sample.Browser.csproj
diff --git a/...oduleNavigation.Sample.Browser/Program.cs → ...oduleNavigation.Sample.Browser/Program.cs b/...oduleNavigation.Sample.Browser/Program.cs → ...oduleNavigation.Sample.Browser/Program.cs
diff --git a/...le.Browser/Properties/launchSettings.json → ...le.Browser/Properties/launchSettings.json b/...le.Browser/Properties/launchSettings.json → ...le.Browser/Properties/launchSettings.json
diff --git a/...ample.Browser/runtimeconfig.template.json → ...ample.Browser/runtimeconfig.template.json b/...ample.Browser/runtimeconfig.template.json → ...ample.Browser/runtimeconfig.template.json
diff --git a/...Navigation.Sample.Browser/wwwroot/app.css → ...Navigation.Sample.Browser/wwwroot/app.css b/...Navigation.Sample.Browser/wwwroot/app.css → ...Navigation.Sample.Browser/wwwroot/app.css
diff --git a/...gation.Sample.Browser/wwwroot/favicon.ico → ...gation.Sample.Browser/wwwroot/favicon.ico b/...gation.Sample.Browser/wwwroot/favicon.ico → ...gation.Sample.Browser/wwwroot/favicon.ico
diff --git a/...igation.Sample.Browser/wwwroot/index.html → ...igation.Sample.Browser/wwwroot/index.html b/...igation.Sample.Browser/wwwroot/index.html → ...igation.Sample.Browser/wwwroot/index.html
diff --git a/...Navigation.Sample.Browser/wwwroot/main.js → ...Navigation.Sample.Browser/wwwroot/main.js b/...Navigation.Sample.Browser/wwwroot/main.js → ...Navigation.Sample.Browser/wwwroot/main.js
diff --git a/...on.ModuleNavigation.Sample.Desktop.csproj → ...on.ModuleNavigation.Sample.Desktop.csproj b/...on.ModuleNavigation.Sample.Desktop.csproj → ...on.ModuleNavigation.Sample.Desktop.csproj
diff --git a/...oduleNavigation.Sample.Desktop/Program.cs → ...oduleNavigation.Sample.Desktop/Program.cs b/...oduleNavigation.Sample.Desktop/Program.cs → ...oduleNavigation.Sample.Desktop/Program.cs
diff --git a/...le.Desktop/Properties/launchSettings.json → ...le.Desktop/Properties/launchSettings.json b/...le.Desktop/Properties/launchSettings.json → ...le.Desktop/Properties/launchSettings.json
diff --git a/...uleNavigation.Sample.Desktop/app.manifest → ...uleNavigation.Sample.Desktop/app.manifest b/...uleNavigation.Sample.Desktop/app.manifest → ...uleNavigation.Sample.Desktop/app.manifest
diff --git a/...leNavigation.Sample.DesktopHosting.csproj → ...leNavigation.Sample.DesktopHosting.csproj b/...leNavigation.Sample.DesktopHosting.csproj → ...leNavigation.Sample.DesktopHosting.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
     <ProjectReference Include="..\Lemon.ModuleNavigation.Sample\Lemon.ModuleNavigation.Sample.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/...vigation.Sample.DesktopHosting/Program.cs → ...vigation.Sample.DesktopHosting/Program.cs b/...vigation.Sample.DesktopHosting/Program.cs → ...vigation.Sample.DesktopHosting/Program.cs
@@ -6,6 +6,7 @@
 using Lemon.ModuleNavigation.Sample.ModuleCs;
 using Lemon.ModuleNavigation.Sample.ViewModels;
 using Lemon.ModuleNavigation.Sample.Views;
+using Lemon.ModuleNavigation.SampleViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

diff --git a/...topHosting/Properties/launchSettings.json → ...topHosting/Properties/launchSettings.json b/...topHosting/Properties/launchSettings.json → ...topHosting/Properties/launchSettings.json
diff --git a/...gation.Sample.DesktopHosting/app.manifest → ...gation.Sample.DesktopHosting/app.manifest b/...gation.Sample.DesktopHosting/app.manifest → ...gation.Sample.DesktopHosting/app.manifest
diff --git a/...leNavigation.Sample.DesktopHosting/rd.xml → ...leNavigation.Sample.DesktopHosting/rd.xml b/...leNavigation.Sample.DesktopHosting/rd.xml → ...leNavigation.Sample.DesktopHosting/rd.xml
diff --git a/src/Lemon.ModuleNavigation.Sample/App.axaml → ...s/Lemon.ModuleNavigation.Sample/App.axaml b/src/Lemon.ModuleNavigation.Sample/App.axaml → ...s/Lemon.ModuleNavigation.Sample/App.axaml
diff --git a/...emon.ModuleNavigation.Sample/App.axaml.cs → ...emon.ModuleNavigation.Sample/App.axaml.cs b/...emon.ModuleNavigation.Sample/App.axaml.cs → ...emon.ModuleNavigation.Sample/App.axaml.cs
diff --git a/...oduleNavigation.Sample/AppWithDI.axaml.cs → ...oduleNavigation.Sample/AppWithDI.axaml.cs b/...oduleNavigation.Sample/AppWithDI.axaml.cs → ...oduleNavigation.Sample/AppWithDI.axaml.cs
@@ -6,6 +6,7 @@
 using Lemon.ModuleNavigation.Sample.ModuleCs;
 using Lemon.ModuleNavigation.Sample.ViewModels;
 using Lemon.ModuleNavigation.Sample.Views;
+using Lemon.ModuleNavigation.SampleViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 

diff --git a/...n.ModuleNavigation.Sample/AppWithDi.axaml → ...n.ModuleNavigation.Sample/AppWithDi.axaml b/...n.ModuleNavigation.Sample/AppWithDi.axaml → ...n.ModuleNavigation.Sample/AppWithDi.axaml
diff --git a/...avigation.Sample/Assets/avalonia-logo.ico → ...avigation.Sample/Assets/avalonia-logo.ico b/...avigation.Sample/Assets/avalonia-logo.ico → ...avigation.Sample/Assets/avalonia-logo.ico
diff --git a/...uleNavigation.Sample/Assets/lemon-100.ico → ...uleNavigation.Sample/Assets/lemon-100.ico b/...uleNavigation.Sample/Assets/lemon-100.ico → ...uleNavigation.Sample/Assets/lemon-100.ico
diff --git a/src/lemon-100.png → ...uleNavigation.Sample/Assets/lemon-100.png b/src/lemon-100.png → ...uleNavigation.Sample/Assets/lemon-100.png
diff --git a/...duleNavigation.Sample/Assets/lemon-28.png → ...duleNavigation.Sample/Assets/lemon-28.png b/...duleNavigation.Sample/Assets/lemon-28.png → ...duleNavigation.Sample/Assets/lemon-28.png
diff --git a/...duleNavigation.Sample/Assets/lemon-50.png → ...duleNavigation.Sample/Assets/lemon-50.png b/...duleNavigation.Sample/Assets/lemon-50.png → ...duleNavigation.Sample/Assets/lemon-50.png
diff --git a/...Sample/DesignDatas/MainWindowViewModel.cs → ...Sample/DesignDatas/MainWindowViewModel.cs b/...Sample/DesignDatas/MainWindowViewModel.cs → ...Sample/DesignDatas/MainWindowViewModel.cs
diff --git a/...le/DialogWindows/CustomDialogWindow.axaml → ...le/DialogWindows/CustomDialogWindow.axaml b/...le/DialogWindows/CustomDialogWindow.axaml → ...le/DialogWindows/CustomDialogWindow.axaml
diff --git a/...DialogWindows/CustomDialogWindow.axaml.cs → ...DialogWindows/CustomDialogWindow.axaml.cs b/...DialogWindows/CustomDialogWindow.axaml.cs → ...DialogWindows/CustomDialogWindow.axaml.cs
diff --git a/...mple/Lemon.ModuleNavigation.Sample.csproj → ...mple/Lemon.ModuleNavigation.Sample.csproj b/...mple/Lemon.ModuleNavigation.Sample.csproj → ...mple/Lemon.ModuleNavigation.Sample.csproj
@@ -32,8 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj" />
-    <ProjectReference Include="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
+    <ProjectReference Include="..\..\src\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj" />
+    <ProjectReference Include="..\..\src\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
+    <ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...duleNavigation.Sample/ModuleAs/ModuleA.cs → ...duleNavigation.Sample/ModuleAs/ModuleA.cs b/...duleNavigation.Sample/ModuleAs/ModuleA.cs → ...duleNavigation.Sample/ModuleAs/ModuleA.cs
diff --git a/...uleNavigation.Sample/ModuleAs/ViewA.axaml → ...uleNavigation.Sample/ModuleAs/ViewA.axaml b/...uleNavigation.Sample/ModuleAs/ViewA.axaml → ...uleNavigation.Sample/ModuleAs/ViewA.axaml
diff --git a/...Navigation.Sample/ModuleAs/ViewA.axaml.cs → ...Navigation.Sample/ModuleAs/ViewA.axaml.cs b/...Navigation.Sample/ModuleAs/ViewA.axaml.cs → ...Navigation.Sample/ModuleAs/ViewA.axaml.cs
diff --git a/...eNavigation.Sample/ModuleAs/ViewModelA.cs → ...eNavigation.Sample/ModuleAs/ViewModelA.cs b/...eNavigation.Sample/ModuleAs/ViewModelA.cs → ...eNavigation.Sample/ModuleAs/ViewModelA.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Sample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using ReactiveUI;
 using System.Reactive;
 

diff --git a/...duleNavigation.Sample/ModuleBs/ModuleB.cs → ...duleNavigation.Sample/ModuleBs/ModuleB.cs b/...duleNavigation.Sample/ModuleBs/ModuleB.cs → ...duleNavigation.Sample/ModuleBs/ModuleB.cs
diff --git a/...uleNavigation.Sample/ModuleBs/ViewB.axaml → ...uleNavigation.Sample/ModuleBs/ViewB.axaml b/...uleNavigation.Sample/ModuleBs/ViewB.axaml → ...uleNavigation.Sample/ModuleBs/ViewB.axaml
diff --git a/...Navigation.Sample/ModuleBs/ViewB.axaml.cs → ...Navigation.Sample/ModuleBs/ViewB.axaml.cs b/...Navigation.Sample/ModuleBs/ViewB.axaml.cs → ...Navigation.Sample/ModuleBs/ViewB.axaml.cs
diff --git a/...eNavigation.Sample/ModuleBs/ViewModelB.cs → ...eNavigation.Sample/ModuleBs/ViewModelB.cs b/...eNavigation.Sample/ModuleBs/ViewModelB.cs → ...eNavigation.Sample/ModuleBs/ViewModelB.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Sample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using ReactiveUI;
 using System.Reactive;
 

diff --git a/...duleNavigation.Sample/ModuleCs/ModuleC.cs → ...duleNavigation.Sample/ModuleCs/ModuleC.cs b/...duleNavigation.Sample/ModuleCs/ModuleC.cs → ...duleNavigation.Sample/ModuleCs/ModuleC.cs
diff --git a/...Sample/ModuleCs/SubModules/SubModule01.cs → ...Sample/ModuleCs/SubModules/SubModule01.cs b/...Sample/ModuleCs/SubModules/SubModule01.cs → ...Sample/ModuleCs/SubModules/SubModule01.cs
diff --git a/...Sample/ModuleCs/SubModules/SubModule02.cs → ...Sample/ModuleCs/SubModules/SubModule02.cs b/...Sample/ModuleCs/SubModules/SubModule02.cs → ...Sample/ModuleCs/SubModules/SubModule02.cs
diff --git a/...uleNavigation.Sample/ModuleCs/ViewC.axaml → ...uleNavigation.Sample/ModuleCs/ViewC.axaml b/...uleNavigation.Sample/ModuleCs/ViewC.axaml → ...uleNavigation.Sample/ModuleCs/ViewC.axaml
diff --git a/...Navigation.Sample/ModuleCs/ViewC.axaml.cs → ...Navigation.Sample/ModuleCs/ViewC.axaml.cs b/...Navigation.Sample/ModuleCs/ViewC.axaml.cs → ...Navigation.Sample/ModuleCs/ViewC.axaml.cs
diff --git a/...eNavigation.Sample/ModuleCs/ViewModelC.cs → ...eNavigation.Sample/ModuleCs/ViewModelC.cs b/...eNavigation.Sample/ModuleCs/ViewModelC.cs → ...eNavigation.Sample/ModuleCs/ViewModelC.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Sample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using ReactiveUI;
 using System;
 using System.Reactive;

diff --git a/...ple/ModuleCs/ViewModels/SubViewModel01.cs → ...ple/ModuleCs/ViewModels/SubViewModel01.cs b/...ple/ModuleCs/ViewModels/SubViewModel01.cs → ...ple/ModuleCs/ViewModels/SubViewModel01.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Sample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;

diff --git a/...ple/ModuleCs/ViewModels/SubViewModel02.cs → ...ple/ModuleCs/ViewModels/SubViewModel02.cs b/...ple/ModuleCs/ViewModels/SubViewModel02.cs → ...ple/ModuleCs/ViewModels/SubViewModel02.cs
@@ -1,5 +1,5 @@
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Sample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using System;
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;

diff --git a/...ion.Sample/ModuleCs/Views/SubView01.axaml → ...ion.Sample/ModuleCs/Views/SubView01.axaml b/...ion.Sample/ModuleCs/Views/SubView01.axaml → ...ion.Sample/ModuleCs/Views/SubView01.axaml
diff --git a/....Sample/ModuleCs/Views/SubView01.axaml.cs → ....Sample/ModuleCs/Views/SubView01.axaml.cs b/....Sample/ModuleCs/Views/SubView01.axaml.cs → ....Sample/ModuleCs/Views/SubView01.axaml.cs
diff --git a/...ion.Sample/ModuleCs/Views/SubView02.axaml → ...ion.Sample/ModuleCs/Views/SubView02.axaml b/...ion.Sample/ModuleCs/Views/SubView02.axaml → ...ion.Sample/ModuleCs/Views/SubView02.axaml
diff --git a/....Sample/ModuleCs/Views/SubView02.axaml.cs → ....Sample/ModuleCs/Views/SubView02.axaml.cs b/....Sample/ModuleCs/Views/SubView02.axaml.cs → ....Sample/ModuleCs/Views/SubView02.axaml.cs
diff --git a/...gation.Sample/ViewModels/MainViewModel.cs → ...gation.Sample/ViewModels/MainViewModel.cs b/...gation.Sample/ViewModels/MainViewModel.cs → ...gation.Sample/ViewModels/MainViewModel.cs
@@ -41,7 +41,6 @@ public MainViewModel(IEnumerable<IModule> modules,
             {
                 viewName = content.Replace(".RequestNew",string.Empty);
                 requestNew = true;
-
             }
             _navigationService.RequestViewNavigation("ContentRegion", 
                 viewName, 
@@ -93,11 +92,7 @@ await _dialogService.ShowDialog(content,
             };
             var result = _dialogService.WaitShowDialog(content, 
                 nameof(CustomDialogWindow), 
-                param,
-                result =>
-                {
-                    _logger.LogDebug($"Call back:{result}");
-                });
+                param);
             _logger.LogDebug($"ShowDialog over:{result}");
         });
 

diff --git a/...uleNavigation.Sample/Views/MainView.axaml → ...uleNavigation.Sample/Views/MainView.axaml b/...uleNavigation.Sample/Views/MainView.axaml → ...uleNavigation.Sample/Views/MainView.axaml
@@ -51,77 +51,6 @@
         </Style>
     </UserControl.Styles>
     <TabControl>
-        <TabItem Header="Module">
-            <Grid ColumnDefinitions="auto,*,*,*,*" ShowGridLines="True">
-                <StackPanel
-                    Margin="0,0,2,0"
-                    Orientation="Vertical"
-                    Spacing="5">
-                    <Label Content="Modules" Target="{Binding ElementName=ModuleLists}" />
-                    <ListBox
-                        Grid.Column="0"
-                        ItemsSource="{Binding Modules}"
-                        Name="ModuleLists"
-                        SelectedItem="{Binding SelectedModule, Mode=TwoWay}">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding Alias}" />
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
-                <StackPanel Classes="ForContainerShow" Grid.Column="1">
-                    <Label Content="ContentControl" />
-                    <Border Classes="HSeparator" />
-                    <ContentControl lm:NavigationExtension.ModuleContainerName="NContentControl" />
-                </StackPanel>
-                <StackPanel Classes="ForContainerShow" Grid.Column="2">
-                    <Label Content="TabControl" />
-                    <Border Classes="HSeparator" />
-                    <TabControl lm:NavigationExtension.ModuleContainerName="NTabControl">
-                        <TabControl.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="2">
-                                    <TextBlock Text="{Binding Alias}" />
-                                    <Button
-                                        Content="X"
-                                        FontSize="11"
-                                        Height="20"
-                                        HorizontalContentAlignment="Center"
-                                        Padding="-1,0,0,0"
-                                        VerticalContentAlignment="Center"
-                                        Width="20"
-                                        lm:NavigationExtension.CanUnload="{Binding CanUnload}" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </TabControl.ItemTemplate>
-                    </TabControl>
-                </StackPanel>
-                <StackPanel Classes="ForContainerShow" Grid.Column="3">
-                    <Label Content="ListBox" />
-                    <Border Classes="HSeparator" />
-                    <ListBox
-                        Background="Transparent"
-                        BorderBrush="LemonChiffon"
-                        BorderThickness="1"
-                        Margin="2"
-                        MaxHeight="600"
-                        lm:NavigationExtension.ModuleContainerName="NListBox">
-                        <!--  https://github.com/AvaloniaUI/Avalonia/issues/17349  -->
-                        <ListBox.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel />
-                            </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                    </ListBox>
-                </StackPanel>
-                <StackPanel Classes="ForContainerShow" Grid.Column="4">
-                    <Label Content="TransitioningContentControl" />
-                    <Border Classes="HSeparator" />
-                    <TransitioningContentControl lm:NavigationExtension.ModuleContainerName="NTransitioningContentControl" />
-                </StackPanel>
-            </Grid>
-        </TabItem>
         <TabItem Header="View">
             <Grid ColumnDefinitions="auto,*,*,*,*" ShowGridLines="True">
                 <StackPanel Orientation="Vertical" Spacing="5">
@@ -209,21 +138,76 @@
                     Tag="ViewBeta" />
             </StackPanel>
         </TabItem>
-        <TabItem Header="Practice">
-            <DockPanel>
-                <!--<ContentControl DockPanel.Dock="Right" lm:NavigationExtension.RegionName="RightRegion">-->
-                <ItemsControl DockPanel.Dock="Right">
-                    <ContentControl Content="11" />
-                    <ContentControl Content="11" />
-                    <ContentControl Content="11" />
-                    <ContentControl Content="11" />
-                </ItemsControl>
-                <!--</ContentControl>-->
-                <ContentControl DockPanel.Dock="Left" lm:NavigationExtension.RegionName="LeftRegion" />
-                <ContentControl DockPanel.Dock="Top" lm:NavigationExtension.RegionName="TopRegion" />
-                <ContentControl DockPanel.Dock="Bottom" lm:NavigationExtension.RegionName="BottomRegion" />
-                <TransitioningContentControl lm:NavigationExtension.RegionName="MainRegion" />
-            </DockPanel>
+        <TabItem Header="Module">
+            <Grid ColumnDefinitions="auto,*,*,*,*" ShowGridLines="True">
+                <StackPanel
+                    Margin="0,0,2,0"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <Label Content="Modules" Target="{Binding ElementName=ModuleLists}" />
+                    <ListBox
+                        Grid.Column="0"
+                        ItemsSource="{Binding Modules}"
+                        Name="ModuleLists"
+                        SelectedItem="{Binding SelectedModule, Mode=TwoWay}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Alias}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                </StackPanel>
+                <StackPanel Classes="ForContainerShow" Grid.Column="1">
+                    <Label Content="ContentControl" />
+                    <Border Classes="HSeparator" />
+                    <ContentControl lm:NavigationExtension.ModuleContainerName="NContentControl" />
+                </StackPanel>
+                <StackPanel Classes="ForContainerShow" Grid.Column="2">
+                    <Label Content="TabControl" />
+                    <Border Classes="HSeparator" />
+                    <TabControl lm:NavigationExtension.ModuleContainerName="NTabControl">
+                        <TabControl.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal" Spacing="2">
+                                    <TextBlock Text="{Binding Alias}" />
+                                    <Button
+                                        Content="X"
+                                        FontSize="11"
+                                        Height="20"
+                                        HorizontalContentAlignment="Center"
+                                        Padding="-1,0,0,0"
+                                        VerticalContentAlignment="Center"
+                                        Width="20"
+                                        lm:NavigationExtension.CanUnload="{Binding CanUnload}" />
+                                </StackPanel>
+                            </DataTemplate>
+                        </TabControl.ItemTemplate>
+                    </TabControl>
+                </StackPanel>
+                <StackPanel Classes="ForContainerShow" Grid.Column="3">
+                    <Label Content="ListBox" />
+                    <Border Classes="HSeparator" />
+                    <ListBox
+                        Background="Transparent"
+                        BorderBrush="LemonChiffon"
+                        BorderThickness="1"
+                        Margin="2"
+                        MaxHeight="600"
+                        lm:NavigationExtension.ModuleContainerName="NListBox">
+                        <!--  https://github.com/AvaloniaUI/Avalonia/issues/17349  -->
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
+                    </ListBox>
+                </StackPanel>
+                <StackPanel Classes="ForContainerShow" Grid.Column="4">
+                    <Label Content="TransitioningContentControl" />
+                    <Border Classes="HSeparator" />
+                    <TransitioningContentControl lm:NavigationExtension.ModuleContainerName="NTransitioningContentControl" />
+                </StackPanel>
+            </Grid>
         </TabItem>
     </TabControl>
 </UserControl>
diff --git a/...Navigation.Sample/Views/MainView.axaml.cs → ...Navigation.Sample/Views/MainView.axaml.cs b/...Navigation.Sample/Views/MainView.axaml.cs → ...Navigation.Sample/Views/MainView.axaml.cs
diff --git a/...eNavigation.Sample/Views/MainWindow.axaml → ...eNavigation.Sample/Views/MainWindow.axaml b/...eNavigation.Sample/Views/MainWindow.axaml → ...eNavigation.Sample/Views/MainWindow.axaml
diff --git a/...vigation.Sample/Views/MainWindow.axaml.cs → ...vigation.Sample/Views/MainWindow.axaml.cs b/...vigation.Sample/Views/MainWindow.axaml.cs → ...vigation.Sample/Views/MainWindow.axaml.cs
diff --git a/...leNavigation.Sample/Views/ViewAlpha.axaml → ...leNavigation.Sample/Views/ViewAlpha.axaml b/...leNavigation.Sample/Views/ViewAlpha.axaml → ...leNavigation.Sample/Views/ViewAlpha.axaml
diff --git a/...avigation.Sample/Views/ViewAlpha.axaml.cs → ...avigation.Sample/Views/ViewAlpha.axaml.cs b/...avigation.Sample/Views/ViewAlpha.axaml.cs → ...avigation.Sample/Views/ViewAlpha.axaml.cs
diff --git a/...uleNavigation.Sample/Views/ViewBeta.axaml → ...uleNavigation.Sample/Views/ViewBeta.axaml b/...uleNavigation.Sample/Views/ViewBeta.axaml → ...uleNavigation.Sample/Views/ViewBeta.axaml
diff --git a/...Navigation.Sample/Views/ViewBeta.axaml.cs → ...Navigation.Sample/Views/ViewBeta.axaml.cs b/...Navigation.Sample/Views/ViewBeta.axaml.cs → ...Navigation.Sample/Views/ViewBeta.axaml.cs
diff --git a/...tion.WpfSample/BaseNavigationViewModel.cs → ...ampleViewModel/BaseNavigationViewModel.cs b/...tion.WpfSample/BaseNavigationViewModel.cs → ...ampleViewModel/BaseNavigationViewModel.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.WpfSample;
+namespace Lemon.ModuleNavigation.SampleViewModel;
 
 public class BaseNavigationViewModel : ReactiveObject, INavigationAware
 {

diff --git a/samples/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj b/samples/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+	<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ReactiveUI" Version="18.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...vigation.WpfSample/MainWindowViewModel.cs → ...on.SampleViewModel/MainWindowViewModel.cs b/...vigation.WpfSample/MainWindowViewModel.cs → ...on.SampleViewModel/MainWindowViewModel.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.WpfSample;
+namespace Lemon.ModuleNavigation.SampleViewModel;
 
 public class MainWindowViewModel : ReactiveObject, IServiceAware
 {
@@ -73,11 +73,7 @@ await _dialogService.ShowDialog(content,
             };
             var result = _dialogService.WaitShowDialog(content,
                 null,
-                param,
-                result =>
-                {
-                    Debug.WriteLine($"Call back:{result}");
-                });
+                param);
             Debug.WriteLine($"ShowDialog over:{result}");
         });
         UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>

diff --git a/...pfSample/ViewModels/ViewAlphaViewModel.cs → ...ion.SampleViewModel/ViewAlphaViewModel.cs b/...pfSample/ViewModels/ViewAlphaViewModel.cs → ...ion.SampleViewModel/ViewAlphaViewModel.cs
@@ -3,7 +3,7 @@
 using ReactiveUI;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.WpfSample.ViewModels;
+namespace Lemon.ModuleNavigation.SampleViewModel;
 
 public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
 {