Skip to content

refactor: replace TypeReference with TypeInfo across metadata classes #3328

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
merged 4 commits into from
Oct 10, 2025
Merged

refactor: replace TypeReference with TypeInfo across metadata classes #3328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a8d0cd
refactor: replace TypeReference with TypeInfo across metadata classes
thomhurst Oct 7, 2025
2a7f2e0
Merge branch 'main' into feature/rework-type-info
thomhurst Oct 10, 2025
860c765
fix: update Microsoft.Testing package versions to 1.9.0 and refactor …
thomhurst Oct 10, 2025
d3a581f
fix: refactor TypeInfo handling in GenericMethodTests to use Construc…
thomhurst Oct 10, 2025
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
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<PackageVersion Include="Microsoft.Playwright" Version="1.55.0" />
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="9.0.305" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="2.0.0" />
<PackageVersion Include="Microsoft.Testing.Platform" Version="2.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="1.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="1.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="1.9.0" />
<PackageVersion Include="Microsoft.Testing.Platform" Version="1.9.0" />
<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="1.4.3" />
<PackageVersion Include="System.Threading.Channels" Version="9.0.0" />
<PackageVersion Include="ModularPipelines.DotNet" Version="2.47.8" />
Expand Down Expand Up @@ -93,4 +93,4 @@
<PackageVersion Include="xunit.v3.assert" Version="3.1.0" />
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.1.0" />
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete1.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ internal sealed class ConcreteClass1_AssertClassName_TestSource_GUID : global::T
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
Name = "AssertClassName",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass1", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass1, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1)),
Name = "ConcreteClass1",
Namespace = "TUnit.TestProject.AbstractTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down
24 changes: 12 additions & 12 deletions TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ internal sealed class ConcreteClass2_SecondTest_TestSource_GUID : global::TUnit.
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
Name = "SecondTest",
GenericTypeCount = 0,
ReturnType = typeof(void),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("void, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
Name = "ConcreteClass2",
Namespace = "TUnit.TestProject.AbstractTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down Expand Up @@ -111,18 +111,18 @@ internal sealed class ConcreteClass2_AssertClassName_TestSource_GUID : global::T
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
Name = "AssertClassName",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
Name = "ConcreteClass2",
Namespace = "TUnit.TestProject.AbstractTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down Expand Up @@ -192,18 +192,18 @@ internal sealed class ConcreteClass2_SecondTest_TestSource_GUID : global::TUnit.
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
Name = "SecondTest",
GenericTypeCount = 0,
ReturnType = typeof(void),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("void, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(void)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass2", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass2, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2)),
Name = "ConcreteClass2",
Namespace = "TUnit.TestProject.AbstractTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down Expand Up @@ -273,18 +273,18 @@ internal sealed class ConcreteClass1_AssertClassName_TestSource_GUID : global::T
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.AbstractBaseClass, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.AbstractBaseClass)),
Name = "AssertClassName",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AbstractTests.ConcreteClass1", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AbstractTests.ConcreteClass1, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1)),
Name = "ConcreteClass1",
Namespace = "TUnit.TestProject.AbstractTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down
12 changes: 6 additions & 6 deletions TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ internal sealed class CleanupTests_Test1_TestSource_GUID : global::TUnit.Core.In
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "Test1",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "CleanupTests",
Namespace = "TUnit.TestProject.AfterTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down Expand Up @@ -106,18 +106,18 @@ internal sealed class CleanupTests_Test2_TestSource_GUID : global::TUnit.Core.In
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "Test2",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "CleanupTests",
Namespace = "TUnit.TestProject.AfterTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down
12 changes: 6 additions & 6 deletions TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ internal sealed class CleanupTests_Test1_TestSource_GUID : global::TUnit.Core.In
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "Test1",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "CleanupTests",
Namespace = "TUnit.TestProject.AfterTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down Expand Up @@ -106,18 +106,18 @@ internal sealed class CleanupTests_Test2_TestSource_GUID : global::TUnit.Core.In
MethodMetadata = new global::TUnit.Core.MethodMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "Test2",
GenericTypeCount = 0,
ReturnType = typeof(global::System.Threading.Tasks.Task),
ReturnTypeReference = global::TUnit.Core.TypeReference.CreateConcrete("System.Threading.Tasks.Task, System.Private.CoreLib"),
ReturnTypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::System.Threading.Tasks.Task)),
Parameters = global::System.Array.Empty<global::TUnit.Core.ParameterMetadata>(),
Class = global::TUnit.Core.ClassMetadata.GetOrAdd("TestsBase`1:global::TUnit.TestProject.AfterTests.CleanupTests", () =>
{
var classMetadata = new global::TUnit.Core.ClassMetadata
{
Type = typeof(global::TUnit.TestProject.AfterTests.CleanupTests),
TypeReference = global::TUnit.Core.TypeReference.CreateConcrete("TUnit.TestProject.AfterTests.CleanupTests, TestsBase`1"),
TypeInfo = new global::TUnit.Core.ConcreteType(typeof(global::TUnit.TestProject.AfterTests.CleanupTests)),
Name = "CleanupTests",
Namespace = "TUnit.TestProject.AfterTests",
Assembly = global::TUnit.Core.AssemblyMetadata.GetOrAdd("TestsBase`1", () => new global::TUnit.Core.AssemblyMetadata { Name = "TestsBase`1" }),
Expand Down
Loading
Loading