From b200ebc15f9b6d325065ce336f195cd97bd5fa35 Mon Sep 17 00:00:00 2001
From: Charles Milette <me@charlesmilette.net>
Date: Fri, 18 May 2018 15:56:38 -0400
Subject: [PATCH 1/3] Cleanup app.config files

---
 .../ShareX.UploadersLib.csproj                |  1 -
 ShareX.UploadersLib/app.config                | 24 -------------------
 ShareX/app.config                             | 13 ----------
 3 files changed, 38 deletions(-)
 delete mode 100644 ShareX.UploadersLib/app.config

diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
index d55082bff..e6d0f3bd3 100644
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -891,7 +891,6 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="APIKeys\jira_sharex.pfx" />
-    <None Include="app.config" />
     <None Include="Favicons\Yourls.ico" />
     <None Include="Favicons\Box.ico" />
     <None Include="Favicons\Bitly.ico" />
diff --git a/ShareX.UploadersLib/app.config b/ShareX.UploadersLib/app.config
deleted file mode 100644
index 6beeff626..000000000
--- a/ShareX.UploadersLib/app.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <appSettings>
-    <!--AWSProfileName is used to reference an account that has been registered with the SDK.
-If using AWS Toolkit for Visual Studio then this value is the same value shown in the AWS Explorer.
-It is also possible to register an account using the <solution-dir>/packages/AWSSDK-X.X.X.X/tools/account-management.ps1 PowerShell script
-that is bundled with the nuget package under the tools folder.
-
-		<add key="AWSProfileName" value="" />
--->
-  </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
\ No newline at end of file
diff --git a/ShareX/app.config b/ShareX/app.config
index 344e0510c..baa758f90 100644
--- a/ShareX/app.config
+++ b/ShareX/app.config
@@ -3,19 +3,6 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="Languages" />
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
   <uri>
     <idn enabled="All" />
     <iriParsing enabled="true" />

From 34850db99af2a69194bb2462835a4b6d000f9ca9 Mon Sep 17 00:00:00 2001
From: Charles Milette <me@charlesmilette.net>
Date: Fri, 18 May 2018 15:59:39 -0400
Subject: [PATCH 2/3] Auto generate binding redirects in main application

---
 ShareX/ShareX.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 2231a1077..1d0a99801 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -33,6 +33,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

From 4426d6db03384cf28acdabdb782682d5b0aaa634 Mon Sep 17 00:00:00 2001
From: Charles Milette <me@charlesmilette.net>
Date: Fri, 18 May 2018 16:08:49 -0400
Subject: [PATCH 3/3] Add back accidentally erased directive

---
 ShareX/app.config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ShareX/app.config b/ShareX/app.config
index baa758f90..eec7ccdae 100644
--- a/ShareX/app.config
+++ b/ShareX/app.config
@@ -3,6 +3,11 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="Languages" /> <!-- For localization files. Don't remove. -->
+    </assemblyBinding>
+  </runtime>
   <uri>
     <idn enabled="All" />
     <iriParsing enabled="true" />