Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbomer merged 11 commits into from
Apr 21, 2026
Merged

Convert Mono.Linker.Tests from MSTest to xUnit #126613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8314aa
Initial plan
Copilot Apr 7, 2026
69624e3
Convert Mono.Linker.Tests from MSTest to xUnit
Copilot Apr 7, 2026
44f5c43
Address code review: use Assert.Equal instead of Assert.True for equa…
Copilot Apr 7, 2026
3ae7049
Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…
Copilot Apr 7, 2026
7d45ae1
Merge branch 'main' into copilot/convert-illink-tests-to-xunit
sbomer Apr 14, 2026
af28fac
Convert ILTrim.Tests from MSTest to xUnit
sbomer Apr 15, 2026
7a6f1ba
Apply code review suggestions: fix Assert.Equal argument order and im…
Copilot Apr 15, 2026
1f24d86
Convert ILTrim.Tests from MSTest to xUnit
sbomer Apr 15, 2026
2037bd6
Add ThrowingTraceListener to prevent Debug.Assert from crashing test …
sbomer Apr 16, 2026
b0154e0
Apply code review suggestions: improve diagnostic messages and fix As…
Copilot Apr 16, 2026
d5455d5
Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…
Copilot Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
<IsPackable>false</IsPackable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>x64;x86</Platforms>
<TestRunnerName>MSTest</TestRunnerName>
<!-- Suppress analyzer warnings in old prototype code -->
<NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

<PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
<ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down
179 changes: 89 additions & 90 deletions src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
[TestClass]
public class All
{
static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
}

