Merge pull request #11 from AButler/support-4.8

[.NET] Support .NET 4.8

Author: AButler

DotNetBootstrapper/DotNetBootstrapper.cpp

@@ -23,6 +23,7 @@ const TCHAR* GetFriendlyVersion( const TCHAR* version );
 
   Supported Versions:
 
+    * v4.8        = .NET Framework v4.8
     * v4.7.2      = .NET Framework v4.7.2
     * v4.7.1      = .NET Framework v4.7.1
     * v4.7        = .NET Framework v4.7
@@ -112,7 +113,10 @@ int APIENTRY _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpC
 bool IsDotNetFxInstalled( const TCHAR* version ) {
   DotNetVersion dotNetVersion;
 
-  if( _tcscmp( version, _T( "v4.7.2" ) ) == 0 ) {
+  if( _tcscmp( version, _T( "v4.8" ) ) == 0 ) {
+    // .NET 4.8
+    return dotNetVersion.IsNetfx48Installed();
+  } else if( _tcscmp( version, _T( "v4.7.2" ) ) == 0 ) {
     // .NET 4.7.2
     return dotNetVersion.IsNetfx472Installed();
   } else if( _tcscmp( version, _T( "v4.7.1" ) ) == 0 ) {

DotNetBootstrapper/DotNetBootstrapper.rc

@@ -393,6 +393,30 @@ bool DotNetVersion::IsNetfx472Installed()
   return bRetValue;
 }
 
+/******************************************************************
+Function Name:  IsNetfx48Installed
+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.8 is
+                installed on the machine
+Inputs:         NONE
+Results:        true if the .NET Framework 4.8 is installed
+                false otherwise
+******************************************************************/
+bool DotNetVersion::IsNetfx48Installed()
+{
+  bool bRetValue = false;
+  DWORD dwRegValue=0;
+
+  if (RegistryGetValue(HKEY_LOCAL_MACHINE, g_szNetfx45RegKeyName, g_szNetfx45RegValueName, NULL, (LPBYTE)&dwRegValue, sizeof(DWORD)))
+  {
+    if (g_dwNetfx48ReleaseVersion <= dwRegValue)
+      bRetValue = true;
+  }
+
+  return bRetValue;
+}
+
 /******************************************************************
 Function Name:	CheckNetfxBuildNumber
 Description:	Retrieves the .NET Framework build number from

DotNetBootstrapper/DotNetVersion.cpp

@@ -69,6 +69,9 @@ const int g_dwNetfx471ReleaseVersion = 461308;
 // Version information for final release of .NET Framework 4.7.2
 const int g_dwNetfx472ReleaseVersion = 461808;
 
+// Version information for final release of .NET Framework 4.8
+const int g_dwNetfx48ReleaseVersion = 528040;
+
 class DotNetVersion {
 private:
   bool CheckNetfxBuildNumber(const TCHAR *pszNetfxRegKeyName, const TCHAR *pszNetfxRegKeyValue, const int iRequestedVersionMajor, const int iRequestedVersionMinor, const int iRequestedVersionBuild, const int iRequestedVersionRevision);
@@ -91,4 +94,5 @@ class DotNetVersion {
   bool IsNetfx47Installed();
   bool IsNetfx471Installed();
   bool IsNetfx472Installed();
+  bool IsNetfx48Installed();
 };