Merge master to release/dev16.7 #9391
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
…602.3 (#9385) Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.20301.10 -> To Version 1.0.0-beta.20302.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* fix loader * typos
* Remove redundant "new" keywords in async.fs. * Refactor the use of AsyncReturn and (un)fake to produce better IL code. The calls to fake() are everywhere inlined and translated to an ldnull. The calls to unfake were replaced by ignore. The (un)fake functions inside the AsyncPrimitives module were already properly inlined and were not changed. And remove a branch in Trampoline.Execute. * Avoid allocating an option in Async.Parallel. * Remove AsyncActivation.CallExceptionContinuation. It is identical with AsyncActivation.econt. * Add a test for cancelling an Async by ThrowingIfRequested. * Remove a double inversion of a variable. Use parameterless Action delegates in cancellation event handlers.
* Update expression ranges * Keep parens in parsed operator uses * Fix getting parameter info for prefix operator invocations
* Update SDK stuff in build * add it back
KevinRansom
approved these changes
Jun 4, 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.7.
git fetch --all git checkout merges/master-to-release/dev16.7 git reset --hard upstream/release/dev16.7 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-release/dev16.7 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.