Merge pull request #9 from AButler/support-4.7.1

[.NET] Support .NET 4.7.1

Author: AButler

DotNetBootstrapper/DotNetBootstrapper.cpp

@@ -23,6 +23,7 @@ const TCHAR* GetFriendlyVersion( const TCHAR* version );
 
   Supported Versions:
 
+    * v4.7.1      = .NET Framework v4.7.1
     * v4.7        = .NET Framework v4.7
     * v4.6.2      = .NET Framework v4.6.2
     * v4.6.1      = .NET Framework v4.6.1
@@ -110,7 +111,10 @@ int APIENTRY _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpC
 bool IsDotNetFxInstalled( const TCHAR* version ) {
   DotNetVersion dotNetVersion;
 
-  if( _tcscmp( version, _T( "v4.7" ) ) == 0 ) {
+  if( _tcscmp( version, _T( "v4.7.1" ) ) == 0 ) {
+    // .NET 4.7.1
+    return dotNetVersion.IsNetfx471Installed();
+  } else if( _tcscmp( version, _T( "v4.7" ) ) == 0 ) {
     // .NET 4.7
     return dotNetVersion.IsNetfx47Installed();
   } else if ( _tcscmp( version, _T( "v4.6.2" ) ) == 0 ) {

DotNetBootstrapper/DotNetBootstrapper.rc

@@ -14,6 +14,7 @@
     <ProjectGuid>{0FD1B168-73DE-4EE2-BA14-CA4E3C577B0E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>DotNetBootstrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -25,7 +26,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

DotNetBootstrapper/DotNetBootstrapper.vcxproj

@@ -345,6 +345,30 @@ bool DotNetVersion::IsNetfx47Installed()
   return bRetValue;
 }
 
+/******************************************************************
+Function Name:	IsNetfx471Installed
+Description:	Uses the detection method recommended at
+https://msdn.microsoft.com/en-us/library/ee942965(v=vs.110).aspx
+to determine whether the .NET Framework 4.7.1 is
+installed on the machine
+Inputs:         NONE
+Results:        true if the .NET Framework 4.7.1 is installed
+false otherwise
+******************************************************************/
+bool DotNetVersion::IsNetfx471Installed()
+{
+  bool bRetValue = false;
+  DWORD dwRegValue = 0;
+
+  if (RegistryGetValue(HKEY_LOCAL_MACHINE, g_szNetfx45RegKeyName, g_szNetfx45RegValueName, NULL, (LPBYTE)&dwRegValue, sizeof(DWORD)))
+  {
+    if (g_dwNetfx471ReleaseVersion <= dwRegValue)
+      bRetValue = true;
+  }
+
+  return bRetValue;
+}
+
 /******************************************************************
 Function Name:	CheckNetfxBuildNumber
 Description:	Retrieves the .NET Framework build number from

DotNetBootstrapper/DotNetVersion.cpp

@@ -63,6 +63,9 @@ const int g_dwNetfx462ReleaseVersion = 394802;
 // Version information for final release of .NET Framework 4.7
 const int g_dwNetfx47ReleaseVersion = 460798;
 
+// Version information for final release of .NET Framework 4.7.1
+const int g_dwNetfx471ReleaseVersion = 461308;
+
 class DotNetVersion {
 private:
   bool CheckNetfxBuildNumber(const TCHAR *pszNetfxRegKeyName, const TCHAR *pszNetfxRegKeyValue, const int iRequestedVersionMajor, const int iRequestedVersionMinor, const int iRequestedVersionBuild, const int iRequestedVersionRevision);
@@ -83,4 +86,5 @@ class DotNetVersion {
   bool IsNetfx461Installed();
   bool IsNetfx462Installed();
   bool IsNetfx47Installed();
+  bool IsNetfx471Installed();
 };

DotNetBootstrapper/DotNetVersion.h

@@ -21,6 +21,7 @@ DotNetBootstrapper.exe <Version> <Application> [<Arguments>]
 
 | `<Version>`     | .NET Framework Version                  |
 | --------------- | --------------------------------------- |
+| `v4.7.1`        | .NET Framework v4.7.1                   |
 | `v4.7`          | .NET Framework v4.7                     |
 | `v4.6.2`        | .NET Framework v4.6.2                   |
 | `v4.6.1`        | .NET Framework v4.6.1                   |