Merge master to dev16.1 #6157
Merged
Merge master to dev16.1 #6157
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
* fix assembly path for signing * don't unconditionally deploy the templates VSIX on build * ensure insertion manifest is written to the correct location * correct package version
* Improve workflow * back to 32bit msbuild * move out nugets, change targets in makefile * Detect framework * Done * feedback
…6027) * Replace isModule with ModuleOrNamespaceKind in SymModuleOrNamespace * Fix structure tests * Review fixes
* Dive into types in type test expressions in AST visitor * Add test * Update VisualFSharp test * Update fsproj * Cleanup test
* remove allocations from jaro * improve perforamce * fix build * remove string concat allocations from FilterPredictions * fix build * move to struct tuple and remove the concat completely * undo
Fixes #6068, where you could cause a `System.OverFlowException` by using a key and value that leads to calling `abs` on `Int32.MinValue`. This is invalid on .NET. The fix is to not call `abs`, since there's really no reason to make a hash code always positive.
* possible fix for signature issue * fix de-duplication
* poss fix * poss fix * Update range.fs * Update range.fs * fix build * docs and limit fix * Update src/fsharp/range.fs Co-Authored-By: dsyme <[email protected]> * Update range.fs
Correct paths to vsix
* Always emit conditional attributes in FCS (fixes #3890) * Add test * Cleanup test * Add internal compiler switch, emit conditional method calls * Update test * Make noConditionalErasure lowercase
Merge dev15.9 to master
* add some docs * more docs * more docs * more docs/spacing * more docs/spacing * more docs/spacing
save and publish log from package publishing step
|
@brettfo There are conflicting files in this PR. Please have a look. |
|
Currently working on this. (Note to self, use #6001 to resolve conflicts.) |
brettfo
force-pushed
the
merges/master-to-dev16.1
branch
4 times, most recently
from
8380a1e to
9d2c8e7
Compare
brettfo
force-pushed
the
merges/master-to-dev16.1
branch
from
9d2c8e7 to
6c265d7
Compare
|
@brettfo Check visualfsharp-CI failed. Please have a look. |
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 dev16.1.
git fetch --all git checkout merges/master-to-dev16.1 git reset --hard upstream/dev16.1 git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-dev16.1 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.