diff --git a/CHANGELIST.md b/CHANGELIST.md index b797cc20..2f694068 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -22,6 +22,7 @@ - Remove EnableLogFormatting - Remove App references from LogViewModel - Remove log formatting code +- Move LogOutput ### 2.6.3 (2023-08-15) diff --git a/MPF/UserControls/LogOutput.xaml b/MPF.UI.Core/UserControls/LogOutput.xaml similarity index 94% rename from MPF/UserControls/LogOutput.xaml rename to MPF.UI.Core/UserControls/LogOutput.xaml index d8d46c08..85f68610 100644 --- a/MPF/UserControls/LogOutput.xaml +++ b/MPF.UI.Core/UserControls/LogOutput.xaml @@ -1,9 +1,8 @@ - diff --git a/MPF/UserControls/LogOutput.xaml.cs b/MPF.UI.Core/UserControls/LogOutput.xaml.cs similarity index 86% rename from MPF/UserControls/LogOutput.xaml.cs rename to MPF.UI.Core/UserControls/LogOutput.xaml.cs index 472f0a39..80ea3d6c 100644 --- a/MPF/UserControls/LogOutput.xaml.cs +++ b/MPF.UI.Core/UserControls/LogOutput.xaml.cs @@ -1,7 +1,7 @@ using System.Windows.Controls; -using MPF.UI.ViewModels; +using MPF.UI.Core.ViewModels; -namespace MPF.UserControls +namespace MPF.UI.Core.UserControls { public partial class LogOutput : UserControl { diff --git a/MPF/ViewModels/LogViewModel.cs b/MPF.UI.Core/ViewModels/LogViewModel.cs similarity index 99% rename from MPF/ViewModels/LogViewModel.cs rename to MPF.UI.Core/ViewModels/LogViewModel.cs index f4038eca..bf927495 100644 --- a/MPF/ViewModels/LogViewModel.cs +++ b/MPF.UI.Core/ViewModels/LogViewModel.cs @@ -8,9 +8,9 @@ using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; using MPF.Core.Data; -using MPF.UserControls; +using MPF.UI.Core.UserControls; -namespace MPF.UI.ViewModels +namespace MPF.UI.Core.ViewModels { public class LogViewModel { diff --git a/MPF/App.xaml.cs b/MPF/App.xaml.cs index 8f966dd6..2fc162fd 100644 --- a/MPF/App.xaml.cs +++ b/MPF/App.xaml.cs @@ -1,6 +1,7 @@ using System.Windows; using MPF.Core.Data; using MPF.Core.Utilities; +using MPF.UI.Core.ViewModels; using MPF.UI.ViewModels; using MPF.Windows; diff --git a/MPF/Windows/MainWindow.xaml b/MPF/Windows/MainWindow.xaml index 5fbb7dc9..2ec69d5d 100644 --- a/MPF/Windows/MainWindow.xaml +++ b/MPF/Windows/MainWindow.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="clr-namespace:MPF.UserControls" + xmlns:controls="clr-namespace:MPF.UI.Core.UserControls;assembly=MPF.UI.Core" xmlns:coreWindows="clr-namespace:MPF.UI.Core.Windows;assembly=MPF.UI.Core" xmlns:viewModels="clr-namespace:MPF.UI.ViewModels" mc:Ignorable="d"