From 2a4fe3852671dad58a5a21ec0cc1b086724fb14a Mon Sep 17 00:00:00 2001
From: Davis John <davisj@microsoft.com>
Date: Sat, 22 Jan 2022 14:34:21 +0530
Subject: [PATCH 1/2] Enforce TLS 1.2 in code

---
 Mail2Bug/App.config | 1 +
 Mail2Bug/Main.cs    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/Mail2Bug/App.config b/Mail2Bug/App.config
index d04aad8..aa85510 100644
--- a/Mail2Bug/App.config
+++ b/Mail2Bug/App.config
@@ -13,6 +13,7 @@
     <add key="log4net.Config.Watch" value="True" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
     <add key="Microsoft.ServiceBus.ConnectionString" value="" />
+    <add key="EnforceTls12" value="true" />
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
diff --git a/Mail2Bug/Main.cs b/Mail2Bug/Main.cs
index f2640af..d9fc099 100644
--- a/Mail2Bug/Main.cs
+++ b/Mail2Bug/Main.cs
@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using log4net;
@@ -30,6 +31,12 @@ public static void Main(string[] args) // string[] args
 
             try
             {
+                // Enforce TLS 1.2
+                if (ReadBoolFromAppConfig("EnforceTls12", false))
+                {
+                    ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+                }
+
                 string configPath = ConfigurationManager.AppSettings["ConfigPath"];
                 string configsFilePattern = ConfigurationManager.AppSettings["ConfigFilePattern"];
 

From 305002d15c31f63842f818d37bc7e6e5aa6367f3 Mon Sep 17 00:00:00 2001
From: Davis John <davisj@microsoft.com>
Date: Sat, 22 Jan 2022 05:22:50 +0000
Subject: [PATCH 2/2] Merged PR 6387: Update supportedRuntime to 4.5 to see if
 it moves to TLS 1.2.

Update supportedRuntime to 4.5 to see if it moves to TLS 1.2.

Cherry-picked from commit `01cffa42`.
---
 Mail2Bug/App.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mail2Bug/App.config b/Mail2Bug/App.config
index aa85510..375f9cf 100644
--- a/Mail2Bug/App.config
+++ b/Mail2Bug/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
   <appSettings>
     <add key="Iterations" value="200" />