diff --git a/MaterialModernWPF/App.config b/MaterialModernWPF/App.config index d1428ad..33d73c4 100644 --- a/MaterialModernWPF/App.config +++ b/MaterialModernWPF/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + diff --git a/MaterialModernWPF/App.xaml b/MaterialModernWPF/App.xaml index 69a418f..51e6529 100644 --- a/MaterialModernWPF/App.xaml +++ b/MaterialModernWPF/App.xaml @@ -11,7 +11,6 @@ - diff --git a/MaterialModernWPF/Bootstrapper.cs b/MaterialModernWPF/Bootstrapper.cs index 82e8c84..3be619b 100644 --- a/MaterialModernWPF/Bootstrapper.cs +++ b/MaterialModernWPF/Bootstrapper.cs @@ -10,14 +10,13 @@ namespace MaterialModernWPF { base.ConfigureContainerBuilder(builder); builder.RegisterType(); - //builder.RegisterType(); } protected override DependencyObject CreateShell() => Container.Resolve(); protected override void InitializeShell() { - Application.Current.MainWindow = (Window)Shell; + Application.Current.MainWindow = (Window) Shell; Application.Current.MainWindow.Show(); } } diff --git a/MaterialModernWPF/InfoDialog.xaml.cs b/MaterialModernWPF/InfoDialog.xaml.cs index aebb6a3..1348290 100644 --- a/MaterialModernWPF/InfoDialog.xaml.cs +++ b/MaterialModernWPF/InfoDialog.xaml.cs @@ -1,11 +1,9 @@ -using System.Windows.Controls; - -namespace MaterialModernWPF +namespace MaterialModernWPF { /// /// Interaktionslogik für InfoDialog.xaml /// - public partial class InfoDialog : UserControl + public partial class InfoDialog { public InfoDialog() { diff --git a/MaterialModernWPF/MaterialModernWPF.csproj b/MaterialModernWPF/MaterialModernWPF.csproj index 3e21164..149e76b 100644 --- a/MaterialModernWPF/MaterialModernWPF.csproj +++ b/MaterialModernWPF/MaterialModernWPF.csproj @@ -9,7 +9,7 @@ Properties MaterialModernWPF MaterialModernWPF - v4.5 + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -40,20 +40,20 @@ airballoon.ico - - ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + + ..\packages\Autofac.4.1.0\lib\net45\Autofac.dll True - - ..\packages\Dragablz.0.0.3.169\lib\net45\Dragablz.dll + + ..\packages\Dragablz.0.0.3.170\lib\net45\Dragablz.dll True ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll True - - ..\packages\MaterialDesignThemes.2.0.0.638\lib\net45\MaterialDesignThemes.Wpf.dll + + ..\packages\MaterialDesignThemes.2.1.0.657\lib\net45\MaterialDesignThemes.Wpf.dll True @@ -64,21 +64,24 @@ ..\packages\ModernWpf.Core.2.0.0-alpha94\lib\net40-Client\ModernWpf.Core.dll True - - ..\packages\Prism.Core.6.1.0\lib\net45\Prism.dll + + ..\packages\Prism.Core.6.2.0\lib\net45\Prism.dll True - - ..\packages\Prism.Autofac.6.1.1\lib\net45\Prism.Autofac.Wpf.dll + + ..\packages\Prism.Autofac.6.2.0\lib\net45\Prism.Autofac.Wpf.dll True - - ..\packages\Prism.Wpf.6.1.0\lib\net45\Prism.Wpf.dll + + ..\packages\Prism.Wpf.6.2.0\lib\net45\Prism.Wpf.dll True - + + ..\packages\Prism.Wpf.6.2.0\lib\net45\System.Windows.Interactivity.dll + True + diff --git a/MaterialModernWPF/Shell.xaml.cs b/MaterialModernWPF/Shell.xaml.cs index b334629..8c743ea 100644 --- a/MaterialModernWPF/Shell.xaml.cs +++ b/MaterialModernWPF/Shell.xaml.cs @@ -1,11 +1,9 @@ -using System.Windows; - -namespace MaterialModernWPF +namespace MaterialModernWPF { /// /// Interaktionslogik für MainWindow.xaml /// - public partial class Shell : Window + public partial class Shell { public Shell() { diff --git a/MaterialModernWPF/packages.config b/MaterialModernWPF/packages.config index 7da3966..eb2f1a7 100644 --- a/MaterialModernWPF/packages.config +++ b/MaterialModernWPF/packages.config @@ -1,12 +1,12 @@  - + - + - + - - - + + + \ No newline at end of file