gh-110437: Allow overriding VCRuntimeDLL with a semicolon separated list of DLLs...

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 (file)
index 0000000..777b494
--- /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 9db400eebae3886940422cff4fe799e6e1c9ce05..b8d2d3d265543fc733d006048f9755f508136ae3 100644 (file)
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -233,7 +233,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>