Merge pull request #7 from AButler/support-4.7

[.NET] Support .NET 4.7

Author: AButler

DotNetBootstrapper/DotNetBootstrapper.cpp

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

DotNetBootstrapper/DotNetVersion.cpp

@@ -1,6 +1,6 @@
 #include "DotNetVersion.h"
 /*
-  Based on http://blogs.msdn.com/b/astebner/archive/2009/06/16/9763379.aspx
+  Based on https://blogs.msdn.microsoft.com/astebner/2009/06/16/sample-code-to-detect-net-framework-install-state-and-service-pack-level/
 */
 
 /******************************************************************
@@ -321,6 +321,30 @@ bool DotNetVersion::IsNetfx462Installed()
   return bRetValue;
 }
 
+/******************************************************************
+Function Name:	IsNetfx47Installed
+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 is
+installed on the machine
+Inputs:         NONE
+Results:        true if the .NET Framework 4.7 is installed
+false otherwise
+******************************************************************/
+bool DotNetVersion::IsNetfx47Installed()
+{
+  bool bRetValue = false;
+  DWORD dwRegValue = 0;
+
+  if (RegistryGetValue(HKEY_LOCAL_MACHINE, g_szNetfx45RegKeyName, g_szNetfx45RegValueName, NULL, (LPBYTE)&dwRegValue, sizeof(DWORD)))
+  {
+    if (g_dwNetfx47ReleaseVersion <= dwRegValue)
+      bRetValue = true;
+  }
+
+  return bRetValue;
+}
+
 /******************************************************************
 Function Name:	CheckNetfxBuildNumber
 Description:	Retrieves the .NET Framework build number from

DotNetBootstrapper/DotNetVersion.h

@@ -60,6 +60,9 @@ const int g_dwNetfx461ReleaseVersion = 394254;
 // Version information for final release of .NET Framework 4.6.2
 const int g_dwNetfx462ReleaseVersion = 394802;
 
+// Version information for final release of .NET Framework 4.7
+const int g_dwNetfx47ReleaseVersion = 460798;
+
 class DotNetVersion {
 private:
   bool CheckNetfxBuildNumber(const TCHAR *pszNetfxRegKeyName, const TCHAR *pszNetfxRegKeyValue, const int iRequestedVersionMajor, const int iRequestedVersionMinor, const int iRequestedVersionBuild, const int iRequestedVersionRevision);
@@ -79,4 +82,5 @@ class DotNetVersion {
   bool IsNetfx46Installed();
   bool IsNetfx461Installed();
   bool IsNetfx462Installed();
+  bool IsNetfx47Installed();
 };

README.md

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