Skip to content

Enable app end signal workaround for iOS/tvOS 14+ devices (+ enable device E2E tests) #7544

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

Merged
premun merged 2 commits into from
Jun 21, 2021
Merged

Enable app end signal workaround for iOS/tvOS 14+ devices (+ enable device E2E tests) #7544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a576c
Add --signal-app-end to device tests
premun Jun 21, 2021
67e9e2a
Enable iPhone device tests
premun Jun 21, 2021
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
27 changes: 13 additions & 14 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,20 +185,19 @@ stages:
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
HelixAccessToken: ''
# TODO (prvysoky): This will be enabled once we get a better app to test with (core-eng/11893)
# - script: eng/common/build.sh
# -configuration $(_BuildConfig)
# -prepareMachine
# -ci
# -restore
# -test
# -projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.iOS.Device.proj
# /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.iOS.Device.binlog
# /p:RestoreUsingNuGetTargets=false
# displayName: XHarness iOS Device Helix Testing
# env:
# SYSTEM_ACCESSTOKEN: $(System.AccessToken)
# HelixAccessToken: ''
- script: eng/common/build.sh
-configuration $(_BuildConfig)
-prepareMachine
-ci
-restore
-test
-projects $(Build.SourcesDirectory)/tests/UnitTests.XHarness.iOS.Device.proj
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/Helix.XHarness.iOS.Device.binlog
/p:RestoreUsingNuGetTargets=false
displayName: XHarness iOS Device Helix Testing
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
HelixAccessToken: ''
- script: eng/common/build.sh
-configuration $(_BuildConfig)
-prepareMachine
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Helix/Sdk/CreateXHarnessAppleWorkItems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ private async Task<ITaskItem> PrepareWorkItem(
? $"--launch-timeout \"$launch_timeout\" "
: $"--expected-exit-code $expected_exit_code ") +
(resetSimulator ? $"--reset-simulator " : string.Empty) +
(target.Contains("device") ? $"--signal-app-end " : string.Empty) + // iOS/tvOS 14+ workaround
"--xcode \"$xcode_path\" " +
"-v " +
(!string.IsNullOrEmpty(AppArguments) ? "-- " + AppArguments : string.Empty);
Expand Down
2 changes: 1 addition & 1 deletion tests/UnitTests.XHarness.iOS.Device.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- Test project which builds app bundle to run via XHarness -->
<ItemGroup>
<XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Device.AppleRun.proj" />
<XHarnessAppleProject Include="$(MSBuildThisFileDirectory)XHarness\XHarness.Device.AppleTest.proj" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 5 additions & 7 deletions tests/XHarness/XHarness.Device.AppleRun.proj → ...s/XHarness/XHarness.Device.AppleTest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />

<PropertyGroup>
<XHarnessRunAppBundleName>HelloiOS.app</XHarnessRunAppBundleName>
<XHarnessRunAppBundleUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/ios-device/$(XHarnessRunAppBundleName).unsigned.zip</XHarnessRunAppBundleUrl>
<XHarnessRunAppBundleName>System.Buffers.Tests.app</XHarnessRunAppBundleName>
<XHarnessRunAppBundleUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/ios/test-app/ios-device/$(XHarnessRunAppBundleName).zip</XHarnessRunAppBundleUrl>
</PropertyGroup>

<!-- We're not set up currently to build app bundles as part of normal builds, so this downloads existing ones for now -->
Expand All @@ -21,11 +21,9 @@
<ItemGroup>
<XHarnessAppBundleToTest Include="$(ArtifactsTmpDir)XHarness.RunDeviceAppBundle/$(XHarnessRunAppBundleName)">
<TestTarget>ios-device</TestTarget>
<WorkItemTimeout>00:05:00</WorkItemTimeout>
<TestTimeout>00:04:00</TestTimeout>
<LaunchTimeout>00:03:00</LaunchTimeout>
<IncludesTestRunner>false</IncludesTestRunner>
<ExpectedExitCode>200</ExpectedExitCode>
<WorkItemTimeout>00:12:00</WorkItemTimeout>
<TestTimeout>00:10:00</TestTimeout>
<LaunchTimeout>00:07:00</LaunchTimeout>
</XHarnessAppBundleToTest>
</ItemGroup>
</Target>
Expand Down