Merge pull request #81 from machine/bug/fix-dotnet-core

[Bug] Fix tests not found in dotnet core projects/out of memory

Author: ivanz

Source/Machine.VSTestAdapter/Discovery/BuiltIn/SourceCodeLocationFinder.cs

@@ -1,13 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 namespace Machine.VSTestAdapter.Discovery.BuiltIn
 {
-    public class SourceCodeLocationFinder
+    public class SourceCodeLocationFinder : IDisposable
     {
         private readonly Lazy<AssemblyDefinition> assemblyDefinition;
 
@@ -36,11 +35,15 @@ private AssemblyDefinition LoadAssembly(string assemblyFilePath)
             });
         }
 
+        public void Dispose()
+        {
+            Assembly?.Dispose();
+        }
+
         private AssemblyDefinition Assembly {
             get { return assemblyDefinition.Value; }
         }
 
-
         private string HandleNestedTypeName(string type)
         {
             return type.Replace("+", "/");
@@ -63,23 +66,18 @@ private SourceCodeLocationInfo GetFieldLocationCore(TypeDefinition type, string
             if (!constructorDefinition.HasBody)
                 return null;
 
-#if NETCOREAPP1_1
             if (constructorDefinition.DebugInformation == null)
                 return null;
-#endif
 
             Instruction instruction = constructorDefinition.Body.Instructions
-                .Where(x => x.Operand != null &&
+                .SingleOrDefault(x => x.Operand != null &&
                             x.Operand.GetType().IsAssignableFrom(typeof(FieldDefinition)) &&
-                            ((MemberReference)x.Operand).Name == fieldFullName).SingleOrDefault();
+                            ((MemberReference)x.Operand).Name == fieldFullName);
 
             while (instruction != null)
             {
-#if NETCOREAPP1_1
                 SequencePoint sequencePoint = constructorDefinition.DebugInformation?.GetSequencePoint(instruction);
-#else
-                SequencePoint sequencePoint = instruction.SequencePoint;
-#endif
+
                 if (sequencePoint != null && !IsHidden(sequencePoint))
                 {
                     return new SourceCodeLocationInfo()
@@ -97,13 +95,7 @@ private SourceCodeLocationInfo GetFieldLocationCore(TypeDefinition type, string
 
         private bool IsHidden(SequencePoint sequencePoint)
         {
-
-#if NETCOREAPP1_1
             return sequencePoint.IsHidden;
-#else
-            const int lineNumberIndicatingHiddenLine = 0xfeefee;
-            return sequencePoint.StartLine == lineNumberIndicatingHiddenLine;
-#endif
         }
     }
 

Source/Machine.VSTestAdapter/Discovery/BuiltIn/TestDiscoverer.cs

@@ -24,9 +24,10 @@ public IEnumerable<MSpecTestCase> DiscoverTests(string assemblyPath)
             Assembly assembly = AssemblyHelper.Load(assemblyPath);
             IEnumerable<Context> contexts = assemblyExplorer.FindContextsIn(assembly);
 
-            SourceCodeLocationFinder locationFinder = new SourceCodeLocationFinder(assemblyPath);
-
-            return contexts.SelectMany(context => CreateTestCase(context, locationFinder)).ToList();
+            using (SourceCodeLocationFinder locationFinder = new SourceCodeLocationFinder(assemblyPath))
+            {
+                return contexts.SelectMany(context => CreateTestCase(context, locationFinder)).ToList();
+            }
         }
 
         private IEnumerable<MSpecTestCase> CreateTestCase(Context context, SourceCodeLocationFinder locationFinder)

Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj

@@ -26,25 +26,24 @@
     <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNetCore)">
+  <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
     <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
       <PrivateAssets>All</PrivateAssets>
       <!-- Only a reference during build/dev time -->
     </PackageReference>
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNetCore)">
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
+      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
+    </PackageReference>
+  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='$(_TargetDotNetFramework)'">
-    <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[11.0.0,16.0.0)">
       <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
     </PackageReference>
-    <PackageReference Include="Machine.Specifications" Version="[0.11.0, 1.0)">
-      <PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

appveyor.yml

@@ -1,6 +1,6 @@
 environment:
-  nuget_version: '2.6.1'
-  assembly_version: '2.6.1'
+  nuget_version: '2.7.0'
+  assembly_version: '2.7.0'
 
 version: '$(nuget_version)+{build}'
 
@@ -28,7 +28,7 @@ test_script: dotnet test -c %CONFIGURATION% Source\Machine.VSTestAdapter.Specs
 deploy:
   - provider: GitHub
     description: |
-      * Fix to support for VS 2017 15.5.x
+      * Fix for out ot memory exceptions and tests not showing up
 
     on:
       appveyor_repo_tag: true