From 377d5dd9b158d0338528abda49bf621c8bd094eb Mon Sep 17 00:00:00 2001 From: Brian Clifford Date: Thu, 13 Jun 2019 10:23:01 +0100 Subject: [PATCH] Upgrade to Metro 1.6.5 Our main software has a dependency on Metro (which we upgraded to 1.6.5), however a standalone editor we have also depends on Metro and Gemini, so we upgraded Metro to the Metro 1.6.5, seems to work without any side effects. - Brian --- src/Gemini/Gemini.csproj | 1037 ++++++++++++++++++------------------ src/Gemini/packages.config | 19 +- 2 files changed, 529 insertions(+), 527 deletions(-) diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj index 2a4fc08f..eefef2d8 100644 --- a/src/Gemini/Gemini.csproj +++ b/src/Gemini/Gemini.csproj @@ -1,525 +1,526 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {13DBFC87-C152-4A86-94B0-D9944BEEF647} - Library - Properties - Gemini - Gemini - v4.5 - 512 - ..\ - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll - True - - - ..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll - True - - - ..\packages\Gu.Localization.6.1.0.0\lib\net45\Gu.Localization.dll - True - - - ..\packages\Gu.Wpf.Localization.6.1.0.0\lib\net45\Gu.Wpf.Localization.dll - True - - - ..\packages\MahApps.Metro.1.2.4.0\lib\net45\MahApps.Metro.dll - True - - - - - - - - - ..\packages\MahApps.Metro.1.2.4.0\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - True - - - ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll - True - - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MainMenuSettingsView.xaml - - - - - - - - - SettingsView.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MainMenuView.xaml - - - - - - - - - - - - - - - - - - - - - ShellView.xaml - - - - - StatusBarView.xaml - - - - ToolBarsView.xaml - - - - - - - - - - - - - - - ToolboxView.xaml - - - - - - - - - - - - - - - - - HistoryView.xaml - - - - MainWindowView.xaml - - - - - Resources.de.resx - True - True - - - True - True - Settings.settings - - - True - True - Resources.resx - - - - - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - - ResXFileCodeGenerator - Resources.de.Designer.cs - Designer - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - - - - - - - - - - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {13DBFC87-C152-4A86-94B0-D9944BEEF647} + Library + Properties + Gemini + Gemini + v4.5 + 512 + ..\ + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + ..\packages\Caliburn.Micro.Core.2.0.2\lib\net45\Caliburn.Micro.dll + True + + + ..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll + True + + + ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + + + ..\packages\Gu.Localization.6.1.0.0\lib\net45\Gu.Localization.dll + True + + + ..\packages\Gu.Wpf.Localization.6.1.0.0\lib\net45\Gu.Wpf.Localization.dll + True + + + ..\packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll + + + + + + + + + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll + + + + + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.dll + True + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + True + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + True + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + True + + + ..\packages\Xceed.Wpf.AvalonDock.Themes.VS2013.2.9.0.1\lib\net40-client\Xceed.Wpf.AvalonDock.Themes.VS2013.dll + True + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.DataGrid.dll + True + + + ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MainMenuSettingsView.xaml + + + + + + + + + SettingsView.xaml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MainMenuView.xaml + + + + + + + + + + + + + + + + + + + + + ShellView.xaml + + + + + StatusBarView.xaml + + + + ToolBarsView.xaml + + + + + + + + + + + + + + + ToolboxView.xaml + + + + + + + + + + + + + + + + + HistoryView.xaml + + + + MainWindowView.xaml + + + + + Resources.de.resx + True + True + + + True + True + Settings.settings + + + True + True + Resources.resx + + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + ResXFileCodeGenerator + Resources.de.Designer.cs + Designer + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + + + + + + + + + + + + + + + + --> \ No newline at end of file diff --git a/src/Gemini/packages.config b/src/Gemini/packages.config index 91ca78ce..b89341aa 100644 --- a/src/Gemini/packages.config +++ b/src/Gemini/packages.config @@ -1,10 +1,11 @@ - - - - - - - - - + + + + + + + + + + \ No newline at end of file