[rel/3.5] Fix ResultFiles placement in TRX report (#3264)

Author: nohwnd

src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportEngine.cs

@@ -525,6 +525,12 @@ private void AddResults(string testAppModule, XElement testRun, out XElement tes
                 output.Add(errorInfoElement);
             }
 
+            // add collectorDataEntries details
+            if (output.HasElements && outcome != "NotExecuted")
+            {
+                unitTestResult.Add(output);
+            }
+
             if (_artifactsByTestNode.TryGetValue(testNode.Uid, out List<SessionFileArtifact>? fileArtifacts))
             {
                 var resultFiles = new XElement("ResultFiles");
@@ -536,13 +542,7 @@ private void AddResults(string testAppModule, XElement testRun, out XElement tes
                         new XAttribute("path", fileArtifact.FileInfo.FullName)));
                 }
 
-                output.Add(resultFiles);
-            }
-
-            // add collectorDataEntries details
-            if (output.HasElements && outcome != "NotExecuted")
-            {
-                unitTestResult.Add(output);
+                unitTestResult.Add(resultFiles);
             }
 
             results.Add(unitTestResult);

test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxTests.cs

@@ -299,11 +299,9 @@ public async Task TrxReportEngine_GenerateReportAsync_WithArtifactsByTestNode_Tr
         string trxContent = xml.ToString();
         string trxContentsPattern = @"
     <UnitTestResult .* testName=""TestMethod"" .* outcome=""Passed"" .*>
-      <Output>
-        <ResultFiles>
-          <ResultFile path=.*fileName"" />
-        </ResultFiles>
-      </Output>
+      <ResultFiles>
+        <ResultFile path=.*fileName"" />
+      </ResultFiles>
     </UnitTestResult>
  ";
         Assert.That(Regex.IsMatch(trxContent, trxContentsPattern));