Merge pull request #96 from nunit/BugFixes/Issue84

Bug fixes/issue84

src/NUnitTestAdapter/AssemblyRunner.cs

@@ -125,7 +125,7 @@ namespace NUnit.VisualStudio.TestAdapter
                 }
                 else
                 {
-                    logger.NUnitLoadError(assemblyName);
+                    logger.NoNUnit2TestsFoundIn(assemblyName);
                 }
             }
             catch (BadImageFormatException)

src/NUnitTestAdapter/NUnitTestDiscoverer.cs

@@ -55,7 +55,7 @@ namespace NUnit.VisualStudio.TestAdapter
                     }
                     else
                     {
-                        TestLog.NUnitLoadError(sourceAssembly);
+                        TestLog.NoNUnit2TestsFoundIn(sourceAssembly);
                     }
                 }
                 catch (BadImageFormatException)
@@ -74,7 +74,7 @@ namespace NUnit.VisualStudio.TestAdapter
                     // Attempts to load an invalid assembly, or an assembly with missing dependencies
                     TestLog.LoadingAssemblyFailedWarning(ex.FileName, sourceAssembly);
                 }
-                catch (UnsupportedFrameworkException ex)
+                catch (UnsupportedFrameworkException)
                 {
                     TestLog.UnsupportedFrameworkWarning(sourceAssembly);
                 }

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("2.1.0.4")]
-[assembly: AssemblyFileVersion("2.1.0.4")]
+[assembly: AssemblyVersion("2.1.0.7")]
+[assembly: AssemblyFileVersion("2.1.0.7")]

src/NUnitTestAdapter/TestLogger.cs

@@ -50,7 +50,7 @@ namespace NUnit.VisualStudio.TestAdapter
 
         public void UnsupportedFrameworkWarning(string assembly)
         {
-            SendWarningMessage("Attempt to load assembly with unsupported test framework in  "+assembly);
+            SendInformationalMessage("Assembly contains no NUnit 2 tests:  " + assembly);
         }
 
         public void LoadingAssemblyFailedWarning(string dependentAssembly, string sourceAssembly)
@@ -58,9 +58,9 @@ namespace NUnit.VisualStudio.TestAdapter
             SendWarningMessage("Assembly " + dependentAssembly + " loaded through " + sourceAssembly + " failed. Assembly is ignored. Correct deployment of dependencies if this is an error.");
         }
 
-        public void NUnitLoadError(string sourceAssembly)
+        public void NoNUnit2TestsFoundIn(string sourceAssembly)
         {
-            SendErrorMessage("NUnit failed to load " + sourceAssembly);
+            SendInformationalMessage("No NUnit 2 tests found in " + sourceAssembly);
         }
 
         public void SendErrorMessage(string message)

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>2.1.0.0</Version>
+    <Version>2.1.0.7</Version>
     <Description xml:space="preserve">NUnit adapter for integrated test execution under Visual Studio 2012 (all updates), Visual Studio 2013 (all updates), and the Visual Studio 2015 Preview and CTPs. Compatible with NUnit 2.0 through 2.6.4.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://nunit.org/index.php?p=vsTestAdapter&amp;r=2.6.4</MoreInfoUrl>