[rel/3.8] Use global:: prefix for generated code (#5033)

Co-authored-by: Youssef1313 <youssefvictor00@gmail.com>

Author: youssef-backport-bot

src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformAutoRegisteredExtensions.cs

@@ -5,6 +5,7 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
+using Microsoft.Testing.Platform.Helpers;
 
 namespace Microsoft.Testing.Platform.MSBuild;
 
@@ -171,7 +172,15 @@ private static void GenerateCode(string language, string rootNamespace, ITaskIte
                 builder.Append("        ");
             }
 
-            builder.Append(CultureInfo.InvariantCulture, $"{taskItems[i].GetMetadata(TypeFullNameMetadataName)}.AddExtensions(builder, args){(language == CSharpLanguageSymbol ? ";" : string.Empty)}");
+            string global = language switch
+            {
+                CSharpLanguageSymbol => "global::",
+                VBLanguageSymbol => "Global.",
+                FSharpLanguageSymbol => "global.",
+                _ => throw ApplicationStateGuard.Unreachable(),
+            };
+
+            builder.Append(CultureInfo.InvariantCulture, $"{global}{taskItems[i].GetMetadata(TypeFullNameMetadataName)}.AddExtensions(builder, args){(language == CSharpLanguageSymbol ? ";" : string.Empty)}");
             if (i < taskItems.Length - 1)
             {
                 builder.AppendLine();
@@ -226,8 +235,10 @@ public static void AddSelfRegisteredExtensions(this global::Microsoft.Testing.Pl
         }
         else if (language == VBLanguageSymbol)
         {
-            return string.IsNullOrEmpty(rootNamespace)
-                ? $$"""
+            // NOTE: We don't use the value of RootNamespace here.
+            // The compiler *already* wraps types in RootNamespace for Visual Basic
+            // This is not the case for C# or F#.
+            return $$"""
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by Microsoft.Testing.Platform.MSBuild
@@ -241,23 +252,6 @@ Public Sub AddSelfRegisteredExtensions(ByVal builder As Global.Microsoft.Testing
         {{extensionsFragments}}
     End Sub
 End Module
-"""
-                : $$"""
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by Microsoft.Testing.Platform.MSBuild
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Namespace {{rootNamespace}}
-    <System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
-    Friend Module SelfRegisteredExtensions
-        <System.Runtime.CompilerServices.Extension>
-        Public Sub AddSelfRegisteredExtensions(ByVal builder As Global.Microsoft.Testing.Platform.Builder.ITestApplicationBuilder, ByVal args As Global.System.String())
-            {{extensionsFragments}}
-        End Sub
-    End Module
-End Namespace
 """;
         }
         else if (language == FSharpLanguageSymbol)

src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformEntryPointTask.cs

@@ -143,8 +143,10 @@ internal sealed class TestingPlatformEntryPoint
         }
         else if (language == VBLanguageSymbol)
         {
-            return string.IsNullOrEmpty(rootNamespace)
-                ? $$"""
+            // NOTE: We don't use the value of RootNamespace here.
+            // The compiler *already* wraps types in RootNamespace for Visual Basic
+            // This is not the case for C# or F#.
+            return $$"""
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by Microsoft.Testing.Platform.MSBuild
@@ -167,32 +169,6 @@ End Using
     End Function
 
 End Module
-"""
-                : $$"""
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by Microsoft.Testing.Platform.MSBuild
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Namespace {{rootNamespace}}
-    <System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
-    Module TestingPlatformEntryPoint
-
-        Function Main(args As String()) As Integer
-            Return MainAsync(args).GetAwaiter().GetResult()
-        End Function
-
-        Public Async Function MainAsync(args As String()) As Global.System.Threading.Tasks.Task(Of Integer)
-            Dim builder = Await Global.Microsoft.Testing.Platform.Builder.TestApplication.CreateBuilderAsync(args)
-            SelfRegisteredExtensions.AddSelfRegisteredExtensions(builder, args)
-            Using testApplication = Await builder.BuildAsync()
-                Return Await testApplication.RunAsync()
-            End Using
-        End Function
-
-    End Module
-End Namespace
 """;
         }
         else if (language == FSharpLanguageSymbol)

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuild.KnownExtensionRegistration.cs

@@ -124,5 +124,14 @@ internal sealed class Capabilities : ITestFrameworkCapabilities
 {
     IReadOnlyCollection<ITestFrameworkCapability> ICapabilities<ITestFrameworkCapability>.Capabilities => Array.Empty<ITestFrameworkCapability>();
 }
+
+#file DummyClass.cs
+
+namespace MSBuildTests.Microsoft;
+
+// This serves as a test to ensure that we don't regress generation of 'global::'
+// If the self registered generation used Microsoft.Testing.Extensions.ExtensionName.TestingPlatformBuilderHook.AddExtension,
+// Then, without global::, Microsoft will be referring to MSBuildTests.Microsoft namespace and will fail to compile
+public static class DummyClass { }
 """;
 }

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.GenerateEntryPoint.cs

@@ -71,24 +71,22 @@ public async Task GenerateVBEntryPointAndVerifyTheCacheUsage(string tfm, BuildCo
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
-Namespace MSBuildTests
-    <System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
-    Module TestingPlatformEntryPoint
+<System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>
+Module TestingPlatformEntryPoint
 
-        Function Main(args As String()) As Integer
-            Return MainAsync(args).GetAwaiter().GetResult()
-        End Function
+    Function Main(args As String()) As Integer
+        Return MainAsync(args).GetAwaiter().GetResult()
+    End Function
 
-        Public Async Function MainAsync(args As String()) As Global.System.Threading.Tasks.Task(Of Integer)
-            Dim builder = Await Global.Microsoft.Testing.Platform.Builder.TestApplication.CreateBuilderAsync(args)
-            SelfRegisteredExtensions.AddSelfRegisteredExtensions(builder, args)
-            Using testApplication = Await builder.BuildAsync()
-                Return Await testApplication.RunAsync()
-            End Using
-        End Function
+    Public Async Function MainAsync(args As String()) As Global.System.Threading.Tasks.Task(Of Integer)
+        Dim builder = Await Global.Microsoft.Testing.Platform.Builder.TestApplication.CreateBuilderAsync(args)
+        SelfRegisteredExtensions.AddSelfRegisteredExtensions(builder, args)
+        Using testApplication = Await builder.BuildAsync()
+            Return Await testApplication.RunAsync()
+        End Using
+    End Function
 
-    End Module
-End Namespace'", "Vbc");
+End Module'", "Vbc");
 
     [DynamicData(nameof(GetBuildMatrixTfmBuildVerbConfiguration), typeof(AcceptanceTestBase<NopAssetFixture>))]
     [TestMethod]
@@ -285,7 +283,7 @@ Imports Microsoft.Testing.Platform.Requests
 Imports Microsoft.Testing.Platform.Extensions
 Imports Microsoft.Testing.Platform
 
-Namespace MyNamespaceRoot.Level1.Level2
+Namespace Global.MyNamespaceRoot.Level1.Level2
   Public Module DummyTestFrameworkRegistration
     Public Sub AddExtensions(builder As ITestApplicationBuilder, args As String())
       builder.RegisterTestFramework(Function() New Capabilities(), Function(cap, services) New DummyTestFramework())