Add .NET 4.7 as an option for the required .NET framework version.

This commit is contained in:
Luke Skinner
2017-06-08 23:44:55 +01:00
parent 45a0c11493
commit 7ff8030316
4 changed files with 21 additions and 1 deletions

View File

@@ -10,6 +10,7 @@ static const int fx452ReleaseVersion = 379893;
static const int fx46ReleaseVersion = 393295; //Windows 10 version, other systems are higher
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
// 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.
@@ -28,6 +29,7 @@ NetVersion CFxHelper::GetRequiredDotNetVersion()
if (resourceFlag.Compare(L"net46") == 0) return NetVersion::net46;
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;
//Default to standard net45
return NetVersion::net45;
@@ -63,6 +65,8 @@ int CFxHelper::GetDotNetVersionReleaseNumber(NetVersion version)
return fx461ReleaseVersion;
case NetVersion::net462:
return fx462ReleaseVersion;
case NetVersion::net47:
return fx47ReleaseVersion;
case NetVersion::net45:
default:
return fx45ReleaseVersion;
@@ -269,6 +273,10 @@ out:
UINT CFxHelper::GetInstallerMainInstructionForVersion(NetVersion version)
{
if (version >= NetVersion::net47) {
return IDS_FXINSTRUCTION47;
}
if (version >= NetVersion::net46) {
return IDS_FXINSTRUCTION46;
}
@@ -277,6 +285,10 @@ UINT CFxHelper::GetInstallerMainInstructionForVersion(NetVersion version)
UINT CFxHelper::GetInstallerContentForVersion(NetVersion version)
{
if (version >= NetVersion::net47) {
return IDS_FXCONTENT47;
}
if (version >= NetVersion::net46) {
return IDS_FXCONTENT46;
}
@@ -285,6 +297,10 @@ UINT CFxHelper::GetInstallerContentForVersion(NetVersion version)
UINT CFxHelper::GetInstallerExpandedInfoForVersion(NetVersion version)
{
if (version >= NetVersion::net47) {
return IDS_FXEXPANDEDINFO47;
}
if (version >= NetVersion::net46) {
return IDS_FXEXPANDEDINFO46;
}
@@ -293,6 +309,10 @@ UINT CFxHelper::GetInstallerExpandedInfoForVersion(NetVersion version)
UINT CFxHelper::GetInstallerUrlForVersion(NetVersion version)
{
if (version >= NetVersion::net47) {
return IDS_FXDOWNLOADURL47;
}
if (version >= NetVersion::net46) {
return IDS_FXDOWNLOADURL46;
}

View File

@@ -1,6 +1,6 @@
#pragma once
enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5};
enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6};
class CFxHelper
{

Binary file not shown.

Binary file not shown.