From: Andrey Volk <andywolk@gmail.com>
Date: Fri, 29 Mar 2019 14:45:45 +0000 (+0400)
Subject: FS-11729: [Build-System] Fix Visual Studio 2017 15.9 Redist files detection.
X-Git-Tag: v1.8.6~1^2~83^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8aced2411687f677d8b317937e6497c1bce8677;p=thirdparty%2Ffreeswitch.git

FS-11729: [Build-System] Fix Visual Studio 2017 15.9 Redist files detection.
---

diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj
index cb65aa947c..bc80e21f7e 100644
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -928,7 +928,10 @@
     <CreateProperty Condition="$(FullVersion) != ''" Value="$(SolutionDir)$(UserFriendlyPlatform)\$(OutputName)-$(FullVersion)$(Revision)$(SnapshotName)-$(UserFriendlyPlatform)-$(Configuration).msi">
       <Output TaskParameter="Value" PropertyName="DestinationFileName" />
     </CreateProperty>
-    <CreateProperty Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Major).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Minor).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Bld)">
+    <CreateProperty Value="$(VCToolsRedistVersion)">
+      <Output TaskParameter="Value" PropertyName="VCLibVersion" />
+    </CreateProperty>
+    <CreateProperty Condition="'$(VCLibVersion)' == ''" Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Major).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Minor).$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64@Bld)">
       <Output TaskParameter="Value" PropertyName="VCLibVersion" />
     </CreateProperty>
     <CreateProperty Value="$(VSInstallDir)\VC\Redist\MSVC\$(VCLibVersion)\MergeModules\">