Merge branch 'upstream/master' into 1263_GermanCultureCLIOuput

# Conflicts:
#	Documentation/Changelog.md

Author: daveMueller

Documentation/Changelog.md

@@ -8,9 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed 
 -Fix summary output format for culture de-DE [#1263](https://github.com/coverlet-coverage/coverlet/issues/1263)
+-Fix branch coverage issue for finally block with await [#1233](https://github.com/coverlet-coverage/coverlet/issues/1233)  
 -Fix threshold doesn't work when coverage empty [#1205](https://github.com/coverlet-coverage/coverlet/issues/1205)  
 -Fix branch coverage issue for il switch [#1177](https://github.com/coverlet-coverage/coverlet/issues/1177)  
 -Fix branch coverage with using statement and several awaits[#1176](https://github.com/coverlet-coverage/coverlet/issues/1176)  
+-Fix `CopyCoverletDataCollectorFiles` to avoid to override user dlls for `dotnet publish` scenario  [#1243](https://github.com/coverlet-coverage/coverlet/pull/1243)  
 
 ### Improvements  
 -Improve logging in case of exception inside static ctor of NetstandardAwareAssemblyResolver [#1230](https://github.com/coverlet-coverage/coverlet/pull/1230)  

Documentation/KnownIssues.md

@@ -150,7 +150,9 @@ or by adding the property `<CopyLocalLockFileAssemblies>` to the project file
 
 NB. This **DOESN'T ALWAYS WORK**, for example in case of the shared framework https://github.com/dotnet/cli/issues/12705#issuecomment-536686785
 
-We can do nothing at the moment as this is a build behaviour out of our control. This issue should not happen for .NET runtime version >= 3.0 because the new default behavior is to copy all assets to the build output https://github.com/dotnet/cli/issues/12705#issuecomment-535150372
+We can do nothing at the moment as this is a build behaviour out of our control.
+
+For .NET runtime version >= 3.0 the new default behavior is to copy all assets to the build output (CopyLocalLockFileAssemblies=true) https://github.com/dotnet/cli/issues/12705#issuecomment-535150372, unfortunately the issue could still arise. 
 
 In this case the only workaround at the moment is to *manually copy* missing dlls to the output folder: https://github.com/coverlet-coverage/coverlet/issues/560#issue-496440052 
 

src/coverlet.collector/build/netstandard1.0/coverlet.collector.targets

@@ -12,6 +12,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
   <Target Name="CopyCoverletDataCollectorFiles" AfterTargets="ComputeFilesToPublish">
     <ItemGroup>
       <CoverletDataCollectorFiles Include="$(MSBuildThisFileDirectory)\*.*" />
+      <CoverletDataCollectorFiles Remove="@(ResolvedFileToPublish->'$(MSBuildThisFileDirectory)%(Filename)%(Extension)')" />
     </ItemGroup>
     <Copy SourceFiles="@(CoverletDataCollectorFiles)" DestinationFolder="$(PublishDir)%(RecursiveDir)" />
 

src/coverlet.core/Symbols/CecilSymbolHelper.cs

@@ -543,9 +543,9 @@ static bool CheckIfExceptionThrown(List<Instruction> instructions, Instruction i
                         instructions[i].Operand is FieldDefinition field &&
                         IsCompilerGenerated(field) && field.FieldType.FullName == "System.Object")
                     {
-                        // We expect the call to GetResult() to be no more than three
+                        // We expect the call to GetResult() to be no more than four
                         // instructions before the loading of the field's value.
-                        int minCallIndex = Math.Max(0, i - 3);
+                        int minCallIndex = Math.Max(0, i - 4);
 
                         for (int j = i - 1; j >= minCallIndex; --j)
                         {

test/coverlet.core.tests/Coverage/CoverageTests.AsyncAwait.cs

@@ -154,5 +154,33 @@ public void AsyncAwait_Issue_1177()
                 File.Delete(path);
             }
         }
+
+        [Fact]
+        public void AsyncAwait_Issue_1233()
+        {
+            string path = Path.GetTempFileName();
+            try
+            {
+                FunctionExecutor.Run(async (string[] pathSerialize) =>
+                {
+                    CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run<Issue_1233>(instance =>
+                        {
+                            ((Task)instance.Test()).ConfigureAwait(false).GetAwaiter().GetResult();
+                            return Task.CompletedTask;
+                        },
+                        persistPrepareResultToFile: pathSerialize[0]);
+
+                    return 0;
+                }, new string[] { path });
+
+                var document = TestInstrumentationHelper.GetCoverageResult(path).Document("Instrumentation.AsyncAwait.cs");
+                document.AssertLinesCovered(BuildConfiguration.Debug, (150, 1));
+                Assert.DoesNotContain(document.Branches, x => x.Key.Line == 150);
+            }
+            finally
+            {
+                File.Delete(path);
+            }
+        }
     }
 }

test/coverlet.core.tests/Samples/Instrumentation.AsyncAwait.cs

@@ -137,4 +137,18 @@ async public Task Test()
             await Task.CompletedTask;
         }
     }
+
+    public class Issue_1233
+    {
+        async public Task Test()
+        {
+            try
+            {
+            }
+            finally
+            {
+                await Task.CompletedTask;
+            }
+        }
+    }
 }

test/coverlet.tests.projectsample.fsharp/coverlet.tests.projectsample.fsharp.fsproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>false</IsPackable>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>