Address review feedback: remove redundant properties, create dotnet.config, revert TestApplication.cs, update test to use dedicated test asset

Co-authored-by: Youssef1313 <[email protected]>

Author: Copilot

src/Cli/dotnet/Commands/Test/TestApplication.cs

@@ -5,7 +5,6 @@
 
 using System.Diagnostics;
 using System.IO.Pipes;
-using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Commands.Test.IPC;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Models;
 using Microsoft.DotNet.Cli.Commands.Test.IPC.Serializers;
@@ -55,16 +54,6 @@ public async Task<int> RunAsync(TestOptions testOptions)
 
     private ProcessStartInfo CreateProcessStartInfo(TestOptions testOptions)
     {
-        // Check for architecture mismatch when UseAppHost=false
-        if (ShouldValidateArchitectureForUseAppHostFalse())
-        {
-            var archMismatchError = ValidateArchitectureCompatibility();
-            if (archMismatchError != null)
-            {
-                throw new GracefulException(archMismatchError);
-            }
-        }
-
         var processStartInfo = new ProcessStartInfo
         {
             // We should get correct RunProperties right away.
@@ -379,103 +368,6 @@ public override string ToString()
         return builder.ToString();
     }
 
-    private bool ShouldValidateArchitectureForUseAppHostFalse()
-    {
-        // Check if UseAppHost=false (RunArguments starts with "exec")
-        return !string.IsNullOrEmpty(Module.RunProperties.RunArguments) && 
-               Module.RunProperties.RunArguments.TrimStart().StartsWith("exec ", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private string ValidateArchitectureCompatibility()
-    {
-        // Extract the requested architecture from MSBuild args
-        string requestedArch = GetRequestedArchitecture();
-        if (string.IsNullOrEmpty(requestedArch))
-        {
-            // No architecture specified, no validation needed
-            return null;
-        }
-
-        // Get current muxer architecture 
-        string currentArch = GetCurrentMuxerArchitecture();
-        
-        // Normalize architecture names for comparison
-        string normalizedRequested = NormalizeArchitectureName(requestedArch);
-        string normalizedCurrent = NormalizeArchitectureName(currentArch);
-
-        if (!string.Equals(normalizedRequested, normalizedCurrent, StringComparison.OrdinalIgnoreCase))
-        {
-            return $"The current .NET host does not support the requested target architecture '{requestedArch}'. " +
-                   $"The current host is running '{currentArch}' architecture. " +
-                   $"When UseAppHost is false, the target architecture must match the current .NET host architecture.";
-        }
-
-        return null;
-    }
-
-    private string GetRequestedArchitecture()
-    {
-        // Look for architecture in MSBuild args
-        foreach (var arg in _buildOptions.MSBuildArgs)
-        {
-            if (arg.StartsWith("--property:RuntimeIdentifier=", StringComparison.OrdinalIgnoreCase) ||
-                arg.StartsWith("-property:RuntimeIdentifier=", StringComparison.OrdinalIgnoreCase) ||
-                arg.StartsWith("/property:RuntimeIdentifier=", StringComparison.OrdinalIgnoreCase) ||
-                arg.StartsWith("-p:RuntimeIdentifier=", StringComparison.OrdinalIgnoreCase) ||
-                arg.StartsWith("/p:RuntimeIdentifier=", StringComparison.OrdinalIgnoreCase))
-            {
-                var rid = arg.Split('=', 2)[1];
-                return ExtractArchitectureFromRid(rid);
-            }
-        }
-
-        // Also check UnmatchedTokens for --arch parameter
-        for (int i = 0; i < _buildOptions.UnmatchedTokens.Count - 1; i++)
-        {
-            if (_buildOptions.UnmatchedTokens[i] == "--arch" || _buildOptions.UnmatchedTokens[i] == "-a")
-            {
-                return _buildOptions.UnmatchedTokens[i + 1];
-            }
-        }
-
-        return null;
-    }
-
-    private static string ExtractArchitectureFromRid(string rid)
-    {
-        // RID format is typically os-arch (e.g., linux-x64, win-x86, osx-arm64)
-        var parts = rid.Split('-');
-        if (parts.Length >= 2)
-        {
-            return parts[^1]; // Last part is the architecture
-        }
-        return rid; // Fallback to the entire string
-    }
-
-    private static string GetCurrentMuxerArchitecture()
-    {
-        return RuntimeInformation.ProcessArchitecture switch
-        {
-            Architecture.X64 => "x64",
-            Architecture.X86 => "x86",
-            Architecture.Arm => "arm",
-            Architecture.Arm64 => "arm64",
-            _ => RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()
-        };
-    }
-
-    private static string NormalizeArchitectureName(string arch)
-    {
-        return arch.ToLowerInvariant() switch
-        {
-            "amd64" => "x64",
-            "x86_64" => "x64",
-            "arm64" => "arm64",
-            "aarch64" => "arm64",
-            _ => arch.ToLowerInvariant()
-        };
-    }
-
     public void Dispose()
     {
         foreach (var namedPipeServer in _testAppPipeConnections)

test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/TestProjectMTPWithUseAppHostFalse.csproj

@@ -10,7 +10,6 @@
 		<Nullable>enable</Nullable>
 
 		<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-		<IsTestingPlatformApplication>true</IsTestingPlatformApplication>
 	</PropertyGroup>
 
 	<ItemGroup>

test/TestAssets/TestProjects/TestProjectMTPWithUseAppHostFalse/dotnet.config

@@ -0,0 +1,5 @@
+[general]
+telemetry-output=false
+
+[testing.platform]
+use-microsoft-testing-platform=true

test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs

@@ -379,15 +379,8 @@ public void RunningWithGlobalPropertyShouldProperlyPropagate(string configuratio
         [Fact]
         public void RunMTPProjectWithUseAppHostFalseAndArchMismatch_ShouldFailWithProperError()
         {
-            TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectWithTests", Guid.NewGuid().ToString())
-                .WithSource()
-                .WithProjectChanges(project =>
-                {
-                    // Modify the project to use UseAppHost=false
-                    var ns = project.Root!.Name.Namespace;
-                    var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
-                    propertyGroup.Add(new XElement(ns + "UseAppHost", "false"));
-                });
+            TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectMTPWithUseAppHostFalse", Guid.NewGuid().ToString())
+                .WithSource();
 
             // Call test with wrong architecture
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)