From 03b13e441c01db4e8c80af22c07a56e98127ea08 Mon Sep 17 00:00:00 2001 From: Samuel Tulach Date: Fri, 14 Aug 2020 20:09:41 +0200 Subject: [PATCH] downgrade to .NET 4.6 --- uploader/uploader/App.config | 6 +-- .../uploader/Properties/Resources.Designer.cs | 44 ++++++++----------- .../uploader/Properties/Settings.Designer.cs | 22 ++++------ uploader/uploader/uploader.csproj | 4 +- 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/uploader/uploader/App.config b/uploader/uploader/App.config index 56efbc7..2d2a12d 100644 --- a/uploader/uploader/App.config +++ b/uploader/uploader/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/uploader/uploader/Properties/Resources.Designer.cs b/uploader/uploader/Properties/Resources.Designer.cs index ace3e00..34bc47e 100644 --- a/uploader/uploader/Properties/Resources.Designer.cs +++ b/uploader/uploader/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace uploader.Properties -{ - - +namespace uploader.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace uploader.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("uploader.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/uploader/uploader/Properties/Settings.Designer.cs b/uploader/uploader/Properties/Settings.Designer.cs index 898e7f3..433878a 100644 --- a/uploader/uploader/Properties/Settings.Designer.cs +++ b/uploader/uploader/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace uploader.Properties -{ - - +namespace uploader.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.6.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/uploader/uploader/uploader.csproj b/uploader/uploader/uploader.csproj index 7f262fa..f92b4d5 100644 --- a/uploader/uploader/uploader.csproj +++ b/uploader/uploader/uploader.csproj @@ -8,10 +8,11 @@ WinExe uploader uploader - v4.7.2 + v4.6 512 true true + AnyCPU @@ -96,6 +97,7 @@ True Resources.resx + True SettingsForm.cs