Merge master to dev16.1 #6252
Merged
Merge master to dev16.1 #6252
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
…uild (#6206) * Ensure core tests pick up fsharp.core nuget packages from artifacts build * Feedback
* Update mono props: support OSX and more .NET Framework versions A potential solve for #6180 that uses msbuild built-ins to determine the target OS and pivots off of that to set the FrameworkPathOverride. I included a `MonoRoot` property to allow for easy integration into the build process that fsharp/fsharp uses, which allows for a 'floating' mono root. * add osx build jobs matching the linux jobs, and add a matrix entry to build the compiler for .net framework using mono * don't try to build anything for .net framework on non-windows this required additional build work that may conflict with upcoming work, so we'll just settle for building the existing components on macos at all in CI
* fix double-build of vsix packages (#6232) * Update Microsoft.FSharp.vsmanproj
* debug fixes * apply code review fixes
brettfo
force-pushed
the
merges/master-to-dev16.1
branch
from
70b5d2a to
fc15661
Compare
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.