Skip to content

Commit

Permalink
Add .NET Framework 4.7.1 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Yoder committed Apr 11, 2018
1 parent 3e1a1d5 commit ff1362e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/Setup/FxHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Setup/FxHelper.h
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Binary file modified src/Setup/Setup.rc
Binary file not shown.

0 comments on commit ff1362e

Please sign in to comment.