Modify MRT Core UnpackagedTests clean-up, and reorganize test reporting (#870)

This change modifies the MRT Core UnpackagedTests to unblock running on my local PC.
It also improves how the tests are reported in the Azure DevOps UI.

Author: jefgen

build/build-mrt.yml

@@ -124,33 +124,40 @@ steps:
     artifactName: binlogs
 
 - task: VSTest@2
-  displayName: 'test MRT (Managed)'
+  displayName: 'test MRT: ManagedTests'
   condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
   inputs:
     testSelector: 'testAssemblies'
-    testAssemblyVer2: |
-      **\ManagedTest.build.appxrecipe
-    searchFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)'
-    testRunTitle: 'test MRT $(buildPlatform)'
+    testAssemblyVer2: '**\ManagedTest.build.appxrecipe'
+    searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\ManagedTest'
+    testRunTitle: 'test MRT: ManagedTests - $(buildPlatform)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
 - task: VSTest@2
-  displayName: 'test MRT'
+  displayName: 'test MRT: UnitTests'
   condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
   inputs:
     testSelector: 'testAssemblies'
-    testAssemblyVer2: |
-      **\*test*.dll
-      !**\*TestAdapter.dll
-      !**\TE.*.dll
-      !**\obj\**
-      !**\MrtCoreUnpackagedTests.dll
-    searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)'
-    testRunTitle: 'test MRT $(buildPlatform)'
+    testAssemblyVer2: '**\UnitTest.dll'
+    searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\UnitTest'
+    testRunTitle: 'test MRT: UnitTests - $(buildPlatform)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
+- task: VSTest@2
+  displayName: 'test MRT: BaseUnitTests'
+  condition: and(succeeded(), or(eq(variables['buildPlatform'], 'x86'), eq(variables['buildPlatform'], 'x64')))
+  inputs:
+    testSelector: 'testAssemblies'
+    testAssemblyVer2: '**\BaseUnitTests.dll'
+    searchFolder: '${{ parameters.MRTBinariesDirectory }}\$(buildConfiguration)\$(buildPlatform)\BaseUnitTests'
+    testRunTitle: 'test MRT: BaseUnitTests - $(buildPlatform)'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+# Note: The MRT Unpackaged tests currently do not work in the CI pipeline.
+
 - task: ComponentGovernanceComponentDetection@0
   inputs:
     scanType: 'Register'

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/UnpackagedTests/TestClass.cs

@@ -111,11 +111,26 @@ public class TestClass
         [AssemblyInitialize]
         public static void ModuleSetup(TestContext testContext)
         {
-            // Cleanup just in case
+            // Clean up any left over files just in case
             File.Delete(Path.Combine(m_assemblyFolder, "resources.pri"));
             File.Delete(Path.Combine(m_assemblyFolder, "te.processhost.pri"));
         }
 
+        [TestCleanup]
+        public static void TestCleanup()
+        {
+            GC.Collect(); // Force any ResourceManager objects to be cleaned up.
+
+            if (File.Exists(Path.Combine(m_assemblyFolder, "resources.pri")))
+            {
+                File.Delete(Path.Combine(m_assemblyFolder, "resources.pri"));
+            }
+            if (File.Exists(Path.Combine(m_assemblyFolder, "te.processhost.pri")))
+            {
+                File.Delete(Path.Combine(m_assemblyFolder, "te.processhost.pri"));
+            }            
+        }
+
         [TestMethod]
         public void DefaultResourceManager()
         {
@@ -140,8 +155,6 @@ public void DefaultResourceManagerWithResourcePri()
             Verify.AreNotEqual(map.ResourceCount, 0u);
             var resource = map.GetValue("IDS_MANIFEST_MUSIC_APP_NAME").ValueAsString;
             Verify.AreEqual(resource, "Groove Music");
-
-            File.Delete(Path.Combine(m_assemblyFolder, "resources.pri"));
         }
 
         [TestMethod]
@@ -155,8 +168,6 @@ public void DefaultResourceManagerWithExePri()
             Verify.AreNotEqual(map.ResourceCount, 0u);
             var resource = map.GetValue("IDS_MANIFEST_MUSIC_APP_NAME").ValueAsString;
             Verify.AreEqual(resource, "Groove Music");
-
-            File.Delete(Path.Combine(m_assemblyFolder, "te.processhost.pri"));
         }
 
         [TestMethod]