Installer - Update VCRedistVersion to VS 2019 14.21.27702

dokan-dev · Jul 7, 2019 · 54d6a4a · 54d6a4a
1 parent 9ba0bec
commit 54d6a4a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/dokan_wix/Bootstrapper/Bootstrapper.wixproj b/dokan_wix/Bootstrapper/Bootstrapper.wixproj
@@ -59,11 +59,11 @@
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
     <PreBuildEvent>cd /d "$(ProjectDir)"
-if NOT exist Redist\VCRedist_2017\vc_redist.x86.exe (
+if NOT exist Redist\vcredist_2019\vc_redist.x86.exe (
 if NOT exist Redist\ mkdir Redist
-if NOT exist Redist\VCRedist_2017\ mkdir Redist\VCRedist_2017\
-powershell -command "wget https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe -OutFile Redist\VCRedist_2017\VC_redist.x64.exe"
-powershell -command "wget https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe -OutFile Redist\VCRedist_2017\VC_redist.x86.exe"
+if NOT exist Redist\vcredist_2019\ mkdir Redist\vcredist_2019\
+powershell -command "wget https://download.visualstudio.microsoft.com/download/pr/9e04d214-5a9d-4515-9960-3d71398d98c3/1e1e62ab57bbb4bf5199e8ce88f040be/vc_redist.x64.exe -OutFile Redist\vcredist_2019\VC_redist.x64.exe"
+powershell -command "wget https://download.visualstudio.microsoft.com/download/pr/c8edbb87-c7ec-4500-a461-71e8912d25e9/99ba493d660597490cbb8b3211d2cae4/vc_redist.x86.exe -OutFile Redist\vcredist_2019\VC_redist.x86.exe"
 )
   </PreBuildEvent>
   </PropertyGroup>

diff --git a/dokan_wix/Bootstrapper/Bundle.wxs b/dokan_wix/Bootstrapper/Bundle.wxs
@@ -51,36 +51,36 @@
                      Result="version"
                        />
 
-    <util:RegistrySearch Id="vcredist_2017_x86_check" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum" Value="Install" Variable="vcredist_2017_x86_installed" Win64="no"/>
-    <util:RegistrySearch Id="vcredist_2017_x86_versioncheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14" Value="Version" Variable="vcredist_2017_x86_version" Result="exists" Win64="no"/>
-    <util:RegistrySearch Id="vcredist_2017_x86_versionnumbercheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14" Value="Version" Variable="vcredist_2017_x86_versionnumber" Result="value" Win64="no"/>
+    <util:RegistrySearch Id="vcredist_2019_x86_check" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum" Value="Install" Variable="vcredist_2019_x86_installed" Win64="no"/>
+    <util:RegistrySearch Id="vcredist_2019_x86_versioncheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14" Value="Version" Variable="vcredist_2019_x86_version" Result="exists" Win64="no"/>
+    <util:RegistrySearch Id="vcredist_2019_x86_versionnumbercheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14" Value="Version" Variable="vcredist_2019_x86_versionnumber" Result="value" Win64="no"/>
 
-    <util:RegistrySearch Id="vcredist_2017_x64_check" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum" Value="Install" Variable="vcredist_2017_x64_installed" Win64="yes"/>
-    <util:RegistrySearch Id="vcredist_2017_x64_versioncheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" Value="Version" Variable="vcredist_2017_x64_version" Result="exists" Win64="yes"/>
-    <util:RegistrySearch Id="vcredist_2017_x64_versionnumbercheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" Value="Version" Variable="vcredist_2017_x64_versionnumber" Result="value" Win64="yes"/>
+    <util:RegistrySearch Id="vcredist_2019_x64_check" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum" Value="Install" Variable="vcredist_2019_x64_installed" Win64="yes"/>
+    <util:RegistrySearch Id="vcredist_2019_x64_versioncheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" Value="Version" Variable="vcredist_2019_x64_version" Result="exists" Win64="yes"/>
+    <util:RegistrySearch Id="vcredist_2019_x64_versionnumbercheck" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" Value="Version" Variable="vcredist_2019_x64_versionnumber" Result="value" Win64="yes"/>
 
     <bal:Condition Message="Installation failed because your version of Windows is not supported. Dokan requires Windows 7 SP1 or newer."><![CDATA[Installed OR VersionNT > v6.1 OR (VersionNT = v6.1 AND ServicePackLevel >= 1)]]></bal:Condition>
 
     <Chain>
 
-      <ExePackage Id="vcredist_2017_x86.exe"
+      <ExePackage Id="vcredist_2019_x86.exe"
                   Name="vc_redist.x86.exe"
                   InstallCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
                   RepairCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
                   UninstallCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
                   Protocol="netfx4"
                   Compressed="$(var.Compressed)"
                   Permanent="yes"
-                  DetectCondition="vcredist_2017_x86_installed AND vcredist_2017_x86_version AND vcredist_2017_x86_versionnumber &gt;= v$(var.VCRedistVersion)"
+                  DetectCondition="vcredist_2019_x86_installed AND vcredist_2019_x86_version AND vcredist_2019_x86_versionnumber &gt;= v$(var.VCRedistVersion)"
                   PerMachine="yes"
                   Vital="yes"
                   Cache="no"
                   SuppressSignatureVerification="yes"
-                  SourceFile="Redist\vcredist_2017\vc_redist.x86.exe"
-                  DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe"
+                  SourceFile="Redist\vcredist_2019\vc_redist.x86.exe"
+                  DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/c8edbb87-c7ec-4500-a461-71e8912d25e9/99ba493d660597490cbb8b3211d2cae4/vc_redist.x86.exe"
       />
 
-      <ExePackage Id="vcredist_2017_x64.exe"
+      <ExePackage Id="vcredist_2019_x64.exe"
                   Name="vc_redist.x64.exe"
                   InstallCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
                   RepairCommand="/norestart /q /chainingpackage ADMINDEPLOYMENT"
@@ -89,13 +89,13 @@
                   Compressed="$(var.Compressed)"
                   Permanent="yes"
                   InstallCondition="VersionNT64"
-                  DetectCondition="vcredist_2017_x64_installed AND vcredist_2017_x64_version AND vcredist_2017_x64_versionnumber &gt;= v$(var.VCRedistVersion)"
+                  DetectCondition="vcredist_2019_x64_installed AND vcredist_2019_x64_version AND vcredist_2019_x64_versionnumber &gt;= v$(var.VCRedistVersion)"
                   PerMachine="yes"
                   Vital="yes"
                   Cache="yes"
                   SuppressSignatureVerification="yes"
-                  SourceFile="Redist\vcredist_2017\vc_redist.x64.exe"
-                  DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe"
+                  SourceFile="Redist\vcredist_2019\vc_redist.x64.exe"
+                  DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/9e04d214-5a9d-4515-9960-3d71398d98c3/1e1e62ab57bbb4bf5199e8ce88f040be/vc_redist.x64.exe"
                   />
 
       <MsiPackage SourceFile="..\bin\x86\$(var.Configuration)\Dokan_x86.msi"

diff --git a/dokan_wix/Dokan_x64.wxs b/dokan_wix/Dokan_x64.wxs
@@ -127,8 +127,8 @@
     <Condition Message="Installation failed because the 64-bit version of Dokan cannot be installed on a 32-bit version of Windows."><![CDATA[Installed OR VersionNT64]]></Condition>
     <Condition Message="Installation failed because your version of Windows is too old. Dokan requires Windows 7 SP1 or newer."><![CDATA[Installed OR VersionNT > 601 OR (VersionNT = 601 AND ServicePackLevel >= 1)]]></Condition>
     <Condition Message="Installation failed because Microsoft patch KB3033929 is not installed. A reboot is needed between the installation of said patch and the installation of [ProductName]. https://support.microsoft.com/en-us/kb/3033929"><![CDATA[Installed OR VersionNT > 601 OR (VersionNT = 601 AND (WIN7KB3033929GDRINSTALLED OR WIN7KB3033929LDRINSTALLED))]]></Condition>
-    <Condition Message="Installation failed because the VC++ 2017 x64 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX64 AND VCREDISTINSTALLEDX64 >= "$(var.VCRedistVersion)")]]></Condition>
-    <Condition Message="Installation failed because the VC++ 2017 x86 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX86 AND VCREDISTINSTALLEDX86 >= "$(var.VCRedistVersion)")]]></Condition>
+    <Condition Message="Installation failed because the VC++ 2019 x64 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX64 AND VCREDISTINSTALLEDX64 >= "$(var.VCRedistVersion)")]]></Condition>
+    <Condition Message="Installation failed because the VC++ 2019 x86 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX86 AND VCREDISTINSTALLEDX86 >= "$(var.VCRedistVersion)")]]></Condition>
 
     <Binary Id="SetupCA2" SourceFile="WiXCA\bin\$(var.Configuration)\WiXCA.dll"/>
 

diff --git a/dokan_wix/Dokan_x86.wxs b/dokan_wix/Dokan_x86.wxs
@@ -116,7 +116,7 @@
     <Condition Message="Installation failed because the 32-bit version of Dokan cannot be installed on a 64-bit version of Windows."><![CDATA[Installed OR NOT VersionNT64]]></Condition>
     <Condition Message="Installation failed because your version of Windows is too old. Dokan requires Windows 7 SP1 or newer."><![CDATA[Installed OR VersionNT > 601 OR (VersionNT = 601 AND ServicePackLevel >= 1)]]></Condition>
     <Condition Message="Installation failed because Microsoft patch KB3033929 is not installed. A reboot is needed between the installation of said patch and the installation of [ProductName]. https://support.microsoft.com/en-us/kb/3033929"><![CDATA[Installed OR VersionNT > 601 OR (VersionNT = 601 AND (WIN7KB3033929GDRINSTALLED OR WIN7KB3033929LDRINSTALLED))]]></Condition>
-    <Condition Message="Installation failed because the VC++ 2017 x86 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX86 AND VCREDISTINSTALLEDX86 >= "$(var.VCRedistVersion)")]]></Condition>
+    <Condition Message="Installation failed because the VC++ 2019 x86 runtime minimum version $(var.VCRedistVersion) is not installed. You can download it here: https://www.visualstudio.com/downloads/#other"><![CDATA[Installed OR (VCREDISTINSTALLEDX86 AND VCREDISTINSTALLEDX86 >= "$(var.VCRedistVersion)")]]></Condition>
 
     <Binary Id="SetupCA2" SourceFile="WiXCA\bin\$(var.Configuration)\WiXCA.dll"/>
 

diff --git a/dokan_wix/version.xml b/dokan_wix/version.xml
@@ -16,5 +16,5 @@
 <?define InstallerVersion="500" ?>
 <?define Compressed="yes" ?>
 <?define BuildCygwin="true" ?>
-<?define VCRedistVersion="14.11.25325" ?>
+<?define VCRedistVersion="14.21.27702" ?>
 </Include>