Address third round of PR review comments

- Add 'VSTest version' assertion to confirm VSTest runner is used
- Replace vacuous Assert.IsNotNull(MainWindow) with ControlType.Window check in sample
- Add final AppProcess.Refresh() before post-loop MainWindowHandle check
- Widen teardown catch to include Win32Exception for inaccessible processes
- Replace UseWPF with FrameworkReference to Microsoft.WindowsDesktop.App
- Update MSTest.Sdk expected file count (15 -> 16) for WindowsAppTesting.targets

Author: Evangelink

eng/verify-nupkgs.ps1

@@ -19,7 +19,7 @@ function Unzip {
 function Confirm-NugetPackages {
     Write-Verbose "Starting Confirm-NugetPackages."
     $expectedNumOfFiles = @{
-        "MSTest.Sdk"                                  = 15
+        "MSTest.Sdk"                                  = 16
         "MSTest.TestFramework"                        = 105
         "MSTest.TestAdapter"                          = 49
         "MSTest"                                      = 10

samples/public/DemoMSTestSdk/ProjectUsingWindowsAppTesting/CalculatorTests.cs

@@ -32,7 +32,8 @@ public void Calculator_MainWindow_HasExpectedTitle()
     {
         // The MainWindow property is automatically populated by WindowTest
         // after launching the application specified by ApplicationPath.
-        Assert.IsNotNull(MainWindow);
+        Assert.AreEqual(ControlType.Window, MainWindow.Current.ControlType,
+            "Expected the main window element to be of control type Window.");
 
         string title = MainWindow.Current.Name;
         Assert.IsFalse(

src/TestFramework/TestFramework.Windows.AppTesting/ApplicationTest.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.ComponentModel;
 using System.Diagnostics;
 
 namespace Microsoft.MSTest.Windows.AppTesting;
@@ -90,6 +91,7 @@ public void ApplicationSetup()
             }
         }
 
+        AppProcess.Refresh();
         if (AppProcess.MainWindowHandle == IntPtr.Zero)
         {
             throw new TimeoutException(
@@ -118,9 +120,9 @@ public void ApplicationTearDown()
                         _ = appProcess.WaitForExit(5000);
                     }
                 }
-                catch (InvalidOperationException)
+                catch (Exception ex) when (ex is InvalidOperationException or Win32Exception)
                 {
-                    // The process exited between state checks and shutdown operations.
+                    // The process exited or became inaccessible between state checks and shutdown operations.
                 }
             }
         }

src/TestFramework/TestFramework.Windows.AppTesting/TestFramework.Windows.AppTesting.csproj

@@ -3,9 +3,12 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0-windows;net9.0-windows</TargetFrameworks>
     <EnableWindowsTargeting Condition=" '$(OS)' != 'Windows_NT' ">true</EnableWindowsTargeting>
-    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App" />
+  </ItemGroup>
+
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>MSTest.Windows.AppTesting</PackageId>

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/WindowsAppTestingSdkTests.cs

@@ -39,6 +39,7 @@ public async Task EnableWindowsAppTesting_WhenUsingVSTest_RunsDesktopTests()
             cancellationToken: TestContext.CancellationToken);
 
         dotnetTestResult.AssertExitCodeIs(0);
+        dotnetTestResult.AssertOutputContains("VSTest version");
         dotnetTestResult.AssertOutputContains("Passed!  - Failed:     0, Passed:     2, Skipped:     0, Total:     2");
     }