Merge pull request #5 from AButler/support-4.6.1

[.NET] Support .NET 4.6.1

Author: AButler

.gitignore

@@ -20,14 +20,18 @@
 *.out
 *.app
 
-# Visual Studio
+# Visual C++ cache files
 *.suo
-/*.sdf
-/*.opensdf
-/ipch
+*.sdf
+*.ncb
+*.opendb
+*.opensdf
+ipch/
 *.user
 *.aps
+*.cachefile
 
 # Custom
 Debug
 Release
+.vs

DotNetBootstrapper/DotNetBootstrapper.cpp

@@ -23,6 +23,7 @@ const TCHAR* GetFriendlyVersion( const TCHAR* version );
 
   Supported Versions:
 
+    * v4.6.1      = .NET Framework v4.6.1
     * v4.6        = .NET Framework v4.6
     * v4.5.2      = .NET Framework v4.5.2
     * v4.5.1      = .NET Framework v4.5.1
@@ -107,7 +108,10 @@ int APIENTRY _tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpC
 bool IsDotNetFxInstalled( const TCHAR* version ) {
   DotNetVersion dotNetVersion;
 
-  if( _tcscmp( version, _T( "v4.6" ) ) == 0 ) {
+  if( _tcscmp( version, _T( "v4.6.1" ) ) == 0 ) {
+    // .NET 4.6.1
+    return dotNetVersion.IsNetfx461Installed();
+  } else if( _tcscmp( version, _T( "v4.6" ) ) == 0 ) {
     // .NET 4.6
     return dotNetVersion.IsNetfx46Installed();
   } else if( _tcscmp( version, _T( "v4.5.2" ) ) == 0 ) {

DotNetBootstrapper/DotNetBootstrapper.rc

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

DotNetBootstrapper/DotNetBootstrapper.vcxproj

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

DotNetBootstrapper/DotNetVersion.cpp

@@ -54,6 +54,9 @@ static const int g_dwNetfx452ReleaseVersion = 379893;
 // Version information for final release of .NET Framework 4.6
 const int g_dwNetfx46ReleaseVersion = 393295;
 
+// Version information for final release of .NET Framework 4.6.1
+const int g_dwNetfx461ReleaseVersion = 394254;
+
 class DotNetVersion {
 private:
   bool CheckNetfxBuildNumber(const TCHAR *pszNetfxRegKeyName, const TCHAR *pszNetfxRegKeyValue, const int iRequestedVersionMajor, const int iRequestedVersionMinor, const int iRequestedVersionBuild, const int iRequestedVersionRevision);
@@ -71,4 +74,5 @@ class DotNetVersion {
   bool IsNetfx451Installed();
   bool IsNetfx452Installed();
   bool IsNetfx46Installed();
+  bool IsNetfx461Installed();
 };

DotNetBootstrapper/DotNetVersion.h

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