[TestMethod]
[DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
public void BasicTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
public void AdvancedTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
public void AttributesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
public void ComponentModelTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
public void CoreLinkTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
public void DataFlowTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
public void FunctionPointerTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
public void GenericsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
public void InlineArrayTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
public void InteropTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
public void LibrariesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
public void LinkAttributesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
public void LoggingTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
public void ReferencesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
public void ReflectionTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
public void ResourcesTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
public void SealerTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
public void SerializationTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
public void SingleFileTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
public void StaticsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
public void SubstitutionsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
public void SymbolsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
public void TestFrameworkTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
public void TracingTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
public void TypeForwardingTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
public void WarningsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
public void XmlTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

[TestMethod]
[DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
[ConditionalTheory]
[MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
public void MetadataTests(TestCase testCase) => Run(testCase);

protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
}
catch (Exception ex) when (isExpectedFailure)
{
Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
return;
throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
}

if (isExpectedFailure)
Expand Down
7 changes: 4 additions & 3 deletions src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
{
partial void IgnoreTest(string reason)
{
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
}

private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
}
catch (AggregateException e)
{
if (e.InnerException is UnitTestAssertException)
if (e.InnerException is XunitException)
throw e.InnerException;

throw;
Expand Down
42 changes: 42 additions & 0 deletions src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
/// <summary>
/// Replaces the default trace listener so that Debug.Assert failures throw
/// an exception instead of calling Environment.FailFast. This allows the
/// expected-failure mechanism in TestSuites to catch and skip known ILTrim
/// limitations instead of crashing the entire test runner process.
/// </summary>
internal sealed class ThrowingTraceListener : TraceListener
{
public override void Fail(string? message, string? detailMessage)
{
throw new DebugAssertException(
message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
}

public override void Write(string? message) { }
public override void WriteLine(string? message) { }
}

internal sealed class DebugAssertException : Exception
{
public DebugAssertException(string? message) : base(message) { }
}

internal static class TraceListenerSetup
{
[ModuleInitializer]
internal static void Initialize()
{
Trace.Listeners.Clear();
Trace.Listeners.Add(new ThrowingTraceListener());
}
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Convert Mono.Linker.Tests from MSTest to xUnit#126613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

sbomer
merged 11 commits into

from

Apr 21, 2026
 Merged


Convert Mono.Linker.Tests from MSTest to xUnit
#126613
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
c8314aa

Initial plan


Copilot Apr 7, 2026
69624e3

Convert Mono.Linker.Tests from MSTest to xUnit


Copilot Apr 7, 2026
44f5c43

Address code review: use Assert.Equal instead of Assert.True for equa…


Copilot Apr 7, 2026
3ae7049

Use SkipOnTargetFrameworkAttribute instead of SkipTestException in Co…


Copilot Apr 7, 2026
7d45ae1

Merge branch 'main' into copilot/convert-illink-tests-to-xunit


sbomer Apr 14, 2026
af28fac

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
7a6f1ba

Apply code review suggestions: fix Assert.Equal argument order and im…


Copilot Apr 15, 2026
1f24d86

Convert ILTrim.Tests from MSTest to xUnit


sbomer Apr 15, 2026
2037bd6

Add ThrowingTraceListener to prevent Debug.Assert from crashing test …


sbomer Apr 16, 2026
b0154e0

Apply code review suggestions: improve diagnostic messages and fix As…


Copilot Apr 16, 2026
d5455d5

Fix Single/SingleOrDefault and restore diagnostic messages in ResultC…


Copilot Apr 17, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrim.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,13 @@
 <IsPackable>false</IsPackable>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 <Platforms>x64;x86</Platforms>
 <TestRunnerName>MSTest</TestRunnerName>
 <!-- Suppress analyzer warnings in old prototype code -->
 <NoWarn>$(NoWarn);CS8602;CS8604</NoWarn>
 </PropertyGroup>

 <ItemGroup>
 <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
 <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

 <PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
 <ProjectReference Include="../ILTrim.Core/ILTrim.Core.csproj" />
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tools/ILTrim.Tests/ILTrimExpectedFailures.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,7 +178,7 @@ Generics.MdArrayVariantCasting
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameter
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase
Generics.MethodWithParameterWhichHasGenericParametersAndOverrideUsesADifferentNameForGenericParameterNestedCase2
Generics.NewConstraintOnClass
Generics.GenericConstraints
Generics.UnresolvedGenerics
Generics.VariantCasting
Inheritance.AbstractClasses.NoKeptCtor.OverrideRemoval.CanDisableOverrideRemoval
Expand Down

179 changes: 89 additions & 90 deletions
src/coreclr/tools/ILTrim.Tests/TestCases/TestSuites.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,12 @@
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit;
using Mono.Linker.Tests.TestCasesRunner;

namespace Mono.Linker.Tests.TestCases
{
 [TestClass]
 public class All
 {
 static readonly HashSet<string> s_expectedFailures = LoadExpectedFailures();
Expand All@@ -26,176 +26,176 @@ static HashSet<string> LoadExpectedFailures()
 return new HashSet<string>(File.ReadAllLines(resourcePath), StringComparer.Ordinal);
 }

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BasicTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BasicTests), MemberType = typeof(TestDatabase))]
 public void BasicTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AdvancedTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AdvancedTests), MemberType = typeof(TestDatabase))]
 public void AdvancedTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeDebuggerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeDebuggerTests), MemberType = typeof(TestDatabase))]
 public void AttributesDebuggerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributesStructLayoutTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributesStructLayoutTests), MemberType = typeof(TestDatabase))]
 public void AttributesStructLayoutTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.AttributeTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.AttributeTests), MemberType = typeof(TestDatabase))]
 public void AttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.BCLFeaturesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.BCLFeaturesTests), MemberType = typeof(TestDatabase))]
 public void BCLFeaturesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ComponentModelTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ComponentModelTests), MemberType = typeof(TestDatabase))]
 public void ComponentModelTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.CoreLinkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.CoreLinkTests), MemberType = typeof(TestDatabase))]
 public void CoreLinkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DataFlowTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DataFlowTests), MemberType = typeof(TestDatabase))]
 public void DataFlowTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.DynamicDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.DynamicDependenciesTests), MemberType = typeof(TestDatabase))]
 public void DynamicDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FeatureSettingsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FeatureSettingsTests), MemberType = typeof(TestDatabase))]
 public void FeatureSettingsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.FunctionPointersTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.FunctionPointersTests), MemberType = typeof(TestDatabase))]
 public void FunctionPointerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.GenericsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.GenericsTests), MemberType = typeof(TestDatabase))]
 public void GenericsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceAbstractClassTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceAbstractClassTests), MemberType = typeof(TestDatabase))]
 public void InheritanceAbstractClassTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceComplexTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceComplexTests), MemberType = typeof(TestDatabase))]
 public void InheritanceComplexTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceInterfaceTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceInterfaceTests), MemberType = typeof(TestDatabase))]
 public void InheritanceInterfaceTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InheritanceVirtualMethodsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InheritanceVirtualMethodsTests), MemberType = typeof(TestDatabase))]
 public void InheritanceVirtualMethodsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InlineArrayTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InlineArrayTests), MemberType = typeof(TestDatabase))]
 public void InlineArrayTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.InteropTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.InteropTests), MemberType = typeof(TestDatabase))]
 public void InteropTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LibrariesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LibrariesTests), MemberType = typeof(TestDatabase))]
 public void LibrariesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinkAttributesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinkAttributesTests), MemberType = typeof(TestDatabase))]
 public void LinkAttributesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LoggingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LoggingTests), MemberType = typeof(TestDatabase))]
 public void LoggingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.PreserveDependenciesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.PreserveDependenciesTests), MemberType = typeof(TestDatabase))]
 public void PreserveDependenciesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReferencesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReferencesTests), MemberType = typeof(TestDatabase))]
 public void ReferencesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ReflectionTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ReflectionTests), MemberType = typeof(TestDatabase))]
 public void ReflectionTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.RequiresCapabilityTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.RequiresCapabilityTests), MemberType = typeof(TestDatabase))]
 public void RequiresCapabilityTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.ResourcesTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.ResourcesTests), MemberType = typeof(TestDatabase))]
 public void ResourcesTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SealerTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SealerTests), MemberType = typeof(TestDatabase))]
 public void SealerTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SerializationTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SerializationTests), MemberType = typeof(TestDatabase))]
 public void SerializationTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SingleFileTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SingleFileTests), MemberType = typeof(TestDatabase))]
 public void SingleFileTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.StaticsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.StaticsTests), MemberType = typeof(TestDatabase))]
 public void StaticsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SubstitutionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SubstitutionsTests), MemberType = typeof(TestDatabase))]
 public void SubstitutionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.SymbolsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.SymbolsTests), MemberType = typeof(TestDatabase))]
 public void SymbolsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TestFrameworkTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TestFrameworkTests), MemberType = typeof(TestDatabase))]
 public void TestFrameworkTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TopLevelStatementsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TopLevelStatementsTests), MemberType = typeof(TestDatabase))]
 public void TopLevelStatementsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TracingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TracingTests), MemberType = typeof(TestDatabase))]
 public void TracingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.TypeForwardingTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.TypeForwardingTests), MemberType = typeof(TestDatabase))]
 public void TypeForwardingTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBlockTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBlockTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBlockTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.UnreachableBodyTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.UnreachableBodyTests), MemberType = typeof(TestDatabase))]
 public void UnreachableBodyTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.WarningsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.WarningsTests), MemberType = typeof(TestDatabase))]
 public void WarningsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.XmlTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.XmlTests), MemberType = typeof(TestDatabase))]
 public void XmlTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.LinqExpressionsTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.LinqExpressionsTests), MemberType = typeof(TestDatabase))]
 public void LinqExpressionsTests(TestCase testCase) => Run(testCase);

 [TestMethod]
 [DynamicData(nameof(TestDatabase.MetadataTests), typeof(TestDatabase))]
 [ConditionalTheory]
 [MemberData(nameof(TestDatabase.MetadataTests), MemberType = typeof(TestDatabase))]
 public void MetadataTests(TestCase testCase) => Run(testCase);

 protected virtual void Run(TestCase testCase)
