Merge release/dev16.3 to release/fsharp5 #7198
Merged
Conversation
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
…709.6 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19359.6
* Trying to fix the stack overflow case in ilxgen * Added stack guard to GenExpr * Still trying to resolve this * This resolves the stack overflow, but need to review * Adding better tests * Fixing compile and run successfully assert * One test passes * Fixing a few things * Delete fieldNames.txt * Update IlxGen.fs * Update IlxGen.fs * Update IlxGen.fs * More work on CompilerAssert * Got verifying IL working on method * Always delay gen methods when already gen'ing in one. Some small refactoring, created IlxMethodInfo type instead of using large tuples. * Better error message for stack overflow * small msg change * Simplifying some tests * Removing attempt at bringing a FSharpQA test to nunit * Fixing up seq points * More seq point tweaks * Trying to fix ilxgen * Fixing ilxgen * Using RunScript * Fix test * removed IlxMethodInfo * trivial refactor * another quick refactor
…a13-425ed155cfac [master] Update dependencies from dotnet/arcade
Merge master to release/dev16.3
dotnet-bot
force-pushed
the
merges/release/dev16.3-to-release/fsharp5
branch
from
1023d1d to
7d5f12d
Compare
|
@brettfo There is a file conflict. Please have a look. |
Member
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 release/dev16.3 into release/fsharp5.
git fetch --all git checkout merges/release/dev16.3-to-release/fsharp5 git reset --hard upstream/release/fsharp5 git merge upstream/release/dev16.3 # Fix merge conflicts git commit git push upstream merges/release/dev16.3-to-release/fsharp5 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.