Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small fixes for uitest project location and install #15172

Merged
merged 5 commits into from
May 19, 2023
Merged

Small fixes for uitest project location and install #15172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a86890e
Update Microsoft.Maui.sln
rmarinho May 18, 2023
28436b1
Update Microsoft.Maui.sln
rmarinho May 18, 2023
f55301a
Use appium-install scripts
rmarinho May 18, 2023
679b2fc
We need to build the Buildtasks first
rmarinho May 19, 2023
4a6ffd9
Merge branch 'main' into fix-folder
rmarinho May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Microsoft.Maui.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
25 changes: 1 addition & 24 deletions eng/pipelines/common/ui-tests-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/appium-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down