diff --git a/MaterialModernWPF/App.config b/MaterialModernWPF/App.config index 33d73c4..3fa4d10 100644 --- a/MaterialModernWPF/App.config +++ b/MaterialModernWPF/App.config @@ -1,13 +1,17 @@ - + - + - - + + + + + + diff --git a/MaterialModernWPF/Bootstrapper.cs b/MaterialModernWPF/Bootstrapper.cs index 3be619b..84189b4 100644 --- a/MaterialModernWPF/Bootstrapper.cs +++ b/MaterialModernWPF/Bootstrapper.cs @@ -16,8 +16,8 @@ namespace MaterialModernWPF protected override void InitializeShell() { - Application.Current.MainWindow = (Window) Shell; - Application.Current.MainWindow.Show(); + Application.Current.MainWindow = Shell as Window; + Application.Current.MainWindow?.Show(); } } } \ No newline at end of file diff --git a/MaterialModernWPF/MaterialModernWPF.csproj b/MaterialModernWPF/MaterialModernWPF.csproj index 149e76b..3f9f4ae 100644 --- a/MaterialModernWPF/MaterialModernWPF.csproj +++ b/MaterialModernWPF/MaterialModernWPF.csproj @@ -40,47 +40,39 @@ airballoon.ico - - ..\packages\Autofac.4.1.0\lib\net45\Autofac.dll - True + + ..\packages\Autofac.4.8.1\lib\net45\Autofac.dll - - ..\packages\Dragablz.0.0.3.170\lib\net45\Dragablz.dll - True + + ..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll + + + ..\packages\Dragablz.0.0.3.203\lib\net45\Dragablz.dll ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll True - - ..\packages\MaterialDesignThemes.2.1.0.657\lib\net45\MaterialDesignThemes.Wpf.dll - True - - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True + + ..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll ..\packages\ModernWpf.Core.2.0.0-alpha94\lib\net40-Client\ModernWpf.Core.dll True - - ..\packages\Prism.Core.6.2.0\lib\net45\Prism.dll - True + + ..\packages\Prism.Core.7.0.0.396\lib\net45\Prism.dll - - ..\packages\Prism.Autofac.6.2.0\lib\net45\Prism.Autofac.Wpf.dll - True + + ..\packages\Prism.Autofac.6.3.0\lib\net45\Prism.Autofac.Wpf.dll - - ..\packages\Prism.Wpf.6.2.0\lib\net45\Prism.Wpf.dll - True + + ..\packages\Prism.Wpf.6.3.0\lib\net45\Prism.Wpf.dll - ..\packages\Prism.Wpf.6.2.0\lib\net45\System.Windows.Interactivity.dll - True + ..\packages\Prism.Wpf.6.3.0\lib\net45\System.Windows.Interactivity.dll diff --git a/MaterialModernWPF/packages.config b/MaterialModernWPF/packages.config index eb2f1a7..f81222c 100644 --- a/MaterialModernWPF/packages.config +++ b/MaterialModernWPF/packages.config @@ -1,12 +1,12 @@  - - - + + + - + - - - + + + \ No newline at end of file