From 34838562a3d3744a9d81264828be72444cc68ad9 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 23 May 2014 17:56:27 +0300 Subject: [PATCH] Using .NET Framework 4.0 --- DNSChanger/DNSChanger.csproj | 5 ++- DNSChanger/Properties/Resources.Designer.cs | 44 ++++++++----------- DNSChanger/Properties/Settings.Designer.cs | 24 +++++----- DNSChanger/app.config | 3 ++ .../GreenshotImageEditor.csproj | 2 +- HelpersLib/HelpersLib.csproj | 9 ++-- HelpersLib/packages.config | 4 +- HistoryLib/HistoryLib.csproj | 2 +- ImageEffectsLib/ImageEffectsLib.csproj | 4 +- ImageEffectsLib/packages.config | 2 +- IndexerLib/IndexerLib.csproj | 5 ++- IndexerLib/Properties/Resources.Designer.cs | 11 ++--- IndexerLib/packages.config | 2 +- .../Properties/Resources.Designer.cs | 2 +- ScreenCaptureLib/ScreenCaptureLib.csproj | 6 +-- ScreenCaptureLib/packages.config | 1 - ShareX/ShareX.csproj | 5 ++- ShareX/app.config | 3 ++ ShareX/packages.config | 2 +- ShareXPortable/ShareXPortable.csproj | 4 +- ShareXPortable/app.config | 3 ++ UploadersLib/Properties/Resources.Designer.cs | 24 +++++----- UploadersLib/UploadersLib.csproj | 6 +-- UploadersLib/packages.config | 4 +- 24 files changed, 88 insertions(+), 89 deletions(-) create mode 100644 DNSChanger/app.config create mode 100644 ShareX/app.config create mode 100644 ShareXPortable/app.config diff --git a/DNSChanger/DNSChanger.csproj b/DNSChanger/DNSChanger.csproj index 6f5822950..5ee4c1c49 100644 --- a/DNSChanger/DNSChanger.csproj +++ b/DNSChanger/DNSChanger.csproj @@ -9,8 +9,9 @@ Properties DNSChanger DNSChanger - v3.5 + v4.0 512 + AnyCPU @@ -65,7 +66,9 @@ True Resources.resx + True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/DNSChanger/Properties/Resources.Designer.cs b/DNSChanger/Properties/Resources.Designer.cs index 8fdc8a078..8deba7e95 100644 --- a/DNSChanger/Properties/Resources.Designer.cs +++ b/DNSChanger/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34011 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace DNSChanger.Properties -{ - - +namespace DNSChanger.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,48 +22,40 @@ namespace DNSChanger.Properties [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.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("DNSChanger.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/DNSChanger/Properties/Settings.Designer.cs b/DNSChanger/Properties/Settings.Designer.cs index c8556571c..38381865a 100644 --- a/DNSChanger/Properties/Settings.Designer.cs +++ b/DNSChanger/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34011 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace DNSChanger.Properties -{ - - +namespace DNSChanger.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", "12.0.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/DNSChanger/app.config b/DNSChanger/app.config new file mode 100644 index 000000000..fcd0c9373 --- /dev/null +++ b/DNSChanger/app.config @@ -0,0 +1,3 @@ + + + diff --git a/GreenshotImageEditor/GreenshotImageEditor.csproj b/GreenshotImageEditor/GreenshotImageEditor.csproj index 3abff0335..a148360d4 100644 --- a/GreenshotImageEditor/GreenshotImageEditor.csproj +++ b/GreenshotImageEditor/GreenshotImageEditor.csproj @@ -12,7 +12,7 @@ False 4 false - v3.5 + v4.0 diff --git a/HelpersLib/HelpersLib.csproj b/HelpersLib/HelpersLib.csproj index 0461b14a3..a3a49d427 100644 --- a/HelpersLib/HelpersLib.csproj +++ b/HelpersLib/HelpersLib.csproj @@ -10,7 +10,7 @@ Properties HelpersLib HelpersLib - v3.5 + v4.0 512 @@ -51,12 +51,13 @@ Off - - ..\packages\QrCode.Net.0.4.0.0\lib\net35\Gma.QrCodeNet.Encoding.dll + + False + ..\packages\QrCode.Net.0.4.0.0\lib\net40\Gma.QrCodeNet.Encoding.dll False - ..\packages\Newtonsoft.Json.6.0.3\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll ..\Lib\Starksoft.Net.Proxy.dll diff --git a/HelpersLib/packages.config b/HelpersLib/packages.config index dffc5bf66..0b68f5fb8 100644 --- a/HelpersLib/packages.config +++ b/HelpersLib/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/HistoryLib/HistoryLib.csproj b/HistoryLib/HistoryLib.csproj index cc442ed1e..0fc59c384 100644 --- a/HistoryLib/HistoryLib.csproj +++ b/HistoryLib/HistoryLib.csproj @@ -10,7 +10,7 @@ Properties HistoryLib HistoryLib - v3.5 + v4.0 512 ..\ diff --git a/ImageEffectsLib/ImageEffectsLib.csproj b/ImageEffectsLib/ImageEffectsLib.csproj index a5c28e6fa..2588e9155 100644 --- a/ImageEffectsLib/ImageEffectsLib.csproj +++ b/ImageEffectsLib/ImageEffectsLib.csproj @@ -10,7 +10,7 @@ Properties ImageEffectsLib ImageEffectsLib - v3.5 + v4.0 512 @@ -61,7 +61,7 @@ False - ..\packages\Newtonsoft.Json.6.0.3\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll diff --git a/ImageEffectsLib/packages.config b/ImageEffectsLib/packages.config index a02969b14..12fef5735 100644 --- a/ImageEffectsLib/packages.config +++ b/ImageEffectsLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/IndexerLib/IndexerLib.csproj b/IndexerLib/IndexerLib.csproj index 9c5318f28..42df17af4 100644 --- a/IndexerLib/IndexerLib.csproj +++ b/IndexerLib/IndexerLib.csproj @@ -9,10 +9,11 @@ Properties IndexerLib IndexerLib - v3.5 + v4.0 512 ..\ true + true @@ -34,7 +35,7 @@ False - ..\packages\Newtonsoft.Json.6.0.3\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll diff --git a/IndexerLib/Properties/Resources.Designer.cs b/IndexerLib/Properties/Resources.Designer.cs index 51689a595..ed1202b72 100644 --- a/IndexerLib/Properties/Resources.Designer.cs +++ b/IndexerLib/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18047 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,6 +9,9 @@ //------------------------------------------------------------------------------ namespace IndexerLib.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -83,9 +86,6 @@ internal static string doctype_xhtml { /// color: #0066FF; ///} /// - ///a:hover, a:active { - ///} - /// ///ul { /// margin: 0px 0px 10px 0px; /// padding-left: 30px; @@ -98,7 +98,8 @@ internal static string doctype_xhtml { /// padding: 4px 0px 4px 10px; /// margin: 0px 10px -10px 10px; /// color: #FFFFFF; - /// font-family: Arial, Helv [rest of string was truncated]";. + /// font-family: Arial, Helvetica, sans-serif; + /// fo [rest of string was truncated]";. /// internal static string IndexerDefault { get { diff --git a/IndexerLib/packages.config b/IndexerLib/packages.config index a02969b14..12fef5735 100644 --- a/IndexerLib/packages.config +++ b/IndexerLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ScreenCaptureLib/Properties/Resources.Designer.cs b/ScreenCaptureLib/Properties/Resources.Designer.cs index 326b6879f..96fbcef08 100644 --- a/ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ScreenCaptureLib/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34003 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/ScreenCaptureLib/ScreenCaptureLib.csproj b/ScreenCaptureLib/ScreenCaptureLib.csproj index ea41d408a..346c0b603 100644 --- a/ScreenCaptureLib/ScreenCaptureLib.csproj +++ b/ScreenCaptureLib/ScreenCaptureLib.csproj @@ -10,7 +10,7 @@ Properties ScreenCaptureLib ScreenCaptureLib - v3.5 + v4.0 512 @@ -47,10 +47,6 @@ - - False - ..\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll - diff --git a/ScreenCaptureLib/packages.config b/ScreenCaptureLib/packages.config index 88008ecbd..6b16044aa 100644 --- a/ScreenCaptureLib/packages.config +++ b/ScreenCaptureLib/packages.config @@ -1,5 +1,4 @@  - \ No newline at end of file diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index da86effde..1b29a75cd 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -10,7 +10,7 @@ Properties ShareX ShareX - v3.5 + v4.0 512 ShareX_Icon.ico @@ -72,7 +72,7 @@ False - ..\packages\Newtonsoft.Json.6.0.3\lib\net35\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll @@ -349,6 +349,7 @@ + Designer diff --git a/ShareX/app.config b/ShareX/app.config new file mode 100644 index 000000000..fcd0c9373 --- /dev/null +++ b/ShareX/app.config @@ -0,0 +1,3 @@ + + + diff --git a/ShareX/packages.config b/ShareX/packages.config index 70b1d8080..e3cc6d366 100644 --- a/ShareX/packages.config +++ b/ShareX/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/ShareXPortable/ShareXPortable.csproj b/ShareXPortable/ShareXPortable.csproj index c4eff04c2..fd6ac15a7 100644 --- a/ShareXPortable/ShareXPortable.csproj +++ b/ShareXPortable/ShareXPortable.csproj @@ -9,8 +9,9 @@ Properties ShareXPortable ShareXPortable - v3.5 + v4.0 512 + AnyCPU @@ -43,6 +44,7 @@ PreserveNewest +