From 7036df995adda7f3e02f61e0bc07672496239063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Tue, 23 Oct 2018 16:13:56 +0200 Subject: [PATCH] Updated .NET to 4.6.1 Added Markdig --- DerpingDrivers/App.config | 6 +-- DerpingDrivers/DerpingDrivers.csproj | 14 +++++- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Properties/Settings.Designer.cs | 22 ++++------ DerpingDrivers/packages.config | 10 +++-- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/DerpingDrivers/App.config b/DerpingDrivers/App.config index 9c05822..bae5d6d 100644 --- a/DerpingDrivers/App.config +++ b/DerpingDrivers/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/DerpingDrivers/DerpingDrivers.csproj b/DerpingDrivers/DerpingDrivers.csproj index e7065dd..aeb3348 100644 --- a/DerpingDrivers/DerpingDrivers.csproj +++ b/DerpingDrivers/DerpingDrivers.csproj @@ -9,7 +9,7 @@ WinExe DerpingDrivers DerpingDrivers - v4.5.1 + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -17,6 +17,7 @@ true + AnyCPU @@ -44,8 +45,17 @@ ..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + + ..\packages\Costura.Fody.3.1.6\lib\net46\Costura.dll + - ..\packages\MahApps.Metro.1.6.5\lib\net45\MahApps.Metro.dll + ..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll + + + ..\packages\Markdig.0.15.4\lib\net40\Markdig.dll + + + ..\packages\Markdig.Wpf.0.2.5\lib\net452\Markdig.Wpf.dll diff --git a/DerpingDrivers/Properties/Resources.Designer.cs b/DerpingDrivers/Properties/Resources.Designer.cs index c61ea83..da6a21a 100644 --- a/DerpingDrivers/Properties/Resources.Designer.cs +++ b/DerpingDrivers/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace DerpingDrivers.Properties -{ - - +namespace DerpingDrivers.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace DerpingDrivers.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", "15.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("DerpingDrivers.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/DerpingDrivers/Properties/Settings.Designer.cs b/DerpingDrivers/Properties/Settings.Designer.cs index 79dc2bc..05c4c4d 100644 --- a/DerpingDrivers/Properties/Settings.Designer.cs +++ b/DerpingDrivers/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace DerpingDrivers.Properties -{ - - +namespace DerpingDrivers.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", "15.8.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/DerpingDrivers/packages.config b/DerpingDrivers/packages.config index 3159a5b..ee2ba38 100644 --- a/DerpingDrivers/packages.config +++ b/DerpingDrivers/packages.config @@ -1,7 +1,9 @@  - - - - + + + + + + \ No newline at end of file