diff --git a/.gitignore b/.gitignore index 514880624..2179436d8 100644 --- a/.gitignore +++ b/.gitignore @@ -318,3 +318,4 @@ FolderProfile.pubxml /NuGet.config nuget.config *.dmp +Playground*/ diff --git a/Directory.Packages.props b/Directory.Packages.props index eba94e254..c5ef6e38c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,18 +54,18 @@ - + - - - + + + - - + + - + - + diff --git a/eng/azure-pipelines-nightly.yml b/eng/azure-pipelines-nightly.yml index ab78bae71..c7d5a0dfa 100644 --- a/eng/azure-pipelines-nightly.yml +++ b/eng/azure-pipelines-nightly.yml @@ -10,7 +10,7 @@ steps: - task: UseDotNet@2 inputs: useGlobalJson: true - displayName: Install .NET Core SDK 8.0.113 + displayName: Use .NET SDK from global.json - task: NuGetAuthenticate@1 displayName: Authenticate with NuGet feeds diff --git a/eng/build.yml b/eng/build.yml index 570bd0f2c..bba38f406 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -7,7 +7,7 @@ steps: - task: UseDotNet@2 inputs: useGlobalJson: true - displayName: Install .NET Core SDK 8.0.113 + displayName: Install .NET Core SDK (global.json) # create artifact/package folder - pwsh: | diff --git a/global.json b/global.json index 6dfc6666e..d0137450f 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.407" + "version": "8.0.412" } } diff --git a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs index 2cd661086..7ede65ced 100644 --- a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs +++ b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.AsyncAwait.cs @@ -3,6 +3,7 @@ using System.IO; using System.Reflection; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Coverlet.Core; @@ -102,9 +103,11 @@ public void AsyncAwait_Issue_669_1() } } - [Fact(Skip = "Unhandled exception: System.InvalidOperationException: Sequence contains more than one matching element, InstrumenterHelper.cs:line 139 ")] + [Fact] public void AsyncAwait_Issue_669_2() { + // fails on CI with Windows OS - unknown reason - successfully executed locally (CLI) + Assert.SkipWhen(RuntimeInformation.IsOSPlatform(OSPlatform.Windows), "This test is skipped on Windows for CI environment"); string path = Path.GetTempFileName(); try { diff --git a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.DoesNotReturn.cs b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.DoesNotReturn.cs index 408ac6417..6babc6738 100644 --- a/test/coverlet.core.coverage.tests/Coverage/CoverageTests.DoesNotReturn.cs +++ b/test/coverlet.core.coverage.tests/Coverage/CoverageTests.DoesNotReturn.cs @@ -47,7 +47,7 @@ public void NoBranches_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "xunit.v3 '(Explicit=true)' (System.Console.ReadKey, Instrumentation.DoesNotReturn.cs line 22) ")] + [Fact] public void If_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -78,7 +78,7 @@ public void If_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "xunit.v3 '(Explicit=true)' (System.Console.ReadKey, Instrumentation.DoesNotReturn.cs line 36) ")] + [Fact] public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -109,7 +109,7 @@ public void Switch_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "xunit.v3 '(Explicit=true)' (System.Console.ReadKey, Instrumentation.DoesNotReturn.cs line 37) ")] + [Fact] public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); @@ -140,7 +140,7 @@ public void Subtle_DoesNotReturnAttribute_InstrumentsCorrect() } } - [Fact(Skip = "xunit.v3 '(Explicit=true)' (System.Console.ReadKey, Instrumentation.DoesNotReturn.cs line 107) ")] + [Fact] public void UnreachableBranch_DoesNotReturnAttribute_InstrumentsCorrect() { string path = Path.GetTempFileName(); diff --git a/test/coverlet.integration.tests/coverlet.integration.tests.csproj b/test/coverlet.integration.tests/coverlet.integration.tests.csproj index 4c8cc9c50..d0810b7e8 100644 --- a/test/coverlet.integration.tests/coverlet.integration.tests.csproj +++ b/test/coverlet.integration.tests/coverlet.integration.tests.csproj @@ -23,8 +23,8 @@ runtime; build; native; contentfiles; analyzers - - + +