From 49d46a74736f30a7b857a78afa02494f8d18f2c4 Mon Sep 17 00:00:00 2001
From: irwir <irwir@users.noreply.github.com>
Date: Sat, 21 Sep 2019 16:16:34 +0300
Subject: [PATCH 1/2] Finalize fixing the issue #1430. The previous PRs had
 correct template project, but somehow it was not merged.

Signed-off-by: irwir <irwir@users.noreply.github.com>
---
 scripts/data_files/vs2010-main-template.vcxproj | 1 -
 visualc/VS2010/mbedTLS.vcxproj                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/scripts/data_files/vs2010-main-template.vcxproj b/scripts/data_files/vs2010-main-template.vcxproj
index bfc2400f6e01..daa42bc6c9b1 100644
--- a/scripts/data_files/vs2010-main-template.vcxproj
+++ b/scripts/data_files/vs2010-main-template.vcxproj
@@ -45,7 +45,6 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 45ae103b933e..fd6de42794e6 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -45,7 +45,6 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>Windows7.1SDK</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

From af81957abd7eef517b28acf91fae97548333fed7 Mon Sep 17 00:00:00 2001
From: irwir <irwir@users.noreply.github.com>
Date: Mon, 20 Apr 2020 13:22:40 +0300
Subject: [PATCH 2/2] Add changelog

Signed-off-by: irwir <irwir@users.noreply.github.com>
---
 ChangeLog.d/bugfix.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 ChangeLog.d/bugfix.txt

diff --git a/ChangeLog.d/bugfix.txt b/ChangeLog.d/bugfix.txt
new file mode 100644
index 000000000000..499fd40f2557
--- /dev/null
+++ b/ChangeLog.d/bugfix.txt
@@ -0,0 +1,4 @@
+Bugfix
+   * Fix the Visual Studio Release x64 build configuration for mbedtls itself.
+     Completes a previous fix in Mbed TLS 2.19 that only fixed the build for
+     the example programs. Reported in #1430 and fix contributed by irwir.
\ No newline at end of file