Add workaround for TRX Writer bug

microsoft/vstest#4736
dotMorten · Nov 5, 2023 · f7e0931 · f7e0931
1 parent fb03a2a
commit f7e0931
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/TestAppRunner/TestAppRunner/TestAppRunner.csproj b/src/TestAppRunner/TestAppRunner/TestAppRunner.csproj
@@ -18,7 +18,7 @@
     <PackageTags>Unit Test, Xamarin, Android, iOS, Test, Testing, MSTest, VSTest, TestFX, TRX, MAUI</PackageTags>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>2.0.0-rc.4</Version>
+    <Version>2.0.0-rc.5</Version>
     <Description>A .NET MAUI-based UnitTest Runner to execute MSTests on Android, iOS and MacCatalyst. The app supports custom test logging, and has built-in support for outputting a TRX test report and being remote controlled from commandline.</Description>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

diff --git a/src/TestAppRunner/TestAppRunner/ViewModels/TestRunnerVM.cs b/src/TestAppRunner/TestAppRunner/ViewModels/TestRunnerVM.cs
@@ -377,7 +377,14 @@ private async Task<IEnumerable<TestResult>> Run_Internal(IEnumerable<TestCase> t
             }
             if (trxWriter != null)
             {
-                trxWriter?.OnTestRunComplete(new Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs(null, false, true, null, null, TimeSpan.Zero));
+                try
+                {
+                    trxWriter?.OnTestRunComplete(new Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.TestRunCompleteEventArgs(null, false, false, null, null, TimeSpan.Zero));
+                }
+                catch(PlatformNotSupportedException) // Throws due to https://github.com/microsoft/vstest/issues/4736. However it's thrown after TRX is written
+                {
+                    Debug.Assert(File.Exists(Settings.TrxOutputPath));
+                }
                 trxWriter = null;
                 Logger.Log($"TRXREPORT LOCATION: {Settings.TrxOutputPath}");
             }

diff --git a/src/TestAppRunner/TestAppRunner/Views/AllTestsPage.xaml.cs b/src/TestAppRunner/TestAppRunner/Views/AllTestsPage.xaml.cs
@@ -110,12 +110,17 @@ private void RunFailed_Clicked()
 
         private void Save_Report_Clicked()
         {
-#if MAUI
             string path = Path.Combine(Path.GetTempPath(), DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".trx");
-            TrxWriter.GenerateReport(path, TestRunnerVM.Instance.Tests.Select(t => t.Result).Where(r=>r is not null));
+            try
+            {
+                TrxWriter.GenerateReport(path, TestRunnerVM.Instance.Tests.Select(t => t.Result).Where(r => r is not null));
+            }
+            catch (PlatformNotSupportedException) // Throws due to https://github.com/microsoft/vstest/issues/4736. However it's thrown after TRX is written
+            {
+                System.Diagnostics.Debug.Assert(File.Exists(path));
+            }
             Microsoft.Maui.ApplicationModel.DataTransfer.Share.RequestAsync(
                 new Microsoft.Maui.ApplicationModel.DataTransfer.ShareFileRequest("TRX Test Report", new Microsoft.Maui.ApplicationModel.DataTransfer.ShareFile(path)));
-#endif
         }
         private void StopRun_Clicked()
         {