add info message (MergeWith)

coverlet-coverage · Jan 29, 2024 · 4ed2e25 · 4ed2e25
1 parent 14f5446
commit 4ed2e25
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -53,6 +53,20 @@
     <MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
     <SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
     <SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
+
+    <!-- msBuild task with dependencies https://natemcmaster.com/blog/2017/11/11/msbuild-task-with-dependencies/
+       Aligning versions with MSBuild
+       If you need a dependency that is also used in MSBuild itself, you have to align with the version MSBuild uses.
+       This includes System.Reflection.Metadata, System.Collections.Immutable, NuGet, Newtonsoft.Json, and others.
+       See example: dependencies.props (https://github.com/aspnet/BuildTools/blob/1f3f14382764e06b7e691e5ee89d12a280249284/build/dependencies.props#L19-L29)
+
+       .NET 8.0.3xx core-sdk-tasks https://github.com/dotnet/installer/blob/release/8.0.3xx/src/core-sdk-tasks/core-sdk-tasks.csproj       
+     -->
+    <MicrosoftBuildTaskVersion>15.7.179</MicrosoftBuildTaskVersion>
+    <MicrosoftBuildTaskUtilitiesCoreVersion>15.7.179</MicrosoftBuildTaskUtilitiesCoreVersion>
+    <NuGetBuildTasksPackageVersion>6.9.0-rc.86</NuGetBuildTasksPackageVersion>
+    <MicrosoftBuildTaskSystemReflectionMetaData>1.4.2</MicrosoftBuildTaskSystemReflectionMetaData> <!-- 1.4.2 ???-->
+    <!--<MicrosoftBuildTaskSystemCollectionImmutable>1.5.0</MicrosoftBuildTaskSystemCollectionImmutable>--> <!-- >= 1.3.1 -->
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -29,6 +29,7 @@
          vstest 17.8 version
          NuGetFrameworksVersion is defined here https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/eng/Versions.props#L94C1-L94C1
     -->
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NuGet.Frameworks" Version="6.8.0" />
     <PackageVersion Include="NuGet.Packaging" Version="6.8.0" />
     <PackageVersion Include="NuGet.Versioning" Version="6.8.0" />

diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs
@@ -315,11 +315,11 @@ public CoverageResult GetCoverageResult()
       {
         if (_fileSystem.Exists(_parameters.MergeWith))
         {
+          _logger.LogInformation($"MergeWith: '{_parameters.MergeWith}'");
           string json = _fileSystem.ReadAllText(_parameters.MergeWith);
           coverageResult.Merge(JsonSerializer.Deserialize<Modules>(json));
         } else
         {
-          //_logger.LogError($"MergeWith - file '{_parameters.MergeWith}' does not exist");
           throw new ArgumentException($"MergeWith - file '{_parameters.MergeWith}' does not exist");
         }
       }