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

This commit is contained in:
Steve Dower 2023-10-09 12:17:42 +01:00 committed by GitHub
parent ea39c877c0
commit 12cc6792d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -0,0 +1,2 @@
Allows overriding the source of VC redistributables so that releases can be
guaranteed to never downgrade between updates.

View File

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