Skip to content

Commit 0719bf4

Browse files
committed
Microsoft Visual C++ Redistributable
- Extend check to Microsoft Visual C++ Redistributable for Visual Studio 2015 - 2019 - Fixes #409
1 parent e7ca6d4 commit 0719bf4

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

SimpleDnsCrypt/Config/Global.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ public static class Global
2525
public const string ApplicationUpdatePublicKey = "RWTSM+4BNNvkZPNkHgE88ETlhWa+0HDzU5CN8TvbyvmhVUcr6aQXfssV";
2626

2727
/// <summary>
28-
/// Microsoft Visual C++ Redistributable for Visual Studio 2017 (x86)
28+
/// Microsoft Visual C++ Redistributable for Visual Studio 2015 - 2019 (x86)
2929
/// </summary>
30-
public const string RedistributablePackage86 = "https://aka.ms/vs/15/release/VC_redist.x86.exe";
30+
public const string RedistributablePackage86 = "https://aka.ms/vs/16/release/VC_redist.x86.exe";
3131

3232
/// <summary>
33-
/// Microsoft Visual C++ Redistributable for Visual Studio 2017 (x64)
33+
/// Microsoft Visual C++ Redistributable for Visual Studio 2015 - 2019 (x64)
3434
/// </summary>
35-
public const string RedistributablePackage64 = "https://aka.ms/vs/15/release/VC_redist.x64.exe";
35+
public const string RedistributablePackage64 = "https://aka.ms/vs/16/release/VC_redist.x64.exe";
3636

3737
/// <summary>
3838
/// The folder where the dnscrypt-proxy lives in.

SimpleDnsCrypt/Helper/PrerequisiteHelper.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ public static bool IsRedistributablePackageInstalled()
2020
{
2121
if (Environment.Is64BitProcess)
2222
{
23+
//check for 2015 - 2019
24+
var parametersVc2015to2019x64 = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum", false);
25+
if (parametersVc2015to2019x64 == null) return false;
26+
var vc2015to2019x64Version = parametersVc2015to2019x64.GetValue("Version");
27+
if (((string)vc2015to2019x64Version).StartsWith("14"))
28+
{
29+
return true;
30+
}
31+
//check for 2017
2332
var paths2017X64 = new List<string>
2433
{
2534
@"Installer\Dependencies\,,amd64,14.0,bundle",
@@ -39,6 +48,15 @@ public static bool IsRedistributablePackageInstalled()
3948
}
4049
else
4150
{
51+
//check for 2015 - 2019
52+
var parametersVc2015to2019x86 = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum", false);
53+
if (parametersVc2015to2019x86 == null) return false;
54+
var vc2015to2019x86Version = parametersVc2015to2019x86.GetValue("Version");
55+
if (((string)vc2015to2019x86Version).StartsWith("14"))
56+
{
57+
return true;
58+
}
59+
//check for 2017
4260
var paths2017X86 = new List<string>
4361
{
4462
@"Installer\Dependencies\,,x86,14.0,bundle",

0 commit comments

Comments
 (0)