From 59606dd9df17a97e8f8f703580b497118553c5f9 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Tue, 1 May 2018 14:20:55 +0200 Subject: [PATCH] Add .NET Framework 4.7.2 support. --- src/Setup/FxHelper.cpp | 4 ++++ src/Setup/FxHelper.h | 2 +- src/Setup/Setup.rc | Bin 10040 -> 10040 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Setup/FxHelper.cpp b/src/Setup/FxHelper.cpp index eb4ff9f1..eec3ee2d 100644 --- a/src/Setup/FxHelper.cpp +++ b/src/Setup/FxHelper.cpp @@ -12,6 +12,7 @@ static const int fx461ReleaseVersion = 394254; // Minimum version for .NET 4.6.1 static const int fx462ReleaseVersion = 394802; // Minimum version for .NET 4.6.2 static const int fx47ReleaseVersion = 460798; // Minimum version for .NET 4.7 static const int fx471ReleaseVersion = 461308; // Minimum version for .NET 4.7.1 +static const int fx472ReleaseVersion = 461808; // Minimum version for .NET 4.7.2 // According to https://msdn.microsoft.com/en-us/library/8z6watww%28v=vs.110%29.aspx, // to install .NET 4.5 we must be Vista SP2+, Windows 7 SP1+, or later. @@ -32,6 +33,7 @@ NetVersion CFxHelper::GetRequiredDotNetVersion() if (resourceFlag.Compare(L"net462") == 0) return NetVersion::net462; if (resourceFlag.Compare(L"net47") == 0) return NetVersion::net47; if (resourceFlag.Compare(L"net471") == 0) return NetVersion::net471; + if (resourceFlag.Compare(L"net472") == 0) return NetVersion::net472; //Default to standard net45 return NetVersion::net45; @@ -71,6 +73,8 @@ int CFxHelper::GetDotNetVersionReleaseNumber(NetVersion version) return fx47ReleaseVersion; case NetVersion::net471: return fx471ReleaseVersion; + case NetVersion::net472: + return fx472ReleaseVersion; case NetVersion::net45: default: return fx45ReleaseVersion; diff --git a/src/Setup/FxHelper.h b/src/Setup/FxHelper.h index b49447b4..dcdcdd65 100644 --- a/src/Setup/FxHelper.h +++ b/src/Setup/FxHelper.h @@ -1,6 +1,6 @@ #pragma once -enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6, net471=7}; +enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6, net471=7, net472=8}; class CFxHelper { diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index a4700e28274a79fb0fa57957e5e5fb858953ca8e..3137e8668562758ec67cec6f47c7e863a0281230 100644 GIT binary patch delta 26 icmdntx5ID417%J#24e;z1~Ueu$qQvgH~&+%Vg>+tm+teh5MU