Incorrect branch coverage async pattern for targetframework net472 (#1169)

Incorrect branch coverage async pattern for targetframework

Author: daveMueller

Documentation/Changelog.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Fixed  
-
+-Fix branch coverage for targetframework net472 [#1167](https://github.com/coverlet-coverage/coverlet/issues/1167)
 -Fix F# projects with `unkown` source [#1145](https://github.com/coverlet-coverage/coverlet/issues/1145)
 -Fix SkipAutoProps for inline assigned properties [#1139](https://github.com/coverlet-coverage/coverlet/issues/1139)
 -Fix partially covered throw statement [#1144](https://github.com/coverlet-coverage/coverlet/pull/1144)

coverlet.sln

@@ -55,6 +55,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{9A8B19D4
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "coverlet.tests.projectsample.fsharp", "test\coverlet.tests.projectsample.fsharp\coverlet.tests.projectsample.fsharp.fsproj", "{1CBF6966-2A67-4D2C-8598-D174B83072F4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coverlet.tests.projectsample.netframework", "test\coverlet.tests.projectsample.netframework\coverlet.tests.projectsample.netframework.csproj", "{E69D68C9-78ED-4076-A14B-D07295A4B2A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -121,6 +123,10 @@ Global
 		{1CBF6966-2A67-4D2C-8598-D174B83072F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CBF6966-2A67-4D2C-8598-D174B83072F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CBF6966-2A67-4D2C-8598-D174B83072F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E69D68C9-78ED-4076-A14B-D07295A4B2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E69D68C9-78ED-4076-A14B-D07295A4B2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E69D68C9-78ED-4076-A14B-D07295A4B2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E69D68C9-78ED-4076-A14B-D07295A4B2A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -142,6 +148,7 @@ Global
 		{F8199E19-FA9A-4559-9101-CAD7028121B4} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
 		{9A8B19D4-4A24-4217-AEFE-159B68F029A1} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
 		{1CBF6966-2A67-4D2C-8598-D174B83072F4} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
+		{E69D68C9-78ED-4076-A14B-D07295A4B2A5} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9CA57C02-97B0-4C38-A027-EA61E8741F10}

src/coverlet.core/Symbols/CecilSymbolHelper.cs

@@ -197,6 +197,7 @@ instruction.Previous.Operand is MethodReference operand &&
                     (
                         operand.DeclaringType.Scope.Name == "System.Runtime" ||
                         operand.DeclaringType.Scope.Name == "netstandard" ||
+                        operand.DeclaringType.Scope.Name == "mscorlib" ||
                         operand.DeclaringType.Scope.Name == "System.Threading.Tasks.Extensions"
                     )
                )

test/coverlet.core.tests/Symbols/CecilSymbolHelperTests.cs

@@ -4,23 +4,26 @@
 
 using Xunit;
 using Coverlet.Core.Samples.Tests;
+using coverlet.tests.projectsample.netframework;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 
 namespace Coverlet.Core.Symbols.Tests
 {
     public class CecilSymbolHelperTests
     {
-        private readonly ModuleDefinition _module;
+        private ModuleDefinition _module;
         private readonly CecilSymbolHelper _cecilSymbolHelper;
+        private readonly DefaultAssemblyResolver _resolver;
+        private readonly ReaderParameters _parameters;
 
         public CecilSymbolHelperTests()
         {
             var location = GetType().Assembly.Location;
-            var resolver = new DefaultAssemblyResolver();
-            resolver.AddSearchDirectory(Path.GetDirectoryName(location));
-            var parameters = new ReaderParameters { ReadSymbols = true, AssemblyResolver = resolver };
-            _module = ModuleDefinition.ReadModule(location, parameters);
+            _resolver = new DefaultAssemblyResolver();
+            _resolver.AddSearchDirectory(Path.GetDirectoryName(location));
+            _parameters = new ReaderParameters { ReadSymbols = true, AssemblyResolver = _resolver };
+            _module = ModuleDefinition.ReadModule(location, _parameters);
             _cecilSymbolHelper = new CecilSymbolHelper();
         }
 
@@ -294,6 +297,26 @@ public void GetBranchPoints_IgnoresBranchesIn_AsyncAwaitStateMachine()
             Assert.Empty(points);
         }
 
+        [Fact]
+        public void GetBranchPoints_IgnoresBranchesIn_AsyncAwaitStateMachineNetFramework()
+        {
+            // arrange
+            string location = Directory.GetFiles(Directory.GetCurrentDirectory(), "coverlet.tests.projectsample.netframework.dll").First();
+            _resolver.AddSearchDirectory(Path.GetDirectoryName(location));
+            _module = ModuleDefinition.ReadModule(location, _parameters);
+
+            var nestedName = typeof(AsyncAwaitStateMachineNetFramework).GetNestedTypes(BindingFlags.NonPublic).First().Name;
+            var type = _module.Types.FirstOrDefault(x => x.FullName == typeof(AsyncAwaitStateMachineNetFramework).FullName);
+            var nestedType = type.NestedTypes.FirstOrDefault(x => x.FullName.EndsWith(nestedName));
+            var method = nestedType.Methods.First(x => x.FullName.EndsWith("::MoveNext()"));
+
+            // act
+            var points = _cecilSymbolHelper.GetBranchPoints(method);
+
+            // assert
+            Assert.Empty(points);
+        }
+
         [Fact]
         public void GetBranchPoints_IgnoresBranchesIn_AsyncAwaitValueTaskStateMachine()
         {

test/coverlet.core.tests/coverlet.core.tests.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
     <!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
     <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
@@ -27,6 +28,7 @@
     <ProjectReference Include="$(RepoRoot)test\coverlet.tests.projectsample.fsharp\coverlet.tests.projectsample.fsharp.fsproj" />    
     <ProjectReference Include="$(RepoRoot)test\coverlet.core.tests.samples.netstandard\coverlet.core.tests.samples.netstandard.csproj" />
     <ProjectReference Include="$(RepoRoot)test\coverlet.tests.xunit.extensions\coverlet.tests.xunit.extensions.csproj" />
+    <ProjectReference Include="$(RepoRoot)test\coverlet.tests.projectsample.netframework\coverlet.tests.projectsample.netframework.csproj" />
   </ItemGroup>
 
   <ItemGroup>

test/coverlet.tests.projectsample.netframework/AsyncAwaitStateMachineNetFramework.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+
+namespace coverlet.tests.projectsample.netframework
+{
+    public class AsyncAwaitStateMachineNetFramework
+    {
+        public async Task AsyncAwait()
+        {
+            await Task.CompletedTask;
+        }
+    }
+}

test/coverlet.tests.projectsample.netframework/coverlet.tests.projectsample.netframework.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>false</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>