From ff1362e4c6cc6eff20f7c8435c756a6ee71069eb Mon Sep 17 00:00:00 2001 From: Jim Yoder Date: Wed, 11 Apr 2018 14:18:48 -0500 Subject: [PATCH] Add .NET Framework 4.7.1 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 5da50bc4a..eb4ff9f19 100644 --- a/src/Setup/FxHelper.cpp +++ b/src/Setup/FxHelper.cpp @@ -11,6 +11,7 @@ static const int fx46ReleaseVersion = 393295; //Windows 10 version, other system 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 // 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. @@ -30,6 +31,7 @@ NetVersion CFxHelper::GetRequiredDotNetVersion() if (resourceFlag.Compare(L"net461") == 0) return NetVersion::net461; 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; //Default to standard net45 return NetVersion::net45; @@ -67,6 +69,8 @@ int CFxHelper::GetDotNetVersionReleaseNumber(NetVersion version) return fx462ReleaseVersion; case NetVersion::net47: return fx47ReleaseVersion; + case NetVersion::net471: + return fx471ReleaseVersion; case NetVersion::net45: default: return fx45ReleaseVersion; diff --git a/src/Setup/FxHelper.h b/src/Setup/FxHelper.h index 43d19de2a..b49447b4c 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}; +enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6, net471=7}; class CFxHelper { diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 71b6bf74107fe62540a5b3c932c30fda870d092b..58396ffde028e9347df2030984462f07b2413fd2 100644 GIT binary patch delta 26 icmdntx5ID417%KA1|tRo21^E`$qQvgH~&+%Vg>+teh5MU delta 26 icmdntx5ID417%Jl22%zj21^Eu$qQvgH~&+%Vg>+t&