Expand All@@ -210,8 +210,7 @@ protected virtual void Run(TestCase testCase)
 }
 catch (Exception ex) when (isExpectedFailure)
 {
 Assert.Inconclusive($"Known ILTrim limitation: {ex.Message}");
 return;
 throw new SkipTestException($"Known ILTrim limitation: {ex.Message}");
 }

 if (isExpectedFailure)
Expand Down

7 changes: 4 additions & 3 deletions
src/coreclr/tools/ILTrim.Tests/TestCasesRunner/TestRunner.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,8 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.DotNet.XUnitExtensions;
using Xunit.Sdk;
using Mono.Linker.Tests.Extensions;

namespace Mono.Linker.Tests.TestCasesRunner
Expand All@@ -13,7 +14,7 @@ public partial class TestRunner
 {
 partial void IgnoreTest(string reason)
 {
Assert.Inconclusive(reason);
throw new SkipTestException(reason);
 }

 private partial IEnumerable<string>? GetAdditionalDefines() => null;
Expand All@@ -26,7 +27,7 @@ private static T GetResultOfTaskThatMakesAssertions<T>(Task<T> task)
 }
 catch (AggregateException e)
 {
 if (e.InnerException is UnitTestAssertException)
 if (e.InnerException is XunitException)
 throw e.InnerException;

 throw;
Expand Down

42 changes: 42 additions & 0 deletions
src/coreclr/tools/ILTrim.Tests/ThrowingTraceListener.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
// 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.Diagnostics;
using System.Runtime.CompilerServices;

namespace ILTrim.Tests
{
 /// <summary>
 /// Replaces the default trace listener so that Debug.Assert failures throw
 /// an exception instead of calling Environment.FailFast. This allows the
 /// expected-failure mechanism in TestSuites to catch and skip known ILTrim
 /// limitations instead of crashing the entire test runner process.
 /// </summary>
 internal sealed class ThrowingTraceListener : TraceListener
 {
 public override void Fail(string? message, string? detailMessage)
 {
 throw new DebugAssertException(
 message + (detailMessage is null ? "" : Environment.NewLine + detailMessage));
 }

 public override void Write(string? message) { }
 public override void WriteLine(string? message) { }
 }

 internal sealed class DebugAssertException : Exception
 {
 public DebugAssertException(string? message) : base(message) { }
 }

 internal static class TraceListenerSetup
 {
 [ModuleInitializer]
 internal static void Initialize()
 {
 Trace.Listeners.Clear();
 Trace.Listeners.Add(new ThrowingTraceListener());
 }
 }
}
Loading
Loading