From 090d1d93f510ac1293b26ba5955bc8a30fa7c2ce Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Thu, 3 Apr 2025 11:51:27 +0800
Subject: [PATCH 1/2] sample update : merge viewmodel

---
 ...uleNavigation.Sample.DesktopHosting.csproj |   1 +
 .../Program.cs                                |   1 +
 .../AppWithDI.axaml.cs                        |   1 +
 .../Lemon.ModuleNavigation.Sample.csproj      |   1 +
 .../ModuleAs/ViewModelA.cs                    |   2 +-
 .../ModuleBs/ViewModelB.cs                    |   2 +-
 .../ModuleCs/ViewModelC.cs                    |   2 +-
 .../ModuleCs/ViewModels/SubViewModel01.cs     |   2 +-
 .../ModuleCs/ViewModels/SubViewModel02.cs     |   2 +-
 .../ViewModels/BaseNavigationViewModel.cs     |  56 -------
 .../ViewModels/MainViewModel.cs               |   1 -
 .../ViewModels/ViewAlphaViewModel.cs          |  48 ------
 .../ViewModels/ViewBetaViewModel.cs           |  48 ------
 .../Views/MainView.axaml                      | 156 ++++++++----------
 .../BaseNavigationViewModel.cs                |   2 +-
 ...on.ModuleNavigation.SampleViewModel.csproj |  17 ++
 .../MainWindowViewModel.cs                    |   2 +-
 .../ViewAlphaViewModel.cs                     |   2 +-
 .../ViewBetaViewModel.cs                      |   2 +-
 .../App.xaml.cs                               |   2 +-
 .../Lemon.ModuleNavigation.WpfSample.csproj   |   1 +
 src/Lemon.ModuleNavigation.sln                |   6 +
 22 files changed, 108 insertions(+), 249 deletions(-)
 delete mode 100644 src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
 delete mode 100644 src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
 delete mode 100644 src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
 rename src/{Lemon.ModuleNavigation.WpfSample => Lemon.ModuleNavigation.SampleViewModel}/BaseNavigationViewModel.cs (95%)
 create mode 100644 src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
 rename src/{Lemon.ModuleNavigation.WpfSample => Lemon.ModuleNavigation.SampleViewModel}/MainWindowViewModel.cs (98%)
 rename src/{Lemon.ModuleNavigation.WpfSample/ViewModels => Lemon.ModuleNavigation.SampleViewModel}/ViewAlphaViewModel.cs (96%)
 rename src/{Lemon.ModuleNavigation.WpfSample/ViewModels => Lemon.ModuleNavigation.SampleViewModel}/ViewBetaViewModel.cs (95%)

diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj b/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj
index b15ad34..2be3b63 100644
--- a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj
+++ b/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs b/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs
index c25bf43..fd50214 100644
--- a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs
+++ b/src/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs b/src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs
index 29eb782..3f82930 100644
--- a/src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs
+++ b/src/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj b/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
index f323864..61d4f05 100644
--- a/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
+++ b/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj" />
+    <ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
     <ProjectReference Include="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
   </ItemGroup>
 
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs b/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
index 08513b2..e0fa95a 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
+++ b/src/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs b/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
index ca58f6a..4b28172 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
+++ b/src/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
index a66c653..d7f3217 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
+++ b/src/Lemon.ModuleNavigation.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/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
index 07e14c0..208a83d 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
+++ b/src/Lemon.ModuleNavigation.Sample/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/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs b/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
index 309c335..84e695d 100644
--- a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
+++ b/src/Lemon.ModuleNavigation.Sample/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/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
deleted file mode 100644
index 4eb964d..0000000
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-using ReactiveUI;
-using System;
-using System.Diagnostics;
-using System.Reactive;
-
-namespace Lemon.ModuleNavigation.Sample.ViewModels;
-
-public class BaseNavigationViewModel : ReactiveObject, INavigationAware, IDisposable
-{
-    public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
-
-
-    public BaseNavigationViewModel()
-    {
-        UnloadViewCommand = ReactiveCommand.Create(() =>
-        {
-            var code = this.GetHashCode();
-            Debug.WriteLine(code);
-            RequestUnload?.Invoke();
-        });
-    }
-    public ReactiveCommand<Unit, Unit> UnloadViewCommand
-    {
-        get;
-    }
-
-    public event Action? RequestUnload;
-
-    public virtual void Dispose()
-    {
-        
-    }
-
-    public virtual bool IsNavigationTarget(NavigationContext navigationContext)
-    {
-        if (navigationContext.Parameters is not null)
-        {
-            if (navigationContext.Parameters.TryGetValue("requestNew", out bool requestNew))
-            {
-                return !requestNew;
-            }
-        }
-        return true;
-    }
-
-    public virtual void OnNavigatedFrom(NavigationContext navigationContext)
-    {
-       
-    }
-
-    public virtual void OnNavigatedTo(NavigationContext navigationContext)
-    {
-        
-    }
-}
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index f29c86b..d8de702 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/src/Lemon.ModuleNavigation.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, 
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
deleted file mode 100644
index 7ea4585..0000000
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.Logging;
-using ReactiveUI;
-using System;
-using System.Reactive;
-
-namespace Lemon.ModuleNavigation.Sample.ViewModels;
-
-public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
-{
-    private readonly ILogger _logger;
-    public ViewAlphaViewModel(ILogger<ViewAlphaViewModel> logger)
-    {
-        _logger = logger;
-        CloseCommand = ReactiveCommand.Create(() => 
-        {
-            var param = new DialogParameters
-            {
-                { "from", nameof(ViewAlphaViewModel) }
-            };
-            RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
-        });
-    }
-    private bool _isDialog = false;
-    public bool IsDialog
-    {
-        get => _isDialog;
-        set
-        {
-            this.RaiseAndSetIfChanged(ref _isDialog, value);
-        }
-    }
-    public ReactiveCommand<Unit, Unit> CloseCommand { get; } 
-    public string Title => nameof(ViewAlphaViewModel);
-    public event Action<IDialogResult>? RequestClose;
-
-    public void OnDialogClosed()
-    {
-        _logger.LogInformation("OnDialogClosed");
-    }
-
-    public void OnDialogOpened(IDialogParameters? parameters)
-    {
-        _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
-        IsDialog = true;
-    }
-}
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
deleted file mode 100644
index b0c30e7..0000000
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Core;
-using Microsoft.Extensions.Logging;
-using ReactiveUI;
-using System;
-using System.Reactive;
-
-namespace Lemon.ModuleNavigation.Sample.ViewModels;
-
-public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
-{
-    private readonly ILogger _logger;
-    public ViewBetaViewModel(ILogger<ViewBetaViewModel> logger)
-    {
-        _logger = logger;
-        CloseCommand = ReactiveCommand.Create(() =>
-        {
-            var param = new DialogParameters
-            {
-                { "from", nameof(ViewAlphaViewModel) }
-            };
-            RequestClose?.Invoke(new DialogResult(ButtonResult.OK, param));
-        });
-    }
-    private bool _isDialog = false;
-    public bool IsDialog
-    {
-        get => _isDialog;
-        set
-        {
-            this.RaiseAndSetIfChanged(ref _isDialog, value);
-        }
-    }
-    public ReactiveCommand<Unit, Unit> CloseCommand { get; }
-    public string Title => nameof(ViewAlphaViewModel);
-    public event Action<IDialogResult>? RequestClose;
-
-    public void OnDialogClosed()
-    {
-        _logger.LogInformation("OnDialogClosed");
-    }
-
-    public void OnDialogOpened(IDialogParameters? parameters)
-    {
-        _logger.LogInformation($"OnDialogOpened:{parameters?.ToString()}");
-        IsDialog = true;
-    }
-}
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
index 052df74..03b760a 100644
--- a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
+++ b/src/Lemon.ModuleNavigation.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>
\ No newline at end of file
diff --git a/src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs b/src/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
similarity index 95%
rename from src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs
rename to src/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
index 0ddc219..670d887 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/BaseNavigationViewModel.cs
+++ b/src/Lemon.ModuleNavigation.SampleViewModel/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/src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj b/src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
new file mode 100644
index 0000000..1ba099e
--- /dev/null
+++ b/src/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="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs b/src/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
similarity index 98%
rename from src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
rename to src/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
index fea7e11..d757bb4 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs
+++ b/src/Lemon.ModuleNavigation.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
 {
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs b/src/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
similarity index 96%
rename from src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
rename to src/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
index b34a2ed..9d70cb8 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewAlphaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.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
 {
diff --git a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs b/src/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
similarity index 95%
rename from src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
rename to src/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
index dd126a3..32a86b5 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/ViewModels/ViewBetaViewModel.cs
+++ b/src/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
@@ -3,7 +3,7 @@
 using ReactiveUI;
 using System.Reactive;
 
-namespace Lemon.ModuleNavigation.WpfSample.ViewModels;
+namespace Lemon.ModuleNavigation.SampleViewModel;
 
 public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
 {
diff --git a/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs b/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
index 607be71..d9885f1 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
+++ b/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
@@ -1,4 +1,4 @@
-using Lemon.ModuleNavigation.WpfSample.ViewModels;
+using Lemon.ModuleNavigation.SampleViewModel;
 using Lemon.ModuleNavigation.WpfSample.Views;
 using Microsoft.Extensions.DependencyInjection;
 using System.Windows;
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj b/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
index e72533f..f049f5d 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
+++ b/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
     <ProjectReference Include="..\Lemon.ModuleNavigation.Wpf\Lemon.ModuleNavigation.Wpf.csproj" />
   </ItemGroup>
 
diff --git a/src/Lemon.ModuleNavigation.sln b/src/Lemon.ModuleNavigation.sln
index 7f7c5ac..9d132fb 100644
--- a/src/Lemon.ModuleNavigation.sln
+++ b/src/Lemon.ModuleNavigation.sln
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.Wpf"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.WpfSample", "Lemon.ModuleNavigation.WpfSample\Lemon.ModuleNavigation.WpfSample.csproj", "{8EC545BD-E076-A2DF-A7A4-2F11221AF297}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lemon.ModuleNavigation.SampleViewModel", "Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj", "{99600F69-5901-4CEA-8C54-BFDC0751E207}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -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

From e95b6ddc5fb90ad4fc0dffccfc8f32af50a9e72b Mon Sep 17 00:00:00 2001
From: Easley <nevermore.wd@me.com>
Date: Thu, 10 Apr 2025 10:39:12 +0800
Subject: [PATCH 2/2] refactor directory structure

---
 src/.editorconfig => .editorconfig            |   0
 .github/workflows/dotnet-desktop.yml          |   8 +-
 ...ctory.Build.props => Directory.Build.props |   0
 ...vigation.sln => Lemon.ModuleNavigation.sln |  18 +-
 ...breakdownchanges.md => breakdownchanges.md |   0
 .../Assets/lemon-100.png => lemon-100.png     | Bin
 ...mon.ModuleNavigation.Sample.Browser.csproj |   0
 .../Program.cs                                |   0
 .../Properties/launchSettings.json            |   0
 .../runtimeconfig.template.json               |   0
 .../wwwroot/app.css                           |   0
 .../wwwroot/favicon.ico                       | Bin
 .../wwwroot/index.html                        |   0
 .../wwwroot/main.js                           |   0
 ...mon.ModuleNavigation.Sample.Desktop.csproj |   0
 .../Program.cs                                |   0
 .../Properties/launchSettings.json            |   0
 .../app.manifest                              |   0
 ...uleNavigation.Sample.DesktopHosting.csproj |   0
 .../Program.cs                                |   0
 .../Properties/launchSettings.json            |   0
 .../app.manifest                              |   0
 .../rd.xml                                    |   0
 .../Lemon.ModuleNavigation.Sample/App.axaml   |   0
 .../App.axaml.cs                              |   0
 .../AppWithDI.axaml.cs                        |   0
 .../AppWithDi.axaml                           |   0
 .../Assets/avalonia-logo.ico                  | Bin
 .../Assets/lemon-100.ico                      | Bin
 .../Assets}/lemon-100.png                     | Bin
 .../Assets/lemon-28.png                       | Bin
 .../Assets/lemon-50.png                       | Bin
 .../DesignDatas/MainWindowViewModel.cs        |   0
 .../DialogWindows/CustomDialogWindow.axaml    |   0
 .../DialogWindows/CustomDialogWindow.axaml.cs |   0
 .../Lemon.ModuleNavigation.Sample.csproj      |   4 +-
 .../ModuleAs/ModuleA.cs                       |   0
 .../ModuleAs/ViewA.axaml                      |   0
 .../ModuleAs/ViewA.axaml.cs                   |   0
 .../ModuleAs/ViewModelA.cs                    |   0
 .../ModuleBs/ModuleB.cs                       |   0
 .../ModuleBs/ViewB.axaml                      |   0
 .../ModuleBs/ViewB.axaml.cs                   |   0
 .../ModuleBs/ViewModelB.cs                    |   0
 .../ModuleCs/ModuleC.cs                       |   0
 .../ModuleCs/SubModules/SubModule01.cs        |   0
 .../ModuleCs/SubModules/SubModule02.cs        |   0
 .../ModuleCs/ViewC.axaml                      |   0
 .../ModuleCs/ViewC.axaml.cs                   |   0
 .../ModuleCs/ViewModelC.cs                    |   0
 .../ModuleCs/ViewModels/SubViewModel01.cs     |   0
 .../ModuleCs/ViewModels/SubViewModel02.cs     |   0
 .../ModuleCs/Views/SubView01.axaml            |   0
 .../ModuleCs/Views/SubView01.axaml.cs         |   0
 .../ModuleCs/Views/SubView02.axaml            |   0
 .../ModuleCs/Views/SubView02.axaml.cs         |   0
 .../ViewModels/MainViewModel.cs               |   6 +-
 .../Views/MainView.axaml                      |   0
 .../Views/MainView.axaml.cs                   |   0
 .../Views/MainWindow.axaml                    |   0
 .../Views/MainWindow.axaml.cs                 |   0
 .../Views/ViewAlpha.axaml                     |   0
 .../Views/ViewAlpha.axaml.cs                  |   0
 .../Views/ViewBeta.axaml                      |   0
 .../Views/ViewBeta.axaml.cs                   |   0
 .../BaseNavigationViewModel.cs                |   0
 ...on.ModuleNavigation.SampleViewModel.csproj |   4 +-
 .../MainWindowViewModel.cs                    |   6 +-
 .../ViewAlphaViewModel.cs                     |   0
 .../ViewBetaViewModel.cs                      |   0
 .../Lemon.ModuleNavigation.WpfSample/App.xaml |   0
 .../App.xaml.cs                               |   0
 .../AssemblyInfo.cs                           |   0
 .../BoolToVisibilityConverter.cs              |   0
 .../Lemon.ModuleNavigation.WpfSample.csproj   |   2 +-
 .../MainWindow.xaml                           |   6 +-
 .../MainWindow.xaml.cs                        |   0
 .../Views/ViewAlpha.xaml                      |   0
 .../Views/ViewAlpha.xaml.cs                   |   0
 .../Views/ViewBeta.xaml                       |   0
 .../Views/ViewBeta.xaml.cs                    |   0
 src/.gitignore                                | 454 ------------------
 .../DialogService.cs                          |   5 +-
 .../Lemon.ModuleNavigation.Avaloniaui.csproj  |   2 +-
 .../DialogService.cs                          |   5 +-
 .../Lemon.ModuleNavigation.Wpf.csproj         |   2 +-
 .../Abstractions/IDialogService.cs            |   3 +-
 .../Lemon.ModuleNavigation.csproj             |   2 +-
 src/build/build-linux-musl-x64-aot .bat       |  36 --
 89 files changed, 31 insertions(+), 532 deletions(-)
 rename src/.editorconfig => .editorconfig (100%)
 rename src/Directory.Build.props => Directory.Build.props (100%)
 rename src/Lemon.ModuleNavigation.sln => Lemon.ModuleNavigation.sln (76%)
 rename src/breakdownchanges.md => breakdownchanges.md (100%)
 rename src/Lemon.ModuleNavigation.Sample/Assets/lemon-100.png => lemon-100.png (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/Lemon.ModuleNavigation.Sample.Browser.csproj (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/Program.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/Properties/launchSettings.json (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/runtimeconfig.template.json (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/wwwroot/app.css (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/wwwroot/favicon.ico (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/wwwroot/index.html (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Browser/wwwroot/main.js (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Desktop/Lemon.ModuleNavigation.Sample.Desktop.csproj (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Desktop/Program.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Desktop/Properties/launchSettings.json (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.Desktop/app.manifest (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.DesktopHosting/Properties/launchSettings.json (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.DesktopHosting/app.manifest (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample.DesktopHosting/rd.xml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/App.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/App.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/AppWithDi.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Assets/avalonia-logo.ico (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Assets/lemon-100.ico (100%)
 rename {src => samples/Lemon.ModuleNavigation.Sample/Assets}/lemon-100.png (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Assets/lemon-28.png (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Assets/lemon-50.png (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/DesignDatas/MainWindowViewModel.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj (88%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleAs/ModuleA.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleBs/ModuleB.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ModuleC.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule01.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule02.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs (97%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/MainView.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/MainView.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj (69%)
 rename {src => samples}/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs (96%)
 rename {src => samples}/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/App.xaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/App.xaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/AssemblyInfo.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj (86%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml (99%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml (100%)
 rename {src => samples}/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs (100%)
 delete mode 100644 src/.gitignore
 delete mode 100644 src/build/build-linux-musl-x64-aot .bat

diff --git a/src/.editorconfig b/.editorconfig
similarity index 100%
rename from src/.editorconfig
rename to .editorconfig
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 4ec069e..21a8f5f 100644
--- 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 b/Directory.Build.props
similarity index 100%
rename from src/Directory.Build.props
rename to Directory.Build.props
diff --git a/src/Lemon.ModuleNavigation.sln b/Lemon.ModuleNavigation.sln
similarity index 76%
rename from src/Lemon.ModuleNavigation.sln
rename to Lemon.ModuleNavigation.sln
index 9d132fb..3f131b0 100644
--- a/src/Lemon.ModuleNavigation.sln
+++ b/Lemon.ModuleNavigation.sln
@@ -3,28 +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", "Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj", "{99600F69-5901-4CEA-8C54-BFDC0751E207}"
+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
diff --git a/src/breakdownchanges.md b/breakdownchanges.md
similarity index 100%
rename from src/breakdownchanges.md
rename to breakdownchanges.md
diff --git a/src/Lemon.ModuleNavigation.Sample/Assets/lemon-100.png b/lemon-100.png
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Assets/lemon-100.png
rename to lemon-100.png
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/Lemon.ModuleNavigation.Sample.Browser.csproj b/samples/Lemon.ModuleNavigation.Sample.Browser/Lemon.ModuleNavigation.Sample.Browser.csproj
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/Lemon.ModuleNavigation.Sample.Browser.csproj
rename to samples/Lemon.ModuleNavigation.Sample.Browser/Lemon.ModuleNavigation.Sample.Browser.csproj
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/Program.cs b/samples/Lemon.ModuleNavigation.Sample.Browser/Program.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/Program.cs
rename to samples/Lemon.ModuleNavigation.Sample.Browser/Program.cs
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/Properties/launchSettings.json b/samples/Lemon.ModuleNavigation.Sample.Browser/Properties/launchSettings.json
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/Properties/launchSettings.json
rename to samples/Lemon.ModuleNavigation.Sample.Browser/Properties/launchSettings.json
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/runtimeconfig.template.json b/samples/Lemon.ModuleNavigation.Sample.Browser/runtimeconfig.template.json
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/runtimeconfig.template.json
rename to samples/Lemon.ModuleNavigation.Sample.Browser/runtimeconfig.template.json
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/app.css b/samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/app.css
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/app.css
rename to samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/app.css
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/favicon.ico b/samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/favicon.ico
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/favicon.ico
rename to samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/favicon.ico
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/index.html b/samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/index.html
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/index.html
rename to samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/index.html
diff --git a/src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/main.js b/samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/main.js
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Browser/wwwroot/main.js
rename to samples/Lemon.ModuleNavigation.Sample.Browser/wwwroot/main.js
diff --git a/src/Lemon.ModuleNavigation.Sample.Desktop/Lemon.ModuleNavigation.Sample.Desktop.csproj b/samples/Lemon.ModuleNavigation.Sample.Desktop/Lemon.ModuleNavigation.Sample.Desktop.csproj
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Desktop/Lemon.ModuleNavigation.Sample.Desktop.csproj
rename to samples/Lemon.ModuleNavigation.Sample.Desktop/Lemon.ModuleNavigation.Sample.Desktop.csproj
diff --git a/src/Lemon.ModuleNavigation.Sample.Desktop/Program.cs b/samples/Lemon.ModuleNavigation.Sample.Desktop/Program.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Desktop/Program.cs
rename to samples/Lemon.ModuleNavigation.Sample.Desktop/Program.cs
diff --git a/src/Lemon.ModuleNavigation.Sample.Desktop/Properties/launchSettings.json b/samples/Lemon.ModuleNavigation.Sample.Desktop/Properties/launchSettings.json
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Desktop/Properties/launchSettings.json
rename to samples/Lemon.ModuleNavigation.Sample.Desktop/Properties/launchSettings.json
diff --git a/src/Lemon.ModuleNavigation.Sample.Desktop/app.manifest b/samples/Lemon.ModuleNavigation.Sample.Desktop/app.manifest
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.Desktop/app.manifest
rename to samples/Lemon.ModuleNavigation.Sample.Desktop/app.manifest
diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj b/samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj
rename to samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj
diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs b/samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs
rename to samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs
diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/Properties/launchSettings.json b/samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Properties/launchSettings.json
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.DesktopHosting/Properties/launchSettings.json
rename to samples/Lemon.ModuleNavigation.Sample.DesktopHosting/Properties/launchSettings.json
diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/app.manifest b/samples/Lemon.ModuleNavigation.Sample.DesktopHosting/app.manifest
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.DesktopHosting/app.manifest
rename to samples/Lemon.ModuleNavigation.Sample.DesktopHosting/app.manifest
diff --git a/src/Lemon.ModuleNavigation.Sample.DesktopHosting/rd.xml b/samples/Lemon.ModuleNavigation.Sample.DesktopHosting/rd.xml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample.DesktopHosting/rd.xml
rename to samples/Lemon.ModuleNavigation.Sample.DesktopHosting/rd.xml
diff --git a/src/Lemon.ModuleNavigation.Sample/App.axaml b/samples/Lemon.ModuleNavigation.Sample/App.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/App.axaml
rename to samples/Lemon.ModuleNavigation.Sample/App.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/App.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/App.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/App.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/App.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/AppWithDi.axaml b/samples/Lemon.ModuleNavigation.Sample/AppWithDi.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/AppWithDi.axaml
rename to samples/Lemon.ModuleNavigation.Sample/AppWithDi.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/Assets/avalonia-logo.ico b/samples/Lemon.ModuleNavigation.Sample/Assets/avalonia-logo.ico
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Assets/avalonia-logo.ico
rename to samples/Lemon.ModuleNavigation.Sample/Assets/avalonia-logo.ico
diff --git a/src/Lemon.ModuleNavigation.Sample/Assets/lemon-100.ico b/samples/Lemon.ModuleNavigation.Sample/Assets/lemon-100.ico
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Assets/lemon-100.ico
rename to samples/Lemon.ModuleNavigation.Sample/Assets/lemon-100.ico
diff --git a/src/lemon-100.png b/samples/Lemon.ModuleNavigation.Sample/Assets/lemon-100.png
similarity index 100%
rename from src/lemon-100.png
rename to samples/Lemon.ModuleNavigation.Sample/Assets/lemon-100.png
diff --git a/src/Lemon.ModuleNavigation.Sample/Assets/lemon-28.png b/samples/Lemon.ModuleNavigation.Sample/Assets/lemon-28.png
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Assets/lemon-28.png
rename to samples/Lemon.ModuleNavigation.Sample/Assets/lemon-28.png
diff --git a/src/Lemon.ModuleNavigation.Sample/Assets/lemon-50.png b/samples/Lemon.ModuleNavigation.Sample/Assets/lemon-50.png
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Assets/lemon-50.png
rename to samples/Lemon.ModuleNavigation.Sample/Assets/lemon-50.png
diff --git a/src/Lemon.ModuleNavigation.Sample/DesignDatas/MainWindowViewModel.cs b/samples/Lemon.ModuleNavigation.Sample/DesignDatas/MainWindowViewModel.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/DesignDatas/MainWindowViewModel.cs
rename to samples/Lemon.ModuleNavigation.Sample/DesignDatas/MainWindowViewModel.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml b/samples/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml
rename to samples/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/DialogWindows/CustomDialogWindow.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj b/samples/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
similarity index 88%
rename from src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
rename to samples/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
index 61d4f05..102d32f 100644
--- a/src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
+++ b/samples/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj
@@ -32,9 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.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" />
-    <ProjectReference Include="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ModuleA.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleAs/ModuleA.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleAs/ModuleA.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleAs/ModuleA.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml b/samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml
rename to samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewA.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ModuleB.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleBs/ModuleB.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleBs/ModuleB.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleBs/ModuleB.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml b/samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml
rename to samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewB.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ModuleC.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ModuleC.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ModuleC.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ModuleC.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule01.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule01.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule01.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule01.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule02.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule02.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule02.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/SubModules/SubModule02.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewC.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView01.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/ModuleCs/Views/SubView02.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
similarity index 97%
rename from src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
rename to samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
index d8de702..b8427ca 100644
--- a/src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs
@@ -92,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/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
rename to samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/MainView.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/Views/MainView.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml
rename to samples/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/Views/MainWindow.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
rename to samples/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/Views/ViewAlpha.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml b/samples/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
rename to samples/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml
diff --git a/src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml.cs b/samples/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml.cs
rename to samples/Lemon.ModuleNavigation.Sample/Views/ViewBeta.axaml.cs
diff --git a/src/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
rename to samples/Lemon.ModuleNavigation.SampleViewModel/BaseNavigationViewModel.cs
diff --git a/src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj b/samples/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
similarity index 69%
rename from src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
rename to samples/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
index 1ba099e..b05dbdf 100644
--- a/src/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/Lemon.ModuleNavigation.SampleViewModel.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
 	<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
+    <ProjectReference Include="..\..\src\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
similarity index 96%
rename from src/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
rename to samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
index d757bb4..2427c6f 100644
--- a/src/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
+++ b/samples/Lemon.ModuleNavigation.SampleViewModel/MainWindowViewModel.cs
@@ -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/src/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
rename to samples/Lemon.ModuleNavigation.SampleViewModel/ViewAlphaViewModel.cs
diff --git a/src/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs b/samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
rename to samples/Lemon.ModuleNavigation.SampleViewModel/ViewBetaViewModel.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/App.xaml b/samples/Lemon.ModuleNavigation.WpfSample/App.xaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/App.xaml
rename to samples/Lemon.ModuleNavigation.WpfSample/App.xaml
diff --git a/src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs b/samples/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/App.xaml.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/AssemblyInfo.cs b/samples/Lemon.ModuleNavigation.WpfSample/AssemblyInfo.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/AssemblyInfo.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/AssemblyInfo.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs b/samples/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/BoolToVisibilityConverter.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj b/samples/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
similarity index 86%
rename from src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
rename to samples/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
index f049f5d..f25ee9b 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
+++ b/samples/Lemon.ModuleNavigation.WpfSample/Lemon.ModuleNavigation.WpfSample.csproj
@@ -15,8 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\Lemon.ModuleNavigation.Wpf\Lemon.ModuleNavigation.Wpf.csproj" />
     <ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
-    <ProjectReference Include="..\Lemon.ModuleNavigation.Wpf\Lemon.ModuleNavigation.Wpf.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
similarity index 99%
rename from src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
rename to samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
index 4d77e85..5382efe 100644
--- a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
+++ b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml
@@ -57,14 +57,14 @@
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock Text="{Binding}" />
                                         <Button
-                                            Content="x"
-                                            ToolTip="UnloadView"
                                             Width="20"
                                             Height="20"
                                             HorizontalContentAlignment="Center"
                                             VerticalContentAlignment="Center"
                                             Command="{Binding DataContext.UnloadViewCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
-                                            CommandParameter="{Binding}" />
+                                            CommandParameter="{Binding}"
+                                            Content="x"
+                                            ToolTip="UnloadView" />
                                     </StackPanel>
                                 </DataTemplate>
                             </TabControl.ItemTemplate>
diff --git a/src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs b/samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/MainWindow.xaml.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml b/samples/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
rename to samples/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs b/samples/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/Views/ViewAlpha.xaml.cs
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml b/samples/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
rename to samples/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml
diff --git a/src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs b/samples/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
similarity index 100%
rename from src/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
rename to samples/Lemon.ModuleNavigation.WpfSample/Views/ViewBeta.xaml.cs
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 8afdcb6..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,454 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Ww][Ii][Nn]32/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# Tye
-.tye/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
-##
-## Visual studio for Mac
-##
-
-
-# globs
-Makefile.in
-*.userprefs
-*.usertasks
-config.make
-config.status
-aclocal.m4
-install-sh
-autom4te.cache/
-*.tar.gz
-tarballs/
-test-results/
-
-# Mac bundle stuff
-*.dmg
-*.app
-
-# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-##
-## Visual Studio Code
-##
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs b/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
index 6d527dd..2e70337 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs
@@ -32,10 +32,9 @@ public async Task ShowDialog(string name,
 
     public IDialogResult WaitShowDialog(string name, 
         string? windowName = null, 
-        IDialogParameters? parameters = null,
-        Action<IDialogResult>? callback = null)
+        IDialogParameters? parameters = null)
     {
-       return ShowDialogCoreSync(name, windowName, parameters, callback);
+       return ShowDialogCoreSync(name, windowName, parameters);
     }
 
 
diff --git a/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj b/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
index ce7dc98..cf5c851 100644
--- a/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
+++ b/src/Lemon.ModuleNavigation.Avaloniaui/Lemon.ModuleNavigation.Avaloniaui.csproj
@@ -33,7 +33,7 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\lemon-100.png">
+    <None Include="..\..\lemon-100.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
diff --git a/src/Lemon.ModuleNavigation.Wpf/DialogService.cs b/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
index 3e0f4e7..7b2c3e2 100644
--- a/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
+++ b/src/Lemon.ModuleNavigation.Wpf/DialogService.cs
@@ -31,10 +31,9 @@ public async Task ShowDialog(string name,
 
     public IDialogResult WaitShowDialog(string name, 
         string? windowName = null, 
-        IDialogParameters? parameters = null,
-        Action<IDialogResult>? callback = null)
+        IDialogParameters? parameters = null)
     {
-       return ShowDialogCoreSync(name, windowName, parameters, callback);
+       return ShowDialogCoreSync(name, windowName, parameters);
     }
 
 
diff --git a/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj b/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
index d773758..59eb620 100644
--- a/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
+++ b/src/Lemon.ModuleNavigation.Wpf/Lemon.ModuleNavigation.Wpf.csproj
@@ -24,7 +24,7 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-    <None Include="..\lemon-100.png">
+    <None Include="..\..\lemon-100.png">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
diff --git a/src/Lemon.ModuleNavigation/Abstractions/IDialogService.cs b/src/Lemon.ModuleNavigation/Abstractions/IDialogService.cs
index 94a336a..bc6d66a 100644
--- a/src/Lemon.ModuleNavigation/Abstractions/IDialogService.cs
+++ b/src/Lemon.ModuleNavigation/Abstractions/IDialogService.cs
@@ -14,6 +14,5 @@ Task ShowDialog(string name,
 
     IDialogResult WaitShowDialog(string name,
         string? windowName = null,
-        IDialogParameters? parameters = null,
-        Action<IDialogResult>? callback = null);
+        IDialogParameters? parameters = null);
 }
diff --git a/src/Lemon.ModuleNavigation/Lemon.ModuleNavigation.csproj b/src/Lemon.ModuleNavigation/Lemon.ModuleNavigation.csproj
index 83dbe1c..dcbe992 100644
--- a/src/Lemon.ModuleNavigation/Lemon.ModuleNavigation.csproj
+++ b/src/Lemon.ModuleNavigation/Lemon.ModuleNavigation.csproj
@@ -29,7 +29,7 @@
 	    <Pack>True</Pack>
 	    <PackagePath>\</PackagePath>
 	  </None>
-	  <None Include="..\lemon-100.png">
+	  <None Include="..\..\lemon-100.png">
 	    <Pack>True</Pack>
 	    <PackagePath>\</PackagePath>
 	  </None>
diff --git a/src/build/build-linux-musl-x64-aot .bat b/src/build/build-linux-musl-x64-aot .bat
deleted file mode 100644
index 072bb7c..0000000
--- a/src/build/build-linux-musl-x64-aot .bat	
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-
-cd /d %~dp0
-echo Current directory: %cd%
-
-REM 设置项目路径
-set "PROJECT_PATH=..\Lemon.ModuleNavigation.Sample.DesktopHosting\Lemon.ModuleNavigation.Sample.DesktopHosting.csproj"
-echo Project directory: %PROJECT_PATH%
-
-REM 设置发布配置
-set "CONFIGURATION=Release"
-
-REM 设置目标框架
-set "FRAMEWORK=net8.0"
-
-REM 设置目标运行时 aot发布暂不支持x86
-set "RUNTIME=linux-musl-arm64"
-
-REM 设置输出目录
-set "OUTPUT_DIR=%RUNTIME%"
-
-REM 是否自包含
-set "SELF_CONTAINED=true"
-
-REM 设置版本号
-set "VERSION=1.0.1"
-set "ASSEMBLY_VERSION=1.0.1.0"
-set "FILE_VERSION=1.0.1.0"
-set "INFORMATIONAL_VERSION=1.0.1"
-
-REM 执行发布命令
-dotnet publish "%PROJECT_PATH%" -c %CONFIGURATION% -f %FRAMEWORK% -r %RUNTIME% --self-contained %SELF_CONTAINED% -o %OUTPUT_DIR% -p:PublishReadyToRun=true -p:Version=%VERSION% -p:AssemblyVersion=%ASSEMBLY_VERSION% -p:FileVersion=%FILE_VERSION% -p:InformationalVersion=%INFORMATIONAL_VERSION%
-
-
-echo Publish completed New Bee!
-pause