Add support for the MacCatalyst target#464
Merged
premun merged 32 commits intodotnet:mainfrom Feb 23, 2021
Merged
Conversation
Conflicts: src/Microsoft.DotNet.XHarness.Apple/AppRunner.cs src/Microsoft.DotNet.XHarness.Apple/AppTester.cs src/Microsoft.DotNet.XHarness.TestRunners.Common/ApplicationOptions.cs tests/Microsoft.DotNet.XHarness.Apple.Tests/AppTesterTests.cs
Conflicts: src/Microsoft.DotNet.XHarness.Common/Execution/ProcessManager.cs
mandel-macaque
suggested changes
Feb 18, 2021
Contributor
mandel-macaque
left a comment
There was a problem hiding this comment.
Fix the use of the pattern:
try {
} finally {
IDisposable.Dispose();
}The above is generated by the compiler. compiler > human
Ref: https://sharplab.io/#gist:4aad44262924444d74167abd07a043a7
finally
{
// sequence point: hidden
IL_002c: ldloc.0
IL_002d: brfalse.s IL_0035
IL_002f: ldloc.0
IL_0030: callvirt instance void [System.Private.CoreLib]System.IDisposable::Dispose()
// sequence point: hidden
IL_0035: endfinally
} // end handler
greenEkatherine
approved these changes
Feb 19, 2021
Member
Author
|
@akoeplinger I changed the way we call the open/binary and updated the PR with this new way so technically #462 can be closed when this is merged. |
akoeplinger
approved these changes
Feb 19, 2021
mandel-macaque
added a commit
that referenced
this pull request
Feb 26, 2021
* Add triggers for xcode/* branches (#450) * Remove dead code around TestRunner argument passing (#449) - I compared what we send to and what we receive from the TestRunner EntryPoint and noticed quite a bit of unused options. These are remnants of the Xamarin code with which we don't share the EntryPoint anymore - We are passing arguments both via env variables and arguments so we will only pass the env vars now - There was a bug in the definition of the `class` argument and it wasn't parsed properly - Another thing I fixed are the "extra" arguments - I don't they they were working until know because we prepend them with a `-app-arg:` prefix which is only recognized in the Xamarin's mono Main * Improve various logging (#463) Side effects of other work, related to #358 * Fail faster when cannot find any devices/emulators (#469) * fail faster when cannot find any devices/emulators * Apply suggestions from code review Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * Move to new location of netcorenativeassets (#471) * Remove the DummyTestProject (#472) * Add support for the MacCatalyst target (#464) - Adds support for the `apple test -t=maccatalyst` command (resolves #435) - Getting system logs for the process is not working at the moment (#459) - The `apple run` command cannot detect exit code yet (#462) * Capture System.log when running MacCatalyst apps (#474) Resolves #459 * Make sure the MacCatalyst app's binary is executable (#475) * Allow to skip device-id for android install/run/uninstall (#479) * allow to skip device-id for android install/run/uninstall if device can be choosed unambiguously * Update src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * addressed review feedback Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20210225.5 (#482) [main] Update dependencies from dotnet/arcade Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Katya Sokolova <esokolov@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
premun
added a commit
that referenced
this pull request
Mar 17, 2021
* Add triggers for xcode/* branches (#450) * Remove dead code around TestRunner argument passing (#449) - I compared what we send to and what we receive from the TestRunner EntryPoint and noticed quite a bit of unused options. These are remnants of the Xamarin code with which we don't share the EntryPoint anymore - We are passing arguments both via env variables and arguments so we will only pass the env vars now - There was a bug in the definition of the `class` argument and it wasn't parsed properly - Another thing I fixed are the "extra" arguments - I don't they they were working until know because we prepend them with a `-app-arg:` prefix which is only recognized in the Xamarin's mono Main * Improve various logging (#463) Side effects of other work, related to #358 * Fail faster when cannot find any devices/emulators (#469) * fail faster when cannot find any devices/emulators * Apply suggestions from code review Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * Move to new location of netcorenativeassets (#471) * Remove the DummyTestProject (#472) * Add support for the MacCatalyst target (#464) - Adds support for the `apple test -t=maccatalyst` command (resolves #435) - Getting system logs for the process is not working at the moment (#459) - The `apple run` command cannot detect exit code yet (#462) * Capture System.log when running MacCatalyst apps (#474) Resolves #459 * Make sure the MacCatalyst app's binary is executable (#475) * Allow to skip device-id for android install/run/uninstall (#479) * allow to skip device-id for android install/run/uninstall if device can be choosed unambiguously * Update src/Microsoft.DotNet.XHarness.Android/AdbRunner.cs Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * addressed review feedback Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20210225.5 (#482) [main] Update dependencies from dotnet/arcade * Run MacCatalyst via `open w` and detect exit code from logs (#484) Resolves #462 * Add integration tests for MacCatalyst (#487) * Add integration tests for the MacCatalyst target * Make Helix tests run on local * Remove EnableXUnitReporter * Create template proj for integration tests * Display the name of the exit code (#488) * Wait for MacCatalyst system.log flush (#490) * Don't reset the stream if we got a partial message (#489) Fixes #473 * Do not report LaunchFailure when the app connected over TCP (#491) * [wasm] add `--expected-exit-code` for `wasm test-browser`, similar to (#492) .. what `wasm test` has. * Rename iOS namespace to Apple (#494) * Merge SimulatorInstaller commands to main CLI (#497) This removes the SimulatorInstaller project and moves the file to CLI so that you can do: ``` xharness apple simulators list ``` When installing the simulators, it doesn't accept the same format e.g. `ios-simulator-64` of targets as the CLI, this will be a follow-up. #478 * [wasm] Ensure that Safari/firefox drivers are Disposed in case of (#500) .. failures. This manifested when running with Safari, and it doesn't have `remote automation` enabled. That would cause xharness to get stuck because of the still running driver process. ``` crit: System.InvalidOperationException: Could not create a session: You must enable the 'Allow Remote Automation' option in Safari's Develop menu to control Safari via WebDriver. (SessionNotCreated) at OpenQA.Selenium.Remote.RemoteWebDriver.UnpackAndThrowOnError(Response errorResponse) at OpenQA.Selenium.Remote.RemoteWebDriver.Execute(String driverCommandToExecute, Dictionary`2 parameters) at OpenQA.Selenium.Remote.RemoteWebDriver.StartSession(ICapabilities desiredCapabilities) at OpenQA.Selenium.Remote.RemoteWebDriver..ctor(ICommandExecutor commandExecutor, ICapabilities desiredCapabilities) at OpenQA.Selenium.Safari.SafariDriver..ctor(SafariDriverService service, SafariOptions options, TimeSpan commandTimeout) at Microsoft.DotNet.XHarness.CLI.Commands.Wasm.WasmTestBrowserCommand.GetSafariDriver(ILogger logger) in /_/src/Microsoft.DotNet.XHarness.CLI/Commands/WASM/Browser/WasmTestBrowserCommand.cs:line 98 at Microsoft.DotNet.XHarness.CLI.Commands.Wasm.WasmTestBrowserCommand.InvokeInternal(ILogger logger) in /_/src/Microsoft.DotNet.XHarness.CLI/Commands/WASM/Browser/WasmTestBrowserCommand.cs:line 63 at Microsoft.DotNet.XHarness.Common.CLI.Commands.XHarnessCommand.Invoke(IEnumerable`1 arguments) in /_/src/Microsoft.DotNet.XHarness.Common/CLI/Commands/XHarnessCommand.cs:line 120 XHarness exit code: 71 (GENERAL_FAILURE) XHarness artifacts: ./xharness-output ``` * [wasm][test-browser] Add `--browser-path` to use custom browser paths (#501) * Detect old version of MacOS in MacCatalyst test runs (#495) * Add base entry point class for android tests (#454) * add base instrumentation class for android tests * Update src/Microsoft.DotNet.XHarness.InstrumentationBase.Xunit/Microsoft.DotNet.XHarness.InstrumentationBase.Xunit.csproj Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> * review feedback * Update src/Microsoft.DotNet.XHarness.InstrumentationBase.Xunit/AndroidInstrumentationBase.cs Co-authored-by: Manuel de la Pena <mandel@microsoft.com> * addressed review feedback * remove instrumentation part, leave only default test entry point for android * address review feedback * remove test project Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Manuel de la Pena <mandel@microsoft.com> * Fix CLI behavior when doing `xharness` or `xharness help` (#504) * [main] Update dependencies from dotnet/arcade (#499) [main] Update dependencies from dotnet/arcade - Merge remote-tracking branch 'origin/main' into darc-main-37ceeb7c-81af-4535-a6eb-96fcd2db6c28 - Merge remote-tracking branch 'origin/main' into darc-main-37ceeb7c-81af-4535-a6eb-96fcd2db6c28 - Update unit tests project to net6.0 * Fix possible merge mistake. * Revert performance-setup.sh Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com> Co-authored-by: Katya Sokolova <esokolov@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <lewing@microsoft.com> Co-authored-by: Ankit Jain <radical@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
apple test -t=maccatalystcommand (resolves Add Support for Mac Catalyst #435)apple runcommand cannot detect exit code yet (Detect exit code when callingapple runfor MacCatalyst target #462)