-
Notifications
You must be signed in to change notification settings - Fork 123
integrate preserving commit history #815
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
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
[Discuss] Fix packaging netstandard20
add WPF path to fsi.exe and cleanup resolution flags
Prepare file headers for License change.
Do not calc map height twice
* simplify key and value access * Remove unused function * Directly use from list - saves couple of Map Ctors * Revert "Remove unused function" This reverts commit a2f6dc54a5d64842d7a66d24b4b28629db77d90f. # Conflicts: # src/absil/zmap.fs
…arguments (#3523) * Generate correct names for delegate and object expression arguments * update test baselines
* fix 3489 - struct unions * fix 3489 - struct unions - test * fix 3489 - struct unions - fix code gen * fix tests
* don't copy incorrect fsharp.core * Update TestTP.fsproj
* fix test * fix test
* Fix attribute references * For attributes with type arguments only add reference to Nominal types
* whitespace cleanup * whitespace cleanup * whitespace cleanup * undo changes to fst/snd to prevent any error text changes * undo changes to fst/snd to prevent any error text changes
* Fix part of 3465 - allow nativeptr address of in 'let' * fix tests * fix test * fix test
…ecursive function definitions (#3536)
* implement check and codefix for mismatched parameters * apply consistent param names to FSHarp.Core * undo changes to fst/snd to prevent any codegen changes
* Saved * SDK editor support * Address merge issues * Feedback * reduce delta * invalidate ide when a new file is discovered * Go faster stripes * feedback + refactor * tryFindIndex * Cleanup + Ensure that FSharp.Core.BuildFromSource.proj works at designtime * final clean up * label for HandleCommandLineChanges * ensure some buildfromsource porojects load
…odDef #3514 (#3553) * Fix MethodDebugTable for portablePDBs * ensure that pdb gets a record for abstract methods * minimise diff
* add checks for famANDassembly visibility fixes dotnet/fsharp#1373 * add unit tests for FamAndAssembly / FamOrAssembly * disable failing test * adapt ut error message for error message rework * add issue link to disabled unit test * align and replace all tabs with whitespace (maybe build failure is related to tabs? I'm probably paranoid ....) * -a => --target:library * fix assembly * fix FamAndAssembly * manually modify accessibilities in AccessibilityTests.dll * Revert "-a => --target:library" This reverts commit 33af6458fc2839511e7b110b4b0c3922ff95fa4e.
* do not infer record fields if the LRH type is already known * update tests * fix ResolveExprDotLongIdent * Revert "update tests" This reverts commit 03dcb7ba24f64e0ff571027d76b6b186473ec8c0. * add a test and code style
… last file to compile (#3603)
* fix rebuild of files * don't rebuild project system
* Fix in ide build logging. * Fix in ide build logging.
…3612) * TypeChecker notifies name resolution sink about IL constant fields * TypeChecker notifies name resolution sink about literal values in patterns * add tests
* add build task to generate *.fs from *.resx files * generate source for embedded resources in tests * generate source for embedded resources in FSharp.Editor * generate source for embedded resources in FSharp.LanguageService * generate source for embedded resources in FSharp.ProjectSystem.FSharp * generate source for embedded resources in FSharp.VS.FSI * don't generate non-string resources when <=netstandard1.6 * update baseline error message for tests The error output should be the exception message, not the exception type. * perform up-to-date check before generating *.fs from *.resx * remove non-idiomatic fold for an array comprehension * correct newline replacement * output more friendly error message * throw if boolean value isn't explicitly `true` or `false` * only generate object resource code on non `netstandard1.*` and `netcoreapp1.*` platforms * ensure FSharp.Core specifies a target framework for resource generaton * rename attributes to be non-ambiguous and properly include them
…egistry key"), improve finding of VS2017 tools, fix DEVGUIDE.md (#3635) * Fix build.com displaying the following error on each run "ERROR: The system was unable to find the specified registry key or value." * Remove warning about reg.exe errors introduced in #3614 (in commit b548bd7, but unrelated to that fix), it is no longer necessary. * Fix #3638, VS2017 Preview installation was not found when VS2017RTM is not installed. Remove comment introduced in #3614 (through commit 966bd7f)
… by removing Debugger.Break() (#3627) * Fixing JaroWinkler tests to use InvariantCulture for number-to-string * Fixing the crashing of test runners because of a Debugger.Break() in a test
* update to System.Collections.Immutable 1.3.1 * fixes
* Adds optimized emit for int64 constants. * Adds comment linking to the changing PR. Thanks for this PR. Kevin
* fix assembly reference * remove more build warnings * fix build
* enable fs as prefix and ignore invalid values for warnings + tests * Allow #pragma to validate warnings * do it right * use ordinal compare * In both places * Add fs prefix to warnaserror * Fixup tests
* Fix stack overflow on tp assembly resolution * Feedback
* add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project * add ImplementationFiles to FSharpCheckFileResults * make FSharpImplementationFileContents ctor internal * throw if ImplementationFiles is called having keepAssemblyContents flag set to false * add a test * spelling and cosmetics
…ate-vsintegration.cmd (#3672) * This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd * This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd * Remove ambiguous an irrelevant instruction, improved help and instructions * Fix a scenario where the return code wasn't nonzero for error conditions, fixes not creating backup dir when not backing up
…FSharp.Compiler.Private project (#3657)
* bump version * Update RELEASE_NOTES.md
… options (#3601) * Parse without reactor, add parsing options, error severity options * Revert parsing APIs (fallback to the new ones), fix VFT projects * Cache parse results after type check * Add impl files to file check results (#3659) * add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project * add ImplementationFiles to FSharpCheckFileResults * make FSharpImplementationFileContents ctor internal * throw if ImplementationFiles is called having keepAssemblyContents flag set to false * add a test * spelling and cosmetics * This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd (#3672) * This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd * This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd * Remove ambiguous an irrelevant instruction, improved help and instructions * Fix a scenario where the return code wasn't nonzero for error conditions, fixes not creating backup dir when not backing up * add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project (#3657) * bump FCS version (#3676) * bump version * Update RELEASE_NOTES.md * updates to make tests pass * restore old behaviour of CheckFileInProjectAllowingStaleCachedResults (builder had been created by ParseFileInProject) * restore use of CheckFileInProjectAllowingStaleCachedResults * deprecate test relying on whacky behaviour of deprecated GetCheckResultsBeforeFileInProjectEvenIfStale * Use ParseFile and FSharpParsingOptions instead of ParseFileInProject * prepare FCS release with this feature
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.
Last integration used "squash and merge", this one will preserve the commit history