From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:42:04 +0000 (+0200)
Subject: [3.12] gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of... 
X-Git-Tag: v3.12.1~344
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13ad1219c96d22543999bfe91d196e6d956bfd21;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of DLLs to bundle (GH-110470)

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>
---

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 000000000000..777b4942e183
--- /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 fd928cafd77a..056ab2b3b664 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>