Skip to content

Commit 090d1d9

Browse files
committed
sample update : merge viewmodel
1 parent 8fbc3f2 commit 090d1d9

22 files changed

Lines changed: 108 additions & 249 deletions

src/Lemon.ModuleNavigation.Sample.DesktopHosting/Lemon.ModuleNavigation.Sample.DesktopHosting.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24+
<ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
2425
<ProjectReference Include="..\Lemon.ModuleNavigation.Sample\Lemon.ModuleNavigation.Sample.csproj" />
2526
</ItemGroup>
2627
<ItemGroup>

src/Lemon.ModuleNavigation.Sample.DesktopHosting/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Lemon.ModuleNavigation.Sample.ModuleCs;
77
using Lemon.ModuleNavigation.Sample.ViewModels;
88
using Lemon.ModuleNavigation.Sample.Views;
9+
using Lemon.ModuleNavigation.SampleViewModel;
910
using Microsoft.Extensions.DependencyInjection;
1011
using Microsoft.Extensions.Hosting;
1112
using Microsoft.Extensions.Logging;

src/Lemon.ModuleNavigation.Sample/AppWithDI.axaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Lemon.ModuleNavigation.Sample.ModuleCs;
77
using Lemon.ModuleNavigation.Sample.ViewModels;
88
using Lemon.ModuleNavigation.Sample.Views;
9+
using Lemon.ModuleNavigation.SampleViewModel;
910
using Microsoft.Extensions.DependencyInjection;
1011
using System;
1112

src/Lemon.ModuleNavigation.Sample/Lemon.ModuleNavigation.Sample.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<ItemGroup>
3535
<ProjectReference Include="..\Lemon.ModuleNavigation.Avaloniaui\Lemon.ModuleNavigation.Avaloniaui.csproj" />
36+
<ProjectReference Include="..\Lemon.ModuleNavigation.SampleViewModel\Lemon.ModuleNavigation.SampleViewModel.csproj" />
3637
<ProjectReference Include="..\Lemon.ModuleNavigation\Lemon.ModuleNavigation.csproj" />
3738
</ItemGroup>
3839

src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Lemon.ModuleNavigation.Abstractions;
2-
using Lemon.ModuleNavigation.Sample.ViewModels;
2+
using Lemon.ModuleNavigation.SampleViewModel;
33
using ReactiveUI;
44
using System.Reactive;
55

src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Lemon.ModuleNavigation.Abstractions;
2-
using Lemon.ModuleNavigation.Sample.ViewModels;
2+
using Lemon.ModuleNavigation.SampleViewModel;
33
using ReactiveUI;
44
using System.Reactive;
55

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Lemon.ModuleNavigation.Abstractions;
2-
using Lemon.ModuleNavigation.Sample.ViewModels;
2+
using Lemon.ModuleNavigation.SampleViewModel;
33
using ReactiveUI;
44
using System;
55
using System.Reactive;

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Lemon.ModuleNavigation.Abstractions;
2-
using Lemon.ModuleNavigation.Sample.ViewModels;
2+
using Lemon.ModuleNavigation.SampleViewModel;
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
55
using System;

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Lemon.ModuleNavigation.Abstractions;
2-
using Lemon.ModuleNavigation.Sample.ViewModels;
2+
using Lemon.ModuleNavigation.SampleViewModel;
33
using System;
44

55
namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;

src/Lemon.ModuleNavigation.Sample/ViewModels/BaseNavigationViewModel.cs

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)