Skip to content

Make sure ALL types in source generated code are globally qualified to avoid namespace clashes #2753

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
thomhurst merged 3 commits into from
Aug 4, 2025
Merged

Make sure ALL types in source generated code are globally qualified to avoid namespace clashes #2753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d923d30
Initial plan
Copilot Aug 4, 2025
09843b1
Fix global qualification for all types in source generated code
Copilot Aug 4, 2025
ce34284
Fix final UnsafeAccessor attribute to use global qualification
Copilot Aug 4, 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
4 changes: 2 additions & 2 deletions TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete1.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -93,7 +93,7 @@ return classMetadata;
}
internal static class ConcreteClass1_AssertClassName_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1), new ConcreteClass1_AssertClassName_TestSource_GUID());
Expand Down
18 changes: 9 additions & 9 deletions TUnit.Core.SourceGenerator.Tests/AbstractTests.Concrete2.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -81,12 +81,12 @@ return classMetadata;
var typedInstance = (global::TUnit.TestProject.AbstractTests.ConcreteClass2)instance;
var context = global::TUnit.Core.TestContext.Current;
typedInstance.SecondTest();
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
instance.SecondTest();
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -96,7 +96,7 @@ return classMetadata;
}
internal static class ConcreteClass2_SecondTest_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2), new ConcreteClass2_SecondTest_TestSource_GUID());
Expand Down Expand Up @@ -202,7 +202,7 @@ return classMetadata;
}
internal static class ConcreteClass2_AssertClassName_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2), new ConcreteClass2_AssertClassName_TestSource_GUID());
Expand Down Expand Up @@ -295,12 +295,12 @@ return classMetadata;
var typedInstance = (global::TUnit.TestProject.AbstractTests.ConcreteClass2)instance;
var context = global::TUnit.Core.TestContext.Current;
typedInstance.SecondTest();
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
instance.SecondTest();
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -310,7 +310,7 @@ return classMetadata;
}
internal static class ConcreteClass2_SecondTest_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass2), new ConcreteClass2_SecondTest_TestSource_GUID());
Expand Down Expand Up @@ -415,7 +415,7 @@ return classMetadata;
}
internal static class ConcreteClass1_AssertClassName_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AbstractTests.ConcreteClass1), new ConcreteClass1_AssertClassName_TestSource_GUID());
Expand Down
6 changes: 3 additions & 3 deletions TUnit.Core.SourceGenerator.Tests/AfterAllTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -92,7 +92,7 @@ return classMetadata;
}
internal static class CleanupTests_Test1_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AfterTests.CleanupTests), new CleanupTests_Test1_TestSource_GUID());
Expand Down Expand Up @@ -196,7 +196,7 @@ return classMetadata;
}
internal static class CleanupTests_Test2_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AfterTests.CleanupTests), new CleanupTests_Test2_TestSource_GUID());
Expand Down
6 changes: 3 additions & 3 deletions TUnit.Core.SourceGenerator.Tests/AfterTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -92,7 +92,7 @@ return classMetadata;
}
internal static class CleanupTests_Test1_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AfterTests.CleanupTests), new CleanupTests_Test1_TestSource_GUID());
Expand Down Expand Up @@ -196,7 +196,7 @@ return classMetadata;
}
internal static class CleanupTests_Test2_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.AfterTests.CleanupTests), new CleanupTests_Test2_TestSource_GUID());
Expand Down
32 changes: 16 additions & 16 deletions TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -115,7 +115,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand Down Expand Up @@ -143,7 +143,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -153,7 +153,7 @@ return classMetadata;
}
internal static class ArgsAsArrayTests_Params_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgsAsArrayTests), new ArgsAsArrayTests_Params_TestSource_GUID());
Expand Down Expand Up @@ -265,7 +265,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand All @@ -278,7 +278,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -288,7 +288,7 @@ return classMetadata;
}
internal static class ArgsAsArrayTests_NonParams_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgsAsArrayTests), new ArgsAsArrayTests_NonParams_TestSource_GUID());
Expand Down Expand Up @@ -415,7 +415,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand Down Expand Up @@ -443,7 +443,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -453,7 +453,7 @@ return classMetadata;
}
internal static class ArgsAsArrayTests_ParamsEnumerable_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgsAsArrayTests), new ArgsAsArrayTests_ParamsEnumerable_TestSource_GUID());
Expand Down Expand Up @@ -565,7 +565,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand All @@ -578,7 +578,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -588,7 +588,7 @@ return classMetadata;
}
internal static class ArgsAsArrayTests_Enumerable_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgsAsArrayTests), new ArgsAsArrayTests_Enumerable_TestSource_GUID());
Expand Down Expand Up @@ -709,7 +709,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand All @@ -722,7 +722,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 2 arguments, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -732,7 +732,7 @@ return classMetadata;
}
internal static class ArgsAsArrayTests_Following_Non_Params_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgsAsArrayTests), new ArgsAsArrayTests_Following_Non_Params_TestSource_GUID());
Expand Down
14 changes: 7 additions & 7 deletions TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <auto-generated/>
// <auto-generated/>
#pragma warning disable

// <auto-generated/>
Expand Down Expand Up @@ -105,7 +105,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand All @@ -118,7 +118,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -128,7 +128,7 @@ return classMetadata;
}
internal static class ArgumentWithImplicitConverterTests_Explicit_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests), new ArgumentWithImplicitConverterTests_Explicit_TestSource_GUID());
Expand Down Expand Up @@ -245,7 +245,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
InvokeTypedTest = async (instance, args, cancellationToken) =>
{
Expand All @@ -258,7 +258,7 @@ return classMetadata;
default:
throw new global::System.ArgumentException($"Expected exactly 1 argument, but got {args.Length}");
}
await Task.CompletedTask;
await global::System.Threading.Tasks.Task.CompletedTask;
},
};
metadata.UseRuntimeDataGeneration(testSessionId);
Expand All @@ -268,7 +268,7 @@ return classMetadata;
}
internal static class ArgumentWithImplicitConverterTests_Implicit_ModuleInitializer_GUID
{
[System.Runtime.CompilerServices.ModuleInitializer]
[global::System.Runtime.CompilerServices.ModuleInitializer]
public static void Initialize()
{
global::TUnit.Core.SourceRegistrar.Register(typeof(global::TUnit.TestProject.ArgumentWithImplicitConverterTests), new ArgumentWithImplicitConverterTests_Implicit_TestSource_GUID());
Expand Down
Loading