GC test cleanup

src/tests/GC/API/GCSettings/InducedGen0GC.cs

@@ -3,26 +3,19 @@
 
 using System;
 using System.Runtime;
+using Xunit;
 
 namespace GCLatencyTest
 {
-    public class InducedGen0GC : ILatencyTest
+    public class InducedGen0GC
     {
-        private int _numGen0Collections = 0;
-        public void Test()
+        [Fact]
+        public static void Test()
         {
-            _numGen0Collections = GC.CollectionCount(0);
+            int _numCollections = GC.CollectionCount(0);
             GC.Collect(0);
-            _numGen0Collections = GC.CollectionCount(0) - _numGen0Collections;
-        }
-
-        public void Cleanup()
-        {
-        }
-
-        public bool Pass(GCLatencyMode gcMode, int numCollections)
-        {
-            return (_numGen0Collections > 0);
+            _numCollections = GC.CollectionCount(0) - _numCollections;
+            Assert.True(_numCollections > 0);
         }
     }
 }

src/tests/GC/API/GCSettings/InducedGen0GC.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Some GC testing still requires this for all tests -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+    <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="InducedGen0GC.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ILatencyTest.csproj" />
+    <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
 </Project>

src/tests/GC/API/GCSettings/InducedGen1GC.cs

@@ -3,26 +3,19 @@
 
 using System;
 using System.Runtime;
+using Xunit;
 
 namespace GCLatencyTest
 {
-    public class InducedGen1GC : ILatencyTest
+    public class InducedGen1GC
     {
-        private int _numGen1Collections = 0;
-        public void Test()
+        [Fact]
+        public static void Test()
         {
-            _numGen1Collections = GC.CollectionCount(1);
+            int _numCollections = GC.CollectionCount(1);
             GC.Collect(1);
-            _numGen1Collections = GC.CollectionCount(1) - _numGen1Collections;
-        }
-
-        public void Cleanup()
-        {
-        }
-
-        public bool Pass(GCLatencyMode gcMode, int numCollections)
-        {
-            return (_numGen1Collections > 0);
+            _numCollections = GC.CollectionCount(1) - _numCollections;
+            Assert.True(_numCollections > 0);
         }
     }
 }

src/tests/GC/API/GCSettings/InducedGen1GC.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Some GC testing still requires this for all tests -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+    <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="InducedGen1GC.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ILatencyTest.csproj" />
+    <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
 </Project>

src/tests/GC/API/GCSettings/InducedGen2GC.cs

@@ -3,23 +3,19 @@
 
 using System;
 using System.Runtime;
+using Xunit;
 
 namespace GCLatencyTest
 {
-    public class InducedGen2GC : ILatencyTest
+    public class InducedGen2GC
     {
-        public void Test()
+        [Fact]
+        public static void Test()
         {
+            int _numCollections = GC.CollectionCount(2);
             GC.Collect();
-        }
-
-        public void Cleanup()
-        {
-        }
-
-        public bool Pass(GCLatencyMode gcMode, int numCollections)
-        {
-            return (numCollections > 0);
+            _numCollections = GC.CollectionCount(2) - _numCollections;
+            Assert.True(_numCollections > 0);
         }
     }
 }

src/tests/GC/API/GCSettings/InducedGen2GC.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Some GC testing still requires this for all tests -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
+    <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="InducedGen2GC.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="ILatencyTest.csproj" />
+    <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
 </Project>