Skip to content

Merge release into master #3816

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

Merged
merged 17 commits into from
Aug 13, 2018
Merged

Merge release into master #3816

merged 17 commits into from
Aug 13, 2018

Conversation

Fatme
Copy link
Contributor

@Fatme Fatme commented Aug 13, 2018

Merge release branch into master

PR Checklist

rosen-vladimirov and others added 17 commits August 7, 2018 10:11
…ources

In case the project does not have App_Resources dir, CLI tries to extract the content of the default template's App_Resources. However, as the structure of the default template has changed (to v2), CLI extracts the resources to incorrect location. This makes the newly created project unbuildable.
In order to fix this behavior and allow the default template to specify where App_Resources are located (via nsconfig.json file), change the logic in CLI to extract the default template to a temp location, read where the App_Resources is located and after that copy the content to the new project.
…os-tag-version

fix: run ios fails if tns-ios version contains tags
fix: avoid getting logs from a wrong process or an old instance of the application
fix: use `pid` logcat option only on supported Android devices
Whenever CLI returns information for available emulators/simulators, the returned object for each of the image has a status property.
For Android the status is "Running" or "Not running", for iOS it is "Connected" or "Disconnected".
Unify the status properties - use "Running" and "Not running" for both of the images.

Also, for iOS images, the imageIdentifier property has not been populated - fill it with the value of the identifier property, so the API will be consistent for both Android and iOS.
As the property has not been populated for iOS Simulators, the events "emulatorImageFound" and "emulatorImageLost" were never triggered in case you add new iOS Simulator images. Now this should work correctly.

Fix unit tests on Windows - the split by EOL when parsing the output of avdmanager executable is not working on Windows, as the EOL is `\r\n`, while the avdmanager prints results with `\n` only.
Also the tests were failing on Windows due to the same reason - test case has `\n`, while split is by `\r\n`.

Use some constants in the tests instead of strings for status property.
fix: status of iOS Sim images and Android Emulator images are different
fix: stop starting logcat helper when starting the app only for livesync
# Conflicts:
#	lib/common
#	npm-shrinkwrap.json
#	package.json
@dtopuzov
Copy link
Contributor

run ci

@Fatme Fatme merged commit ddd74be into master Aug 13, 2018
@Fatme Fatme deleted the fatme/merge-rel-master branch August 13, 2018 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants