diff --git a/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj b/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj
index 4327a3a3cb23..050f80101590 100644
--- a/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj
+++ b/src/Controls/tests/TestCases.Android.Tests/Controls.TestCases.Android.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj b/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj
index 19739d6177d6..408168b2f848 100644
--- a/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj
+++ b/src/Controls/tests/TestCases.Mac.Tests/Controls.TestCases.Mac.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj b/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj
index 935c059d6d57..3279ab0fd0a9 100644
--- a/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj
+++ b/src/Controls/tests/TestCases.WinUI.Tests/Controls.TestCases.WinUI.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj b/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj
index 8d90bbb080e1..d781e1e9465f 100644
--- a/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj
+++ b/src/Controls/tests/TestCases.iOS.Tests/Controls.TestCases.iOS.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
index 1132c1943ebe..fd1d13e24037 100644
--- a/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
+++ b/src/TestUtils/src/UITest.Appium/Actions/AppiumLifecycleActions.cs
@@ -55,19 +55,21 @@ CommandResponse LaunchApp(IDictionary parameters)
return CommandResponse.FailedEmptyResponse;
if (_app.GetTestDevice() == TestDevice.Mac)
- {
+ {
_app.Driver.ExecuteScript("macos: activateApp", new Dictionary
{
{ "bundleId", _app.GetAppId() },
});
}
- else if (_app.GetTestDevice() == TestDevice.Windows)
+ else if (_app.Driver is WindowsDriver windowsDriver)
{
-#pragma warning disable CS0618 // Type or member is obsolete
- _app.Driver.LaunchApp();
-#pragma warning restore CS0618 // Type or member is obsolete
+ // Appium driver removed the LaunchApp method in 5.0.0, so we need to use the executeScript method instead
+ // Currently the appium-windows-driver reports the following commands as compatible:
+ // startRecordingScreen,stopRecordingScreen,launchApp,closeApp,deleteFile,deleteFolder,
+ // click,scroll,clickAndDrag,hover,keys,setClipboard,getClipboard
+ windowsDriver.ExecuteScript("windows: launchApp", [_app.GetAppId()]);
}
- else
+ else
{
_app.Driver.ActivateApp(_app.GetAppId());
}
@@ -127,7 +129,7 @@ CommandResponse CloseApp(IDictionary parameters)
}
catch (Exception)
{
- // TODO Pass in logger so we can log these exceptions
+ // TODO: Pass in logger so we can log these exceptions
// Occasionally the app seems to get so locked up it can't
// even report back the appstate. In that case, we'll just
@@ -143,11 +145,12 @@ CommandResponse CloseApp(IDictionary parameters)
{ "bundleId", _app.GetAppId() },
});
}
- else if (_app.GetTestDevice() == TestDevice.Windows)
+ else if (_app.Driver is WindowsDriver windowsDriver)
{
- #pragma warning disable CS0618 // Type or member is obsolete
- _app.Driver.CloseApp();
- #pragma warning restore CS0618 // Type or member is obsolete
+ // This is still here for now, but it looks like it will get removed just like
+ // LaunchApp was in 5.0.0, in which case we may need to use:
+ // windowsDriver.ExecuteScript("windows: closeApp", [_app.GetAppId()]);
+ windowsDriver.CloseApp();
}
else
{
diff --git a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj
index 3d33c1a996c8..08b934d89b4c 100644
--- a/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj
+++ b/src/TestUtils/src/UITest.Appium/UITest.Appium.csproj
@@ -7,8 +7,7 @@
-
-
+