From 1e976c6609821face413305e389c0f4c244f16e8 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Sat, 2 Oct 2021 17:26:43 +0200 Subject: [PATCH 1/5] add CompilerGenerated attribute to tracker --- src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs index 251dcac24..1bc6f6e93 100644 --- a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs +++ b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs @@ -3,6 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Reflection; +using System.Runtime.CompilerServices; using System.Threading; namespace Coverlet.Core.Instrumentation @@ -16,6 +17,7 @@ namespace Coverlet.Core.Instrumentation /// regarding visibility of members, etc. /// [ExcludeFromCodeCoverage] + [CompilerGenerated] internal static class ModuleTrackerTemplate { public static string HitsFilePath; From a040b1ccb87251254c31f3f6690708fb290427bf Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Sat, 2 Oct 2021 17:29:28 +0200 Subject: [PATCH 2/5] updates --- src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs index 1bc6f6e93..653178782 100644 --- a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs +++ b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs @@ -16,8 +16,8 @@ namespace Coverlet.Core.Instrumentation /// As this type is going to be customized for each instrumented module it doesn't follow typical practices /// regarding visibility of members, etc. /// - [ExcludeFromCodeCoverage] [CompilerGenerated] + [ExcludeFromCodeCoverage] internal static class ModuleTrackerTemplate { public static string HitsFilePath; From ca9c1bb54a9f695fc138dfb67f7839ad1c221992 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Sat, 2 Oct 2021 17:40:10 +0200 Subject: [PATCH 3/5] update test hosts --- eng/azure-pipelines.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 4b61e9866..67d6bc41e 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -15,7 +15,7 @@ jobs: Release: buildConfiguration: "Release" pool: - vmImage: 'windows-2019' + vmImage: 'windows-latest' steps: - template: build.yml - task: CopyFiles@2 @@ -45,7 +45,7 @@ jobs: Release: buildConfiguration: "Release" pool: - vmImage: 'macOS-10.14' + vmImage: 'macOS-latest' steps: - template: build.yml @@ -59,6 +59,6 @@ jobs: Release: buildConfiguration: "Release" pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-latest' steps: - template: build.yml From e9c13b26c703035f9b3c6622b6fec27df75e1351 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Sat, 2 Oct 2021 17:50:38 +0200 Subject: [PATCH 4/5] try to fix macos build --- eng/azure-pipelines-nightly.yml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/azure-pipelines-nightly.yml b/eng/azure-pipelines-nightly.yml index ec4d4f4b5..3535bd2bc 100644 --- a/eng/azure-pipelines-nightly.yml +++ b/eng/azure-pipelines-nightly.yml @@ -9,8 +9,8 @@ steps: - task: UseDotNet@2 inputs: - version: 5.0.101 - displayName: Install .NET Core SDK 5.0.101 + version: 5.0.401 + displayName: Install .NET Core SDK 5.0.401 - task: NuGetAuthenticate@0 displayName: Authenticate with NuGet feeds diff --git a/global.json b/global.json index fc9f7a45d..c07142494 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "5.0.101", + "version": "5.0.401", "rollForward": "latestMajor" } } From b663b569a08c2e2511822c22db50af25b7761054 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Sat, 2 Oct 2021 17:54:34 +0200 Subject: [PATCH 5/5] fix sdk --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index e7f020cb2..fb3a5b9c9 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -6,8 +6,8 @@ steps: - task: UseDotNet@2 inputs: - version: 5.0.101 - displayName: Install .NET Core SDK 5.0.101 + version: 5.0.401 + displayName: Install .NET Core SDK 5.0.401 - script: dotnet restore displayName: Restore packages