Merge master to release/dev16.8 #9729
Merged
Conversation
This file contains 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
* Ignore NCrunch temp files and local user files * Showing only failing line in ExprTests, cleanup temp files * Show sensible message when UnresolvedPathReferenceNoRange is raised by tests * Attempt to re-enable two base tests, may need to be re-disabled for Mono * Cleanup tests that use global state, ensure deletion of temp files * Fix difference Mono, fix spacing difference CI vs VS IDE * Normalize null vs None * Fix next issue difference between CI and local * Make sure both smoke tests use the same filterhack function * Next fix, overlooked * Add procid and threadid to temp file * Move #r System.Numerics to mkStandardProjectReferences * Cleanup * Fix tests that actually count references and are dependent on Common.fs
KevinRansom
approved these changes
Jul 21, 2020
KevinRansom
approved these changes
Jul 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from master into release/dev16.8.
git fetch --all git checkout merges/master-to-release/dev16.8 git reset --hard upstream/release/dev16.8 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.8 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.