changed test

Author: daveMueller

Documentation/Changelog.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+-Fix problem with coverage for .net5 WPF application [#1221](https://github.com/coverlet-coverage/coverlet/issues/1221) by https://github.com/lg2de
+-Fix unable to instrument module for Microsoft.AspNetCore.Mvc.Razor [#1459](https://github.com/coverlet-coverage/coverlet/issues/1459) by https://github.com/lg2de 
+
 ## Release date 2023-05-21
 ### Packages  
 coverlet.msbuild 6.0.0  

src/coverlet.core/Instrumentation/CecilAssemblyResolver.cs

@@ -77,9 +77,9 @@ public NetstandardAwareAssemblyResolver(string modulePath, ILogger logger)
             _compositeResolver = new Lazy<CompositeCompilationAssemblyResolver>(() => new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]
             {
                 new AppBaseCompilationAssemblyResolver(),
-                new PackageCompilationAssemblyResolver(),
                 new NetCoreSharedFrameworkResolver(modulePath, _logger),
                 new ReferenceAssemblyPathResolver(),
+                new PackageCompilationAssemblyResolver(),
             }), true);
         }
 

test/coverlet.core.tests/Instrumentation/ModuleTrackerTemplateTests.cs

@@ -123,26 +123,24 @@ public void MutexBlocksMultipleWriters()
             FunctionExecutor.Run(async () =>
             {
                 using var ctx = new TrackerContext();
-                using (var mutex = new Mutex(
-                true, Path.GetFileNameWithoutExtension(ModuleTrackerTemplate.HitsFilePath) + "_Mutex", out bool createdNew))
-                {
-                    Assert.True(createdNew);
+                using var mutex = new Mutex(
+                    true, Path.GetFileNameWithoutExtension(ModuleTrackerTemplate.HitsFilePath) + "_Mutex", out bool createdNew);
+                Assert.True(createdNew);
 
-                    ModuleTrackerTemplate.HitsArray = new[] { 0, 1, 2, 3 };
-                    var unloadTask = Task.Run(() => ModuleTrackerTemplate.UnloadModule(null, null));
+                ModuleTrackerTemplate.HitsArray = new[] { 0, 1, 2, 3 };
+                var unloadTask = Task.Run(() => ModuleTrackerTemplate.UnloadModule(null, null));
 
-                    Assert.False(unloadTask.Wait(5));
+                Assert.False(unloadTask.Wait(5));
 
-                    WriteHitsFile(new[] { 0, 3, 2, 1 });
+                WriteHitsFile(new[] { 0, 3, 2, 1 });
 
-                    Assert.False(unloadTask.Wait(5));
+                Assert.False(unloadTask.Wait(5));
 
-                    mutex.ReleaseMutex();
-                    await unloadTask;
+                mutex.ReleaseMutex();
+                await unloadTask;
 
-                    int[] expectedHitsArray = new[] { 0, 4, 4, 4 };
-                    Assert.Equal(expectedHitsArray, ReadHitsFile());
-                }
+                int[] expectedHitsArray = new[] { 0, 4, 4, 4 };
+                Assert.Equal(expectedHitsArray, ReadHitsFile());
 
                 return 0;
             });

test/coverlet.integration.tests/WpfResolverTests.cs

@@ -17,8 +17,8 @@ namespace coverlet.integration.tests
     public class WpfResolverTests : BaseTest
     {
         [ConditionalFact]
-        [SkipOnOS(OS.Linux, "Windows path format only")]
-        [SkipOnOS(OS.MacOS, "Windows path format only")]
+        [SkipOnOS(OS.Linux, "WPF only runs on Windows")]
+        [SkipOnOS(OS.MacOS, "WPF only runs on Windows")]
         public void TestInstrument_NetCoreSharedFrameworkResolver()
         {
             string wpfProjectPath = "../../../../coverlet.tests.projectsample.wpf";

test/coverlet.tests.projectsample.wpf/App.xaml

@@ -0,0 +1,14 @@
+// Copyright (c) Toni Solarin-Sodara
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Windows.Controls;
+
+namespace coverlet.tests.projectsample.wpf
+{
+    public class TestClass
+    {
+        public static void Main(){}
+
+        public UserControl Control { get; set; } = null!;
+    }
+}