diff --git a/src/tests/GC/API/GCSettings/ILatencyTest.cs b/src/tests/GC/API/GCSettings/ILatencyTest.cs
deleted file mode 100644
index 1587f4bb7119d9..00000000000000
--- a/src/tests/GC/API/GCSettings/ILatencyTest.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Runtime;
-
-namespace GCLatencyTest
-{
- public interface ILatencyTest
- {
- void Test();
- bool Pass(GCLatencyMode gcMode, int numCollections);
- void Cleanup();
- }
-}
diff --git a/src/tests/GC/API/GCSettings/ILatencyTest.csproj b/src/tests/GC/API/GCSettings/ILatencyTest.csproj
deleted file mode 100644
index dc0908480ec298..00000000000000
--- a/src/tests/GC/API/GCSettings/ILatencyTest.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- Library
- true
-
-
-
-
-
diff --git a/src/tests/GC/API/GCSettings/InducedGen0GC.cs b/src/tests/GC/API/GCSettings/InducedGen0GC.cs
index a8366fd57249e4..193444010cd34c 100644
--- a/src/tests/GC/API/GCSettings/InducedGen0GC.cs
+++ b/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);
}
}
}
diff --git a/src/tests/GC/API/GCSettings/InducedGen0GC.csproj b/src/tests/GC/API/GCSettings/InducedGen0GC.csproj
index dc3c4c13e5b021..d35d9001b13aec 100644
--- a/src/tests/GC/API/GCSettings/InducedGen0GC.csproj
+++ b/src/tests/GC/API/GCSettings/InducedGen0GC.csproj
@@ -1,12 +1,10 @@
- Library
- true
+
+ true
+ 1
-
-
-
-
+
diff --git a/src/tests/GC/API/GCSettings/InducedGen1GC.cs b/src/tests/GC/API/GCSettings/InducedGen1GC.cs
index 9c464a723a0bb6..c57a89e765740c 100644
--- a/src/tests/GC/API/GCSettings/InducedGen1GC.cs
+++ b/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);
}
}
}
diff --git a/src/tests/GC/API/GCSettings/InducedGen1GC.csproj b/src/tests/GC/API/GCSettings/InducedGen1GC.csproj
index aeb89fc5b03d72..d35d9001b13aec 100644
--- a/src/tests/GC/API/GCSettings/InducedGen1GC.csproj
+++ b/src/tests/GC/API/GCSettings/InducedGen1GC.csproj
@@ -1,12 +1,10 @@
- Library
- true
+
+ true
+ 1
-
-
-
-
+
diff --git a/src/tests/GC/API/GCSettings/InducedGen2GC.cs b/src/tests/GC/API/GCSettings/InducedGen2GC.cs
index 5657f604a00483..80909b0d3913bd 100644
--- a/src/tests/GC/API/GCSettings/InducedGen2GC.cs
+++ b/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);
}
}
}
diff --git a/src/tests/GC/API/GCSettings/InducedGen2GC.csproj b/src/tests/GC/API/GCSettings/InducedGen2GC.csproj
index 5cb87d14e5d124..d35d9001b13aec 100644
--- a/src/tests/GC/API/GCSettings/InducedGen2GC.csproj
+++ b/src/tests/GC/API/GCSettings/InducedGen2GC.csproj
@@ -1,12 +1,10 @@
- Library
- true
+
+ true
+ 1
-
-
-
-
+
diff --git a/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.cs b/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.cs
deleted file mode 100644
index 237c6d71232d46..00000000000000
--- a/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Reflection;
-
-namespace ManagedTest
-{
- public interface IManagedTest
- {
- void Foo();
- }
-
- public class ManagedTest : IManagedTest
- {
- public void Foo()
- {
- Console.WriteLine("ManagedTest successfully run!");
- }
- }
-}
diff --git a/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj b/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj
deleted file mode 100644
index c002f728d74fec..00000000000000
--- a/src/tests/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Library
- true
- true
-
-
-
-
-
diff --git a/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.cs b/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.cs
deleted file mode 100644
index 06b9508646c5a6..00000000000000
--- a/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Reflection;
-
-public class Managed
-{
- public static int Foo(String s)
- {
- int count = GC.CollectionCount(GC.MaxGeneration);
- Console.WriteLine(count);
- return count;
- }
-}
-
diff --git a/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.csproj b/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.csproj
deleted file mode 100644
index 9efb276b0d8662..00000000000000
--- a/src/tests/GC/Regressions/v2.0-beta2/485617/Managed.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Library
- true
- true
-
-
-
-
-
diff --git a/src/tests/GC/Scenarios/Boxing/doubLink.cs b/src/tests/GC/Scenarios/Boxing/doubLink.cs
deleted file mode 100644
index 2237d0c41183db..00000000000000
--- a/src/tests/GC/Scenarios/Boxing/doubLink.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-
-using System;
-
-
-namespace GCVariant
-{
- public class DoubLink
- {
- internal DLinkNode[] Mv_DLink;
-
- public DoubLink(int Num) : this(Num, false)
- {
- }
-
- public DoubLink(int Num, bool large)
- {
- Mv_DLink = new DLinkNode[Num];
-
- if (Num == 0)
- {
- return;
- }
-
- if (Num == 1)
- {
- // only one element
- Mv_DLink[0] = new DLinkNode((large ? 256 : 1), Mv_DLink[0], Mv_DLink[0]);
- return;
- }
-
- // first element
- Mv_DLink[0] = new DLinkNode((large ? 256 : 1), Mv_DLink[Num - 1], Mv_DLink[1]);
-
- // all elements in between
- for (int i = 1; i < Num - 1; i++)
- {
- Mv_DLink[i] = new DLinkNode((large ? 256 : i + 1), Mv_DLink[i - 1], Mv_DLink[i + 1]);
- }
-
- // last element
- Mv_DLink[Num - 1] = new DLinkNode((large ? 256 : Num), Mv_DLink[Num - 2], Mv_DLink[0]);
- }
-
-
- public int NodeNum
- {
- get
- {
- return Mv_DLink.Length;
- }
- }
- }
-
- public class DLinkNode
- {
- // disabling unused variable warning
-#pragma warning disable 0414
- internal DLinkNode Last;
- internal DLinkNode Next;
-#pragma warning restore 0414
-
- internal int[] Size;
-
- public DLinkNode(int SizeNum, DLinkNode LastObject, DLinkNode NextObject)
- {
- Last = LastObject;
- Next = NextObject;
- Size = new int[SizeNum * 1024];
- Size[0] = 1;
- Size[SizeNum * 1024 - 1] = 2;
- }
- }
-}
diff --git a/src/tests/GC/Scenarios/Boxing/doubLink.csproj b/src/tests/GC/Scenarios/Boxing/doubLink.csproj
deleted file mode 100644
index 7935f8f6da6eec..00000000000000
--- a/src/tests/GC/Scenarios/Boxing/doubLink.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Library
- true
- true
-
-
-
-
-
diff --git a/src/tests/GC/Scenarios/DoublinkList/DoubLink_V2.csproj b/src/tests/GC/Scenarios/DoublinkList/DoubLink_V2.csproj
deleted file mode 100644
index 7601e49ea82839..00000000000000
--- a/src/tests/GC/Scenarios/DoublinkList/DoubLink_V2.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Library
- true
- true
-
-
-
-
-
diff --git a/src/tests/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj b/src/tests/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj
deleted file mode 100644
index 3a56650ac2b3ab..00000000000000
--- a/src/tests/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- true
-
-
- false
-
- true
- 1
-
-
-
-
-
-
-
-