Fix for issue #39 and #40

src/NUnitTestAdapter/NUnitTestAdapter.cs

@@ -50,9 +50,9 @@ namespace NUnit.VisualStudio.TestAdapter
             try
             {
                 var registry = RegistryCurrentUser.OpenRegistryCurrentUser(@"Software\nunit.org\VSAdapter");
-                UseVsKeepEngineRunning = registry.Exist && (registry.Read<int>("UseVsKeepEngineRunning") == 1);
-                UseShallowCopy = registry.Exist && (registry.Read<int>("UseShallowCopy") == 1);
-                Verbosity = (registry.Exist) ? registry.Read<int>("Verbosity") : 0;
+                UseVsKeepEngineRunning = registry.Exist("UseVsKeepEngineRunning") && (registry.Read<int>("UseVsKeepEngineRunning") == 1);
+                UseShallowCopy = registry.Exist("UseShallowCopy") && (registry.Read<int>("UseShallowCopy") == 1);
+                Verbosity = (registry.Exist("Verbosity")) ? registry.Read<int>("Verbosity") : 0;
             }
             catch (Exception e)
             {

src/NUnitTestAdapter/NUnitTestAdapter.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NUnit.VisualStudio.TestAdapter</RootNamespace>
     <AssemblyName>NUnit.VisualStudio.TestAdapter</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

src/NUnitTestAdapter/Properties/AssemblyInfo.cs

@@ -21,5 +21,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 [assembly: Guid("c0aad5e4-b486-49bc-b3e8-31e01be6fefe")]
-[assembly: AssemblyVersion("1.1.0.3")]
-[assembly: AssemblyFileVersion("1.1.0.3")]
+[assembly: AssemblyVersion("1.1.0.5")]
+[assembly: AssemblyFileVersion("1.1.0.5")]

src/NUnitTestAdapter/Registry.cs

@@ -10,46 +10,41 @@ namespace NUnit.VisualStudio.TestAdapter
     {
 
         private string SubKeyName { get; set; }
-        protected RegistryKey BaseKey { get; private set; }
+        protected string BaseKey { get; private set; }
 
-        protected RegistryBase(RegistryHive basekey, string subkeyname)
+        protected RegistryBase(string basekey, string subkeyname)
         {
-            
-            BaseKey = RegistryKey.OpenBaseKey(basekey, RegistryView.Default);
+
+            BaseKey = basekey; // RegistryKey.OpenBaseKey(basekey, RegistryView.Default);
             SubKeyName = subkeyname;
         }
 
         public T Read<T>(string property)
         {
-            var key = BaseKey.OpenSubKey(SubKeyName);
-            if (key == null)
+            var result = Registry.GetValue(BaseKey + SubKeyName, property, null);
+            if (result == null)
                 return default(T);
-            var o = key.GetValue(property);
-            if (o == null)
-                return default(T);
-            return (T)o;
+            var value = (T)result;
+            return value;
         }
 
-        public bool Exist
+        public bool Exist(string property)
         {
-            get
-            {
-                return BaseKey.OpenSubKey(SubKeyName) != null;
-            }
+            var value = Registry.GetValue(BaseKey + SubKeyName, property,null);
+            return value != null;
+
         }
 
         public void Write<T>(string property, T val)
         {
-            var key = BaseKey.OpenSubKey(SubKeyName, true) ?? BaseKey.CreateSubKey(SubKeyName);
-            key.SetValue(property, val);
-            key.Close();
+            Registry.SetValue(BaseKey+SubKeyName,property, val);
         }
     }
 
     public class RegistryCurrentUser : RegistryBase
     {
         public RegistryCurrentUser(string subkeyname)
-            : base(RegistryHive.CurrentUser, subkeyname)
+            : base(@"HKEY_CURRENT_USER\", subkeyname)
         {
 
         }

src/NUnitTestAdapterInstall/source.extension.vsixmanifest

@@ -3,7 +3,7 @@
   <Identifier Id="NUnitTestAdapterInstall..7c53286e-ac4f-485f-915c-5ec5a4c47b0c">
     <Name>NUnit Test Adapter</Name>
     <Author>Charlie Poole</Author>
-    <Version>1.1.0.3</Version>
+    <Version>1.1.0.5</Version>
     <Description xml:space="preserve">NUnit adapter for integrated test execution under Visual Studio 2012 (all updates),and Visual Studio 2013 (all updates). Compatible with NUnit 2.0 through 2.6.3.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://nunit.org/index.php?p=vsTestAdapter&amp;r=2.6.3</MoreInfoUrl>

src/NUnitTestAdapterTests/RegistryTests.cs

@@ -1,11 +1,38 @@
 
+using Microsoft.Win32;
 using NUnit.Framework;
 
 namespace NUnit.VisualStudio.TestAdapter.Tests
 {
+
+
+    [SetUpFixture]
+    public class Init
+    {
+        [SetUp]
+        public void SetUp()
+        {
+            // Try to ensure that the test registry entry is present
+            const string userRoot = "HKEY_CURRENT_USER";
+            const string subkey = "UseDuringTest";
+            const string keyName = userRoot + "\\" + subkey;
+            Registry.SetValue(keyName, "SomeDataText", "Test", RegistryValueKind.String);
+
+        }
+    }
+
+
     [TestFixture]
     public class RegistryTests
     {
+
+
+        [SetUp]
+        public void Init()
+        {
+            
+        }
+
         [Test]
         public void RegistryTestDoesExist()
         {
@@ -40,13 +67,13 @@ namespace NUnit.VisualStudio.TestAdapter.Tests
             Assert.That(wr,Is.EqualTo(default(int)));
         }
 
-        [TestCase("UseDuringTest", true)]
-        [TestCase("ShouldNotBeThere", false)]
+        [TestCase("UseDuringTest", "SomeDataText",true)]
+        [TestCase("ShouldNotBeThere", "SomeDataText",false)]
         [Test]
-        public void RegistryTestExists(string key, bool expected)
+        public void RegistryTestExists(string key, string parameter, bool expected)
         {
             var reg = new RegistryCurrentUser(key);
-            var res = reg.Exist;
+            var res = reg.Exist(parameter);
             Assert.That(res, Is.EqualTo(expected));
         }
     }