diff --git a/HumanUI/HumanUI/HumanUI.csproj b/HumanUI/HumanUI/HumanUI.csproj index 551df6f..b16905e 100644 --- a/HumanUI/HumanUI/HumanUI.csproj +++ b/HumanUI/HumanUI/HumanUI.csproj @@ -1,5 +1,5 @@  - + Debug32 AnyCPU @@ -10,7 +10,7 @@ Properties HumanUI HumanUI - v4.5 + v4.5.2 512 false @@ -35,6 +35,9 @@ false + + ..\..\packages\ControlzEx.4.4.0\lib\net45\ControlzEx.dll + ..\..\packages\ModernUICharts.1.0.0\lib\De.TorstenMandelkow.MetroChart.dll @@ -50,48 +53,51 @@ ..\..\packages\HelixToolkit.Wpf.2015.1.715\lib\net45\HelixToolkit.Wpf.dll - - ..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + ..\..\packages\MahApps.Metro.2.4.9\lib\net452\MahApps.Metro.dll ..\..\addlPackages\Markdown.XAML\Markdown.Xaml.dll + + ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll + ..\..\packages\RhinoCommon.5.12.50810.13095\lib\net35\RhinoCommon.dll + + + + - - ..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll - True - - - ..\..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll - - ..\..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - ..\..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - ..\..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - - ..\..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.Toolkit.dll + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.Toolkit.dll diff --git a/HumanUI/HumanUI/Properties/Resources.Designer.cs b/HumanUI/HumanUI/Properties/Resources.Designer.cs index 3471d9f..a6051b2 100644 --- a/HumanUI/HumanUI/Properties/Resources.Designer.cs +++ b/HumanUI/HumanUI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace HumanUI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/HumanUI/HumanUI/app.config b/HumanUI/HumanUI/app.config index 9066d17..116b160 100644 --- a/HumanUI/HumanUI/app.config +++ b/HumanUI/HumanUI/app.config @@ -12,4 +12,4 @@ - + diff --git a/HumanUI/HumanUI/packages.config b/HumanUI/HumanUI/packages.config index 837be44..89e8e41 100644 --- a/HumanUI/HumanUI/packages.config +++ b/HumanUI/HumanUI/packages.config @@ -1,10 +1,12 @@  - + + - + + \ No newline at end of file diff --git a/HumanUIBaseApp/HumanUIBaseApp/HumanUIBaseApp.csproj b/HumanUIBaseApp/HumanUIBaseApp/HumanUIBaseApp.csproj index 3baca1c..018d8a0 100644 --- a/HumanUIBaseApp/HumanUIBaseApp/HumanUIBaseApp.csproj +++ b/HumanUIBaseApp/HumanUIBaseApp/HumanUIBaseApp.csproj @@ -9,11 +9,12 @@ Properties HumanUIBaseApp HumanUIBaseApp - v4.0 + v4.5.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 5841daa5 + AnyCPU @@ -24,6 +25,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -33,6 +35,7 @@ TRACE prompt 4 + false @@ -45,6 +48,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false bin\x64\Release\ @@ -54,8 +58,12 @@ x64 prompt MinimumRecommendedRules.ruleset + false + + ..\..\packages\ControlzEx.4.4.0\lib\net45\ControlzEx.dll + ..\..\packages\Grasshopper.0.9.76\lib\net35\GH_IO.dll @@ -66,18 +74,21 @@ ..\..\packages\HelixToolkit.2015.1.715\lib\portable-net4+sl4+wp71+win8\HelixToolkit.dll - - ..\..\packages\MahApps.Metro.1.5.0\lib\net40\MahApps.Metro.dll + + ..\..\packages\MahApps.Metro.2.4.9\lib\net452\MahApps.Metro.dll + + + ..\..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.19\lib\net45\Microsoft.Xaml.Behaviors.dll ..\..\packages\RhinoCommon.5.12.50810.13095\lib\net35\RhinoCommon.dll + + - - ..\..\packages\MahApps.Metro.1.5.0\lib\net40\System.Windows.Interactivity.dll - True - + + @@ -89,6 +100,21 @@ + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll + + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + + ..\..\packages\Extended.Wpf.Toolkit.4.2.0\lib\net40\Xceed.Wpf.Toolkit.dll + @@ -118,6 +144,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator diff --git a/HumanUIBaseApp/HumanUIBaseApp/Properties/Resources.Designer.cs b/HumanUIBaseApp/HumanUIBaseApp/Properties/Resources.Designer.cs index c0af046..00a9555 100644 --- a/HumanUIBaseApp/HumanUIBaseApp/Properties/Resources.Designer.cs +++ b/HumanUIBaseApp/HumanUIBaseApp/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace HumanUIBaseApp.Properties -{ - - +namespace HumanUIBaseApp.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace HumanUIBaseApp.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HumanUIBaseApp.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/HumanUIBaseApp/HumanUIBaseApp/Properties/Settings.Designer.cs b/HumanUIBaseApp/HumanUIBaseApp/Properties/Settings.Designer.cs index 2ac48eb..dea00ca 100644 --- a/HumanUIBaseApp/HumanUIBaseApp/Properties/Settings.Designer.cs +++ b/HumanUIBaseApp/HumanUIBaseApp/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace HumanUIBaseApp.Properties -{ - - +namespace HumanUIBaseApp.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/HumanUIBaseApp/HumanUIBaseApp/app.config b/HumanUIBaseApp/HumanUIBaseApp/app.config new file mode 100644 index 0000000..6c99b98 --- /dev/null +++ b/HumanUIBaseApp/HumanUIBaseApp/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/HumanUIBaseApp/HumanUIBaseApp/packages.config b/HumanUIBaseApp/HumanUIBaseApp/packages.config index 043c44b..aa95dfd 100644 --- a/HumanUIBaseApp/HumanUIBaseApp/packages.config +++ b/HumanUIBaseApp/HumanUIBaseApp/packages.config @@ -1,7 +1,10 @@  + + - + + \ No newline at end of file