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.

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

[release/9.0.1xx] Build arcade net9 on GA branch #25336

Merged
merged 103 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
752a0b7
Work on UI tests
PureWeen Oct 16, 2024
e79f4e7
Fix api scan
rmarinho Oct 16, 2024
9cbae03
Revert "Update windows samples" (#25059)
rmarinho Oct 2, 2024
31e5930
[net9] Try fix running UITests on iOS18 (#25070)
rmarinho Oct 3, 2024
c12ea05
Update latest stuff of arcade (#25086)
rmarinho Oct 4, 2024
7c2c3d5
Remove Drag and Drop Tests from Catalyst (#25039)
PureWeen Oct 2, 2024
b0d187f
try
rmarinho Aug 2, 2024
b001057
try again
rmarinho Aug 2, 2024
0cf75e9
Try more build
rmarinho Aug 2, 2024
da8f7eb
Fix snupkg
rmarinho Aug 2, 2024
8e8a0d5
try publish
rmarinho Aug 2, 2024
e7e6cd1
fix depends
rmarinho Aug 2, 2024
06e546a
fix
rmarinho Aug 2, 2024
14522e5
Fix signing
rmarinho Aug 2, 2024
6014110
Fix condition
rmarinho Aug 2, 2024
91e839f
try without this
rmarinho Aug 2, 2024
2ebdab3
Try install workloads
rmarinho Aug 2, 2024
aadf20b
add catalyst
rmarinho Aug 2, 2024
8298100
Try install .dotnet
rmarinho Aug 2, 2024
f942c9f
Skip install .net
rmarinho Aug 2, 2024
a756201
Nowarn
rmarinho Aug 2, 2024
0362314
Set java home
rmarinho Aug 2, 2024
9817c47
try sign
rmarinho Aug 2, 2024
058b1b2
sign dll
rmarinho Aug 2, 2024
79a50b0
dix
rmarinho Aug 2, 2024
08e7329
more variables
rmarinho Sep 5, 2024
0cb2ea4
try other
rmarinho Sep 5, 2024
c242695
fix
rmarinho Sep 5, 2024
98b74bc
Remove pool changes
rmarinho Sep 5, 2024
5411fb8
Fix path
rmarinho Sep 5, 2024
522a52b
dotnet
rmarinho Sep 5, 2024
5fbcf98
remvoe restore
rmarinho Sep 5, 2024
ea8c57f
Again
rmarinho Sep 5, 2024
d06860f
Try bump arcade
rmarinho Sep 5, 2024
c2612db
TreatWarningsAsErrors
rmarinho Sep 5, 2024
aa370c0
will this work
rmarinho Sep 5, 2024
17decec
Try -warnAsError 0
rmarinho Sep 5, 2024
5117f11
again
rmarinho Sep 5, 2024
4b9f58a
extra nowarn
rmarinho Sep 5, 2024
c7c6d34
Fix variable
rmarinho Sep 5, 2024
6488c0c
Fix _BuildOfficalId
rmarinho Sep 5, 2024
1ba5cee
Fix signing
rmarinho Sep 5, 2024
51ecdeb
Update arcade
rmarinho Sep 5, 2024
5564639
Don t push this
rmarinho Sep 5, 2024
2844f1d
Dont update build number
rmarinho Sep 6, 2024
ce4823b
Add back cake script
rmarinho Sep 6, 2024
f11165d
Add nuget.config again
rmarinho Sep 6, 2024
3ab8da1
Clean signing
rmarinho Sep 6, 2024
c07a2f0
try these feeds
rmarinho Sep 6, 2024
c743ce5
less premissions
rmarinho Sep 6, 2024
6a77da3
Try this
rmarinho Sep 6, 2024
fee99ab
Try fix the bin folder
rmarinho Sep 6, 2024
e0e1b6d
Fix nuget config
rmarinho Sep 6, 2024
82d8d17
Use DotNetTempDirectory for the script
rmarinho Sep 6, 2024
b150c86
Fix device tests
rmarinho Sep 6, 2024
f54575d
Add missing variable
rmarinho Sep 6, 2024
779ba80
We need this
rmarinho Sep 6, 2024
db0f21d
Try this
rmarinho Sep 6, 2024
3a646de
try this
rmarinho Sep 6, 2024
84d1ed0
Add public pipeline
rmarinho Sep 6, 2024
8231477
Fix cake
rmarinho Sep 6, 2024
ac89291
Fix tool
rmarinho Sep 6, 2024
ee78380
Fix device
rmarinho Sep 6, 2024
4a19870
try workloads
rmarinho Sep 6, 2024
467884b
try fix test
rmarinho Sep 6, 2024
bec1cd7
fix sign
rmarinho Sep 6, 2024
b2e1014
more quick
rmarinho Sep 6, 2024
66d9a63
needs t build
rmarinho Sep 6, 2024
115fde3
Fix windows script
rmarinho Sep 6, 2024
04fbcc6
Try workloads
rmarinho Sep 6, 2024
6b78cd2
fix location
rmarinho Sep 6, 2024
2bca476
fix
rmarinho Sep 6, 2024
c7091dc
Try with this
rmarinho Sep 6, 2024
0006442
try fix paths
rmarinho Sep 6, 2024
c55fab2
try this again
rmarinho Sep 6, 2024
2e82d4b
try use the latest tooling
rmarinho Sep 6, 2024
59dc2c2
Revert "try use the latest tooling"
rmarinho Sep 6, 2024
2925e3f
Update variables.yml
rmarinho Sep 10, 2024
2621dd1
Update DotnetInternal.cs
rmarinho Sep 10, 2024
7edfc75
More fixes
rmarinho Sep 10, 2024
4e5e83c
Update build-test-pack.yml
rmarinho Sep 10, 2024
baa70b3
Update latest arcade
rmarinho Oct 4, 2024
9cfc421
Remove package source mapping
rmarinho Oct 7, 2024
2883200
Update windows.cake
rmarinho Oct 7, 2024
f8972af
Update windows.cake
rmarinho Oct 7, 2024
ee522f5
Update global.json
rmarinho Oct 7, 2024
2032d89
Try _SkipUpdateBuildNumber
rmarinho Oct 7, 2024
82d2d96
again
rmarinho Oct 8, 2024
92e72d9
Update variables.yml
rmarinho Oct 8, 2024
f3fe498
Again
rmarinho Oct 8, 2024
85f1fb0
Include this
rmarinho Oct 8, 2024
274203c
Update vsmanproj
rmarinho Oct 8, 2024
470b887
Nove to arcade ne9
rmarinho Oct 11, 2024
da29526
Dont build workloads
rmarinho Oct 11, 2024
49b9abe
Update global.json
rmarinho Oct 11, 2024
745fb2f
Update Versions.props
rmarinho Oct 11, 2024
7a33465
Try rtm ios
rmarinho Oct 11, 2024
72fe660
try windows again
rmarinho Oct 12, 2024
55a6e0a
Fix folder for dotnet location
rmarinho Oct 12, 2024
0918ead
Update windows.cake
rmarinho Oct 14, 2024
6e653dc
Update Compatibility.ControlGallery.WinUI.csproj
rmarinho Oct 17, 2024
2059ea5
[ci] Try skip install android stuff on handlers build (#25293)
rmarinho Oct 16, 2024
e6bb4f5
Merge branch 'uitest_work_net9' into build-arcade-net9-ga
rmarinho Oct 17, 2024
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
Prev Previous commit
Next Next commit
[net9] Try fix running UITests on iOS18 (#25070)
* [housekeeping] Update & Consolidate Appium + driver versions (#24817)

* Update appium + driver versions

Updating to latest

* Move appium versions to eng/Versions.props

* Fix ps1 get-location

* Check if appium is completely missing too

No need to attempt to uninstall appium if it's not installed

* - bump versions

* - fix script

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

* Try iOS18 device

* See if this works

* Try xs

---------

Co-authored-by: Jonathan Dick <jodick@microsoft.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
  • Loading branch information
3 people committed Oct 16, 2024
commit 31e5930cddb392df4e50f5f9327cb337a3f718ef
8 changes: 8 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,14 @@
<NSubstitutePackageVersion>5.1.0</NSubstitutePackageVersion>
<CoverletCollectorPackageVersion>6.0.0</CoverletCollectorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Appium -->
<AppiumVersion>2.11.5</AppiumVersion>
<AppiumWindowsDriverVersion>2.12.32</AppiumWindowsDriverVersion>
<AppiumXCUITestDriverVersion>7.27.0</AppiumXCUITestDriverVersion>
<AppiumMac2DriverVersion>1.19.1</AppiumMac2DriverVersion>
<AppiumUIAutomator2DriverVersion>3.8.0</AppiumUIAutomator2DriverVersion>
</PropertyGroup>
<PropertyGroup>
<!-- arcade -->
<!-- xunit -->
Expand Down
2 changes: 1 addition & 1 deletion eng/devices/ios.cake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#addin nuget:?package=Cake.AppleSimulator&version=0.2.0
#load "./uitests-shared.cake"

const string DefaultVersion = "17.2";
const string DefaultVersion = "18.0";
const string DefaultTestDevice = $"ios-simulator-64_{DefaultVersion}";

// Required arguments
Expand Down
63 changes: 54 additions & 9 deletions eng/scripts/appium-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,54 @@ Find the script for that on the DevDiv Azure DevOps instance, Engineering team,

param
(
[string] $appiumVersion = '2.11.0',
[string] $windowsDriverVersion = '2.12.23',
[string] $androidDriverVersion = '3.7.0',
[string] $iOSDriverVersion = '7.21.0',
[string] $macDriverVersion = '1.17.4',
[string] $appiumVersion = '',
[string] $windowsDriverVersion = '',
[string] $androidDriverVersion = '',
[string] $iOSDriverVersion = '',
[string] $macDriverVersion = '',
[string] $logsDir = '../appium-logs'
)

# By default, versions should be read from /eng/Versions.props
$getLocation = $PSScriptRoot
$versionPropsPath = [IO.Path]::Combine($getLocation, '..', 'Versions.props')

Write-Output "Checking $versionPropsPath for versions..."

if (Test-Path $versionPropsPath)
{
Write-Output "Reading versions from Version.props..."
[xml]$versionProps = Get-Content $versionPropsPath

$versionPropsAppiumVersion = $versionProps.Project.PropertyGroup.AppiumVersion | Where-Object { $_ -ne $null } | Select-Object -Last 1
if ($versionPropsAppiumVersion -ne $null) {
$appiumVersion = $versionPropsAppiumVersion
}

$versionPropsWindowsDriverVersion = $versionProps.Project.PropertyGroup.AppiumWindowsDriverVersion | Where-Object { $_ -ne $null } | Select-Object -Last 1
if ($versionPropsWindowsDriverVersion -ne $null) {
$windowsDriverVersion = $versionPropsWindowsDriverVersion
}

$versionPropsUIAutomator2DriverVersion = $versionProps.Project.PropertyGroup.AppiumUIAutomator2DriverVersion | Where-Object { $_ -ne $null } | Select-Object -Last 1
if ($versionPropsUIAutomator2DriverVersion -ne $null) {
$androidDriverVersion = $versionPropsUIAutomator2DriverVersion
}

$versionPropsXCUItestDriverVersion = $versionProps.Project.PropertyGroup.AppiumXCUITestDriverVersion | Where-Object { $_ -ne $null } | Select-Object -Last 1
if ($versionPropsXCUItestDriverVersion -ne $null) {
$iOSDriverVersion = $versionPropsXCUItestDriverVersion
}

$versionPropsMac2DriverVersion = $versionProps.Project.PropertyGroup.AppiumMac2DriverVersion | Where-Object { $_ -ne $null } | Select-Object -Last 1
if ($versionPropsMac2DriverVersion -ne $null) {
$macDriverVersion = $versionPropsMac2DriverVersion
}
}
else {
throw "The version.props file was not found at path: $versionPropsPath"
}

Write-Output "Welcome to the Appium installer"

Write-Output "Node version"
Expand Down Expand Up @@ -87,11 +127,16 @@ if ($appiumCurrentVersion) {
Write-Output "No Appium version installed"
}

# Check if we found a version of appium at all
$missingAppium = [string]::IsNullOrEmpty($appiumCurrentVersion)

# If current version does not match the one we want, uninstall and install the new version
if ($appiumCurrentVersion -ne $appiumVersion) {
Write-Output "Uninstalling appium $appiumCurrentVersion"
npm uninstall --logs-dir=$logsDir --loglevel $npmLogLevel -g appium
Write-Output "Uninstalled appium $appiumCurrentVersion"
if ($missingAppium -or ($appiumCurrentVersion -ne $appiumVersion)) {
if (-not $missingAppium) {
Write-Output "Uninstalling appium $appiumCurrentVersion"
npm uninstall --logs-dir=$logsDir --loglevel $npmLogLevel -g appium
Write-Output "Uninstalled appium $appiumCurrentVersion"
}

Write-Output "Installing appium $appiumVersion"
npm install --logs-dir=$logsDir --loglevel $npmLogLevel -g appium@$appiumVersion
Expand Down
8 changes: 6 additions & 2 deletions src/Controls/tests/TestCases.Shared.Tests/UITest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public override IConfig GetTestConfig()
break;
case TestDevice.iOS:
config.SetProperty("DeviceName", Environment.GetEnvironmentVariable("DEVICE_NAME") ?? "iPhone Xs");
config.SetProperty("PlatformVersion", Environment.GetEnvironmentVariable("PLATFORM_VERSION") ?? "17.2");
config.SetProperty("PlatformVersion", Environment.GetEnvironmentVariable("PLATFORM_VERSION") ?? "18.0");
config.SetProperty("Udid", Environment.GetEnvironmentVariable("DEVICE_UDID") ?? "");
break;
case TestDevice.Windows:
Expand Down Expand Up @@ -142,7 +142,11 @@ but both can happen.
var platformVersion = (string)((AppiumApp)App).Driver.Capabilities.GetCapability("platformVersion");
var device = (string)((AppiumApp)App).Driver.Capabilities.GetCapability("deviceName");

if (deviceName == "iPhone Xs (iOS 17.2)" || (device.Contains(" Xs", StringComparison.OrdinalIgnoreCase) && platformVersion == "17.2"))
if (device.Contains(" Xs", StringComparison.OrdinalIgnoreCase) && platformVersion == "18.0")
{
environmentName = "ios";
}
else if (deviceName == "iPhone Xs (iOS 17.2)" || (device.Contains(" Xs", StringComparison.OrdinalIgnoreCase) && platformVersion == "17.2"))
{
environmentName = "ios";
}
Expand Down