Small fixes for uitest project location and install (#15172)

* Update Microsoft.Maui.sln * Update Microsoft.Maui.sln * Use appium-install scripts * We need to build the Buildtasks first
dotnet · May 30, 2023 · 95483ed · 95483ed
1 parent c512483
commit 95483ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln
@@ -635,6 +635,7 @@ Global
 		{FB39FACE-BAF2-4F97-A249-E45BA63D77FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F39F75DC-671B-4649-8005-1929797B3217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F39F75DC-671B-4649-8005-1929797B3217}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F39F75DC-671B-4649-8005-1929797B3217}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{F39F75DC-671B-4649-8005-1929797B3217}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F39F75DC-671B-4649-8005-1929797B3217}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
@@ -746,7 +747,7 @@ Global
 		{4A6930AE-B67C-4D29-B1A8-ED9EB7F923A7} = {50C758FE-4E10-409A-94F5-A75480960864}
 		{66CC98E3-6A1A-4C44-A23C-B575E82106EC} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
 		{34969E49-FA6E-41BB-9813-5689BB14021E} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69}
-		{A23B108A-AB56-4692-B9DA-0E23602E3955} = {E1082E26-D700-4127-9329-66D673FD2D55}
+		{A23B108A-AB56-4692-B9DA-0E23602E3955} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
 		{EDADE060-6B61-4006-BB7D-CB7710F08E87} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
 		{0930F067-A388-4C9C-A249-653B74625A4E} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
 		{F2ADA552-6328-4B2D-8D48-FCDD32C4AF60} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}

diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml
@@ -39,30 +39,7 @@ steps:
       versionSpec: "18.13.0"
     displayName: "Install node"
 
-  - task: PowerShell@2
-    inputs:
-      targetType: 'inline'
-      script: |
-        node -v
-        npm install -g appium@2.0.0-beta.61
-        appium -v
-        $x = appium driver list --installed --json  | ConvertFrom-Json
-        if(!$x.windows)
-        {
-            appium driver install --source=npm appium-windows-driver
-        }
-        if(!$x.uiautomator2)
-        {
-            appium driver install uiautomator2
-        }
-        if(!$x.xcuitest)
-        {
-            appium driver install xcuitest
-        }
-        if(!$x.mac2)
-        {
-            appium driver install mac2
-        }
+  - pwsh: ./eng/scripts/appium-install.ps1
     displayName: "Install Appium"
     continueOnError: true
 

diff --git a/eng/scripts/appium-install.ps1 b/eng/scripts/appium-install.ps1
@@ -1,7 +1,7 @@
 node -v
 npm install -g npm
 node -v
-npm install -g appium@next
+npm install -g appium@2.0.0-beta.61
 appium -v
 $x = appium driver list --installed --json  | ConvertFrom-Json
 if(!$x.windows)