Merge pull request #1284 from ZirconLabs/add-net471-support

Add .NET Framework 4.7.1 support.

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;

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
 {