From bbc834111eab7d2e7859f5db12a29548814675e9 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Mon, 9 Oct 2023 12:17:42 +0100
Subject: [PATCH] gh-110437: Allow overriding VCRuntimeDLL with a semicolon
 separated list of DLLs to bundle (GH-110470) (cherry picked from commit
 12cc6792d0ca1d0b72712d77c6efcb0aa0c7e7ba)

Co-authored-by: Steve Dower <steve.dower@python.org>
---
 .../Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst   | 2 ++
 PCbuild/pyproject.props                                      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst

diff --git a/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst b/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst
new file mode 100644
index 00000000000000..777b4942e183f5
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2023-10-06-14-20-14.gh-issue-110437.xpYy9q.rst
@@ -0,0 +1,2 @@
+Allows overriding the source of VC redistributables so that releases can be
+guaranteed to never downgrade between updates.
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index fd928cafd77aaa..056ab2b3b6643a 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -232,7 +232,10 @@ public override bool Execute() {
   </Target>
 
   <Target Name="FindVCRuntime" Returns="VCRuntimeDLL" DependsOnTargets="FindVCRedistDir">
-    <ItemGroup Condition="$(VCInstallDir) != ''">
+    <ItemGroup Condition="$(VCRuntimeDLL) != ''">
+      <VCRuntimeDLL Include="$(VCRuntimeDLL)" />
+    </ItemGroup>
+    <ItemGroup Condition="$(VCInstallDir) != '' and $(VCRuntimeDLL) == ''">
       <VCRuntimeDLL Include="$(VCRedistDir)\Microsoft.VC*.CRT\vcruntime*.dll" />
     </ItemGroup>