diff --git a/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj b/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj index 328465c60..887fdf083 100644 --- a/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj +++ b/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj @@ -8,7 +8,7 @@ WinExe ShareX.DesktopBridgeHelper ShareX_DesktopBridgeHelper - v4.6.1 + v4.6.2 512 true @@ -45,5 +45,8 @@ + + + \ No newline at end of file diff --git a/ShareX.DesktopBridgeHelper/app.config b/ShareX.DesktopBridgeHelper/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/ShareX.DesktopBridgeHelper/app.config @@ -0,0 +1,3 @@ + + + diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index c956864c7..5836d6a5e 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -78,7 +78,7 @@ internal class Resources { "me_extension_", resourceCulture); } } - + /// /// Looks up a localized string similar to abandoned ///able @@ -377,7 +377,7 @@ internal class Resources { return ResourceManager.GetString("AmazonS3StorageClass_STANDARD_IA", resourceCulture); } } - + /// /// Looks up a localized string similar to aardvark ///aardwolf diff --git a/ShareX.HelpersLib/ShareX.HelpersLib.csproj b/ShareX.HelpersLib/ShareX.HelpersLib.csproj index 2b095736a..c5cf36916 100644 --- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj +++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX.HelpersLib ShareX.HelpersLib - v4.0 + v4.6.2 512 @@ -58,6 +58,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -68,6 +69,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -79,10 +81,11 @@ Off prompt MinimumRecommendedRules.ruleset + false - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ShareX.HelpersLib/packages.config b/ShareX.HelpersLib/packages.config index 03c709252..3d1d4fc14 100644 --- a/ShareX.HelpersLib/packages.config +++ b/ShareX.HelpersLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs index 93342a4d8..c4e80e17e 100644 --- a/ShareX.HistoryLib/Properties/Resources.Designer.cs +++ b/ShareX.HistoryLib/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ShareX.HistoryLib.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 { diff --git a/ShareX.HistoryLib/ShareX.HistoryLib.csproj b/ShareX.HistoryLib/ShareX.HistoryLib.csproj index 848920208..4b944d930 100644 --- a/ShareX.HistoryLib/ShareX.HistoryLib.csproj +++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX.HistoryLib ShareX.HistoryLib - v4.0 + v4.6.2 512 @@ -51,6 +51,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -60,6 +61,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -70,11 +72,11 @@ Off prompt MinimumRecommendedRules.ruleset + false ..\packages\ImageListView.11.0.4.0\lib\net35\ImageListView.dll - True diff --git a/ShareX.HistoryLib/packages.config b/ShareX.HistoryLib/packages.config index 2a089e8c5..602849bfd 100644 --- a/ShareX.HistoryLib/packages.config +++ b/ShareX.HistoryLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.ImageEffectsLib/Properties/Resources.Designer.cs b/ShareX.ImageEffectsLib/Properties/Resources.Designer.cs index fd8bc3191..ef998d0d8 100644 --- a/ShareX.ImageEffectsLib/Properties/Resources.Designer.cs +++ b/ShareX.ImageEffectsLib/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace ShareX.ImageEffectsLib.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 { diff --git a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj index e391824c0..d669e325d 100644 --- a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj +++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX.ImageEffectsLib ShareX.ImageEffectsLib - v4.0 + v4.6.2 512 @@ -67,6 +67,7 @@ Off prompt AllRules.ruleset + false bin\WindowsStore\ @@ -77,6 +78,7 @@ Off prompt AllRules.ruleset + false true @@ -87,10 +89,11 @@ AnyCPU prompt AllRules.ruleset + false - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ShareX.ImageEffectsLib/packages.config b/ShareX.ImageEffectsLib/packages.config index 03c709252..3d1d4fc14 100644 --- a/ShareX.ImageEffectsLib/packages.config +++ b/ShareX.ImageEffectsLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.IndexerLib/Properties/Resources.Designer.cs b/ShareX.IndexerLib/Properties/Resources.Designer.cs index ad7b1ccbb..0c60fe1cd 100644 --- a/ShareX.IndexerLib/Properties/Resources.Designer.cs +++ b/ShareX.IndexerLib/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ShareX.IndexerLib.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 { diff --git a/ShareX.IndexerLib/ShareX.IndexerLib.csproj b/ShareX.IndexerLib/ShareX.IndexerLib.csproj index ebb1df60f..e06f2a7f5 100644 --- a/ShareX.IndexerLib/ShareX.IndexerLib.csproj +++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties ShareX.IndexerLib ShareX.IndexerLib - v4.0 + v4.6.2 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false none @@ -31,6 +32,7 @@ 4 Off false + false bin\Steam\ @@ -40,6 +42,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -49,6 +52,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -58,10 +62,11 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ShareX.IndexerLib/packages.config b/ShareX.IndexerLib/packages.config index 03c709252..3d1d4fc14 100644 --- a/ShareX.IndexerLib/packages.config +++ b/ShareX.IndexerLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.MediaLib/Properties/Resources.Designer.cs b/ShareX.MediaLib/Properties/Resources.Designer.cs index 01673b965..e7fb3ec23 100644 --- a/ShareX.MediaLib/Properties/Resources.Designer.cs +++ b/ShareX.MediaLib/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ShareX.MediaLib.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 { diff --git a/ShareX.MediaLib/ShareX.MediaLib.csproj b/ShareX.MediaLib/ShareX.MediaLib.csproj index 7f6e673b0..943840a65 100644 --- a/ShareX.MediaLib/ShareX.MediaLib.csproj +++ b/ShareX.MediaLib/ShareX.MediaLib.csproj @@ -9,8 +9,9 @@ Properties ShareX.MediaLib ShareX.MediaLib - v4.0 + v4.6.2 512 + true @@ -21,6 +22,7 @@ prompt 4 Off + false none @@ -30,6 +32,7 @@ prompt 4 Off + false bin\Steam\ @@ -39,6 +42,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -48,6 +52,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -58,6 +63,7 @@ Off prompt MinimumRecommendedRules.ruleset + false diff --git a/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj b/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj index 3e8266a03..626044ba5 100644 --- a/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj +++ b/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj @@ -9,8 +9,9 @@ Properties ShareX.NativeMessagingHost ShareX_NativeMessagingHost - v4.0 + v4.6.2 512 + AnyCPU @@ -22,6 +23,7 @@ prompt 4 Off + false AnyCPU @@ -32,13 +34,14 @@ prompt 4 Off + false - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll @@ -59,6 +62,7 @@ + diff --git a/ShareX.NativeMessagingHost/app.config b/ShareX.NativeMessagingHost/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/ShareX.NativeMessagingHost/app.config @@ -0,0 +1,3 @@ + + + diff --git a/ShareX.NativeMessagingHost/packages.config b/ShareX.NativeMessagingHost/packages.config index 03c709252..3d1d4fc14 100644 --- a/ShareX.NativeMessagingHost/packages.config +++ b/ShareX.NativeMessagingHost/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index 050711a85..0bd088d0e 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX.ScreenCaptureLib ShareX.ScreenCaptureLib - v4.0 + v4.6.2 512 @@ -47,6 +47,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -56,6 +57,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -66,6 +68,7 @@ Off prompt MinimumRecommendedRules.ruleset + false @@ -241,8 +244,8 @@ - + diff --git a/ShareX.ScreenCaptureLib/packages.config b/ShareX.ScreenCaptureLib/packages.config index 2a089e8c5..602849bfd 100644 --- a/ShareX.ScreenCaptureLib/packages.config +++ b/ShareX.ScreenCaptureLib/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/ShareX.Setup/ShareX.Setup.csproj b/ShareX.Setup/ShareX.Setup.csproj index 879e940db..9da3accf6 100644 --- a/ShareX.Setup/ShareX.Setup.csproj +++ b/ShareX.Setup/ShareX.Setup.csproj @@ -9,7 +9,7 @@ Properties ShareX.Setup ShareX.Setup - v4.0 + v4.6.2 512 @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -32,6 +33,7 @@ prompt 4 Off + false bin\Steam\ @@ -41,6 +43,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -50,6 +53,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -59,6 +63,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false diff --git a/ShareX.Setup/app.config b/ShareX.Setup/app.config index 6c301d331..c76c89bb8 100644 --- a/ShareX.Setup/app.config +++ b/ShareX.Setup/app.config @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/ShareX.Steam/ShareX.Steam.csproj b/ShareX.Steam/ShareX.Steam.csproj index 5d350c949..b8ca92a5b 100644 --- a/ShareX.Steam/ShareX.Steam.csproj +++ b/ShareX.Steam/ShareX.Steam.csproj @@ -9,8 +9,9 @@ Properties ShareX.Steam ShareX_Launcher - v4.0 + v4.6.2 512 + x86 @@ -22,6 +23,7 @@ prompt 4 Off + false x86 @@ -32,6 +34,7 @@ prompt 4 Off + false ShareX_Icon.ico @@ -56,6 +59,7 @@ + PreserveNewest diff --git a/ShareX.Steam/app.config b/ShareX.Steam/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/ShareX.Steam/app.config @@ -0,0 +1,3 @@ + + + diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index 89448b565..bcdc73ff5 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX.UploadersLib ShareX.UploadersLib - v4.0 + v4.6.2 512 false @@ -74,6 +74,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -83,6 +84,7 @@ Off prompt MinimumRecommendedRules.ruleset + false true @@ -93,13 +95,14 @@ Off prompt MinimumRecommendedRules.ruleset + false - - ..\packages\MegaApiClient.1.6.1\lib\net40\MegaApiClient.dll + + ..\packages\MegaApiClient.1.6.2\lib\net46\MegaApiClient.dll - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll @@ -110,9 +113,23 @@ ..\packages\System.Net.FtpClient.1.0.5281.14359\lib\net40\System.Net.FtpClient.dll - True + + + ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + @@ -903,7 +920,6 @@ - @@ -911,6 +927,7 @@ + diff --git a/ShareX.UploadersLib/app.config b/ShareX.UploadersLib/app.config index 7b0b96da1..5ffa336cd 100644 --- a/ShareX.UploadersLib/app.config +++ b/ShareX.UploadersLib/app.config @@ -4,7 +4,11 @@ - + + + + + @@ -17,4 +21,4 @@ that is bundled with the nuget package under the tools folder. --> - \ No newline at end of file + diff --git a/ShareX.UploadersLib/packages.config b/ShareX.UploadersLib/packages.config index 3eb999929..a9b7ae0c4 100644 --- a/ShareX.UploadersLib/packages.config +++ b/ShareX.UploadersLib/packages.config @@ -1,7 +1,12 @@  - - - - + + + + + + + + + \ No newline at end of file diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index b0bb35312..eea7abbeb 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties ShareX ShareX - v4.0 + v4.6.2 512 ShareX_Icon.ico @@ -72,6 +72,7 @@ Off prompt MinimumRecommendedRules.ruleset + false bin\WindowsStore\ @@ -81,7 +82,7 @@ Off prompt MinimumRecommendedRules.ruleset - v4.6.1 + false true @@ -92,12 +93,12 @@ Off prompt MinimumRecommendedRules.ruleset - v4.6.1 + false - - ..\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll @@ -129,10 +130,10 @@ False - ..\packages\ZXing.Net.0.16.2\lib\net40\zxing.dll + ..\packages\ZXing.Net.0.16.2\lib\net461\zxing.dll - ..\packages\ZXing.Net.0.16.2\lib\net40\zxing.presentation.dll + ..\packages\ZXing.Net.0.16.2\lib\net461\zxing.presentation.dll diff --git a/ShareX/app.config b/ShareX/app.config index b0fe49694..1f9c64a30 100644 --- a/ShareX/app.config +++ b/ShareX/app.config @@ -1,14 +1,18 @@  - + - + + + + + @@ -25,4 +29,4 @@ that is bundled with the nuget package under the tools folder. --> - \ No newline at end of file + diff --git a/ShareX/packages.config b/ShareX/packages.config index 4875f2b99..cbc11e28c 100644 --- a/ShareX/packages.config +++ b/ShareX/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file