RC 1.6.5

Author: jmp75

R.NET/Properties/VersionInfo.cs

@@ -1,5 +1,5 @@
 // <auto-generated/>
 using System.Reflection;
 
-[assembly: AssemblyVersionAttribute("1.6.4")]
-[assembly: AssemblyFileVersionAttribute("1.6.4")]
+[assembly: AssemblyVersionAttribute("1.6.5")]
+[assembly: AssemblyFileVersionAttribute("1.6.5")]

RDotNet.FSharp/VersionInfo.fs

@@ -1,7 +1,7 @@
 namespace System
 open System.Reflection
 
-[<assembly: AssemblyVersionAttribute("1.6.4")>]
-[<assembly: AssemblyFileVersionAttribute("1.6.4")>]
+[<assembly: AssemblyVersionAttribute("1.6.5")>]
+[<assembly: AssemblyFileVersionAttribute("1.6.5")>]
 do ()
 

RDotNet.NativeLibrary/NativeUtility.cs

@@ -407,8 +407,8 @@ public static string FindRPathFromRegistry(StringBuilder logger = null)
             CheckPlatformWin32();
             bool is64Bit = Environment.Is64BitProcess;
             RegistryKey rCoreKey = GetRCoreRegistryKeyWin32(logger);
-            var installPath = GetRInstallPathFromRCoreKegKey(null, logger);
-            var currentVersion = new Version((string)rCoreKey.GetValue("Current Version"));
+            var installPath = GetRInstallPathFromRCoreKegKey(rCoreKey, logger);
+            var currentVersion = GetRVersionFromRegistry();
             var bin = Path.Combine(installPath, "bin");
             // Up to 2.11.x, DLLs are installed in R_HOME\bin.
             // From 2.12.0, DLLs are installed in the one level deeper directory.

RELEASE_NOTES.md

@@ -1,3 +1,4 @@
+* 1.6.5 - Improve discovery of windows registry, to cater for situations arising from side by side installations of R
 * 1.6.4 - Fixed github #17 (do not crash when R_Visible is not exported).
 * 1.6.3 - Fixed github #14 (failing to parse things such as cat('this has # hash');). Known limitation: multi-line R character strings still not parsed correctly. Use Paket for dependency management. Use FAKE. Fix incorrect dependency for R.NET.Fsharp
 * 1.6.2 - Fixed github #14 (failing to parse things such as cat('this has # hash');). Known limitation: multi-line R character strings still not parsed correctly. Use Paket for dependency management. Use FAKE.