diff --git a/Directory.Build.props b/Directory.Build.props
index 0b0e187d0..c28c4fdcf 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -55,9 +55,9 @@
-->
- 15.9.20
- 1.6.0
- 1.5.0
+
+
17.13.0
- 6.13.2
+ 6.14.0
2.0.0
3.0.2
@@ -21,7 +21,7 @@
-
+
@@ -54,18 +54,18 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/global.json b/global.json
index 6dfc6666e..0417b6523 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "8.0.407"
+ "version": "8.0.408"
}
}
diff --git a/src/coverlet.core/coverlet.core.csproj b/src/coverlet.core/coverlet.core.csproj
index f3e16e3f1..5f659912d 100644
--- a/src/coverlet.core/coverlet.core.csproj
+++ b/src/coverlet.core/coverlet.core.csproj
@@ -7,16 +7,16 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj b/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj
index c04e823b0..20fe9f592 100644
--- a/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj
+++ b/src/coverlet.msbuild.tasks/coverlet.msbuild.tasks.csproj
@@ -40,7 +40,7 @@
-
+
diff --git a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs
index 2cd661086..1261978df 100644
--- a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs
+++ b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs
@@ -9,7 +9,6 @@
using Coverlet.Core.CoverageSamples.Tests;
using Coverlet.Core.Tests;
using Coverlet.Tests.Utils;
-using Tmds.Utils;
using Xunit;
namespace Coverlet.CoreCoverage.Tests
@@ -17,27 +16,24 @@ namespace Coverlet.CoreCoverage.Tests
public partial class CoverageTests
{
[Fact]
- public void AsyncAwait()
+ public async Task AsyncAwaitAsync()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- instance.SyncExecution();
-
- int res = await (Task)instance.AsyncExecution(true);
- res = await (Task)instance.AsyncExecution(1);
- res = await (Task)instance.AsyncExecution(2);
- res = await (Task)instance.AsyncExecution(3);
- res = await (Task)instance.ContinuationCalled();
- res = await (Task)instance.ConfigureAwait();
-
- }, persistPrepareResultToFile: pathSerialize[0]);
- return 0;
- }, [path]);
+
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ instance.SyncExecution();
+
+ int res = await (Task)instance.AsyncExecution(true);
+ res = await (Task)instance.AsyncExecution(1);
+ res = await (Task)instance.AsyncExecution(2);
+ res = await (Task)instance.AsyncExecution(3);
+ res = await (Task)instance.ContinuationCalled();
+ res = await (Task)instance.ConfigureAwait();
+
+ }, persistPrepareResultToFile: path);
TestInstrumentationHelper.GetCoverageResult(path)
.Document("Instrumentation.AsyncAwait.cs")
@@ -73,21 +69,16 @@ public void AsyncAwait()
}
[Fact]
- public void AsyncAwait_Issue_669_1()
+ public async Task AsyncAwait_Issue_669_1Async()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- await (Task)instance.Test();
- },
- persistPrepareResultToFile: pathSerialize[0]);
-
- return 0;
- }, [path]);
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ await (Task)instance.Test();
+ },
+ persistPrepareResultToFile: path);
TestInstrumentationHelper.GetCoverageResult(path)
.Document("Instrumentation.AsyncAwait.cs")
@@ -102,23 +93,18 @@ public void AsyncAwait_Issue_669_1()
}
}
- [Fact(Skip = "Unhandled exception: System.InvalidOperationException: Sequence contains more than one matching element, InstrumenterHelper.cs:line 139 ")]
- public void AsyncAwait_Issue_669_2()
+ [Fact]
+ public async Task AsyncAwait_Issue_669_2Async()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- await (ValueTask)instance.SendRequest();
- },
- persistPrepareResultToFile: pathSerialize[0],
- assemblyLocation: Assembly.GetExecutingAssembly().Location);
-
- return 0;
- }, [path]);
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ await (ValueTask)instance.SendRequest();
+ },
+ persistPrepareResultToFile: path,
+ assemblyLocation: Assembly.GetExecutingAssembly().Location);
TestInstrumentationHelper.GetCoverageResult(path)
.Document("Instrumentation.AsyncAwait.cs")
@@ -132,21 +118,16 @@ public void AsyncAwait_Issue_669_2()
}
[Fact]
- public void AsyncAwait_Issue_1177()
+ public async Task AsyncAwait_Issue_1177Async()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- await (Task)instance.Test();
- },
- persistPrepareResultToFile: pathSerialize[0]);
-
- return 0;
- }, [path]);
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ await (Task)instance.Test();
+ },
+ persistPrepareResultToFile: path);
Core.Instrumentation.Document document = TestInstrumentationHelper.GetCoverageResult(path).Document("Instrumentation.AsyncAwait.cs");
document.AssertLinesCovered(BuildConfiguration.Debug, (133, 1), (134, 1), (135, 1), (136, 1), (137, 1));
@@ -159,21 +140,16 @@ public void AsyncAwait_Issue_1177()
}
[Fact]
- public void AsyncAwait_Issue_1233()
+ public async Task AsyncAwait_Issue_1233Async()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- await (Task)instance.Test();
- },
- persistPrepareResultToFile: pathSerialize[0]);
-
- return 0;
- }, [path]);
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ await (Task)instance.Test();
+ },
+ persistPrepareResultToFile: path);
Core.Instrumentation.Document document = TestInstrumentationHelper.GetCoverageResult(path).Document("Instrumentation.AsyncAwait.cs");
document.AssertLinesCovered(BuildConfiguration.Debug, (150, 1));
@@ -186,22 +162,17 @@ public void AsyncAwait_Issue_1233()
}
[Fact]
- public void AsyncAwait_Issue_1275()
+ public async Task AsyncAwait_Issue_1275Async()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- using var cts = new CancellationTokenSource();
- await (Task)instance.Execute(cts.Token);
- },
- persistPrepareResultToFile: pathSerialize[0]);
-
- return 0;
- }, [path]);
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ using var cts = new CancellationTokenSource();
+ await (Task)instance.Execute(cts.Token);
+ },
+ persistPrepareResultToFile: path);
Core.Instrumentation.Document document = TestInstrumentationHelper.GetCoverageResult(path).Document("Instrumentation.AsyncAwait.cs");
document.AssertLinesCoveredFromTo(BuildConfiguration.Debug, 170, 176);
diff --git a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwaitValueTask.cs b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwaitValueTask.cs
index 46ebc6d40..b7f743d87 100644
--- a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwaitValueTask.cs
+++ b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwaitValueTask.cs
@@ -14,26 +14,22 @@ namespace Coverlet.CoreCoverage.Tests
public partial class CoverageTests
{
[Fact]
- public void AsyncAwaitWithValueTask()
+ public async Task AsyncAwaitWithValueTaskAsync()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- instance.SyncExecution();
+ CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
+ {
+ instance.SyncExecution();
- int res = await (ValueTask)instance.AsyncExecution(true);
- res = await (ValueTask)instance.AsyncExecution(1);
- res = await (ValueTask)instance.AsyncExecution(2);
- res = await (ValueTask)instance.AsyncExecution(3);
- res = await (ValueTask)instance.ConfigureAwait();
- res = await (Task)instance.WrappingValueTaskAsTask();
- }, persistPrepareResultToFile: pathSerialize[0]);
- return 0;
- }, [path]);
+ int res = await (ValueTask)instance.AsyncExecution(true);
+ res = await (ValueTask)instance.AsyncExecution(1);
+ res = await (ValueTask)instance.AsyncExecution(2);
+ res = await (ValueTask)instance.AsyncExecution(3);
+ res = await (ValueTask)instance.ConfigureAwait();
+ res = await (Task)instance.WrappingValueTaskAsTask();
+ }, persistPrepareResultToFile: path);
TestInstrumentationHelper.GetCoverageResult(path)
.Document("Instrumentation.AsyncAwaitValueTask.cs")
diff --git a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncForeach.cs b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncForeach.cs
index 017a69cd9..c2e6595b9 100644
--- a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncForeach.cs
+++ b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncForeach.cs
@@ -15,23 +15,19 @@ namespace Coverlet.CoreCoverage.Tests
public partial class CoverageTests
{
[Fact]
- public void AsyncForeach()
+ public async Task AsyncForeachAsync()
{
string path = Path.GetTempFileName();
try
{
- FunctionExecutor.Run(async (string[] pathSerialize) =>
- {
- CoveragePrepareResult coveragePrepareResult = await TestInstrumentationHelper.Run(async instance =>
- {
- int res = await (ValueTask)instance.SumWithATwist(AsyncEnumerable.Range(1, 5));
- res += await (ValueTask)instance.Sum(AsyncEnumerable.Range(1, 3));
- res += await (ValueTask)instance.SumEmpty();
- await (ValueTask)instance.GenericAsyncForeach