Integrate dotnet/fsharp master from 419a4c71b (2019-05-03) to 25560f477 (2019-05-24) #903
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
Remove copyright made redundant by dotnet/arcade#2635.
* Update dependencies from https://github.com/dotnet/arcade build 20190503.8 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19253.8 * Update dependencies from https://github.com/dotnet/arcade build 20190504.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19254.1 * Update dependencies from https://github.com/dotnet/arcade build 20190505.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19255.2
* Update dependencies from https://github.com/dotnet/arcade build 20190506.12 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19256.12 * Update dependencies from https://github.com/dotnet/arcade build 20190507.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19257.7
…508.5 (#6703) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19258.5
* Update dependencies from https://github.com/dotnet/arcade build 20190509.9 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19259.9 * Update dependencies from https://github.com/dotnet/arcade build 20190510.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19260.2
* Start the wire up * Redo using less memory * Add asserts * indent typo
* Update dependencies from https://github.com/dotnet/arcade build 20190511.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19261.1 * Update dependencies from https://github.com/dotnet/arcade build 20190512.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19262.1
* Trying to fix script performance * Changed cancellation strategy * Added back cancellationToken
* fix typo * fix typo
PRs are now handled by `azure-pipelines.yml`.
…513.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19263.3
…514.13 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19264.13
This changes our build to mark all of our .NET Core applications as rolling forward on major / minor versions of the .NET framework. Presently our tools ship inside both .NET Core 2 and 3 SDKs. This setting allows our tools to run unmodified in both settings.
* Allow targetting of preview FSharp.Core. Parameterize dsharp.core versions * Parameterise app.config generation * parameterize banner text * Do app.config right * fcs * fcs tests * add discriminator * Update FSharp.Compiler.Service.ProjectCrackerTool.fsproj * remove dead file
Primarily useful when testing build process changes.
* Update issue templates Differentiate between bug and feature requests. Also cleans up/updates the existing bug report template. * Update bug_report.md * Delete ISSUE_TEMPLATE.md
sqlclr, liveshare, and Just in time debugging aren't necessary
* Fix unused opens false positive for record fields * Add record check
7 tasks
|
@dsyme could I get you to sanity-check the changes in 0a29fbf specifically? The project files modified in that commit had duplicate references (for project refs and package refs to the newly-extracted MSBuild dependency nuget package) and I tried to sync them up with |
|
I take it back, most of the differences were themselves problems with the merge. This should be a much smaller diff now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Thanks to the magic of
git rebase --onto integration_branch last_integration_point vf#/master --preserve-merges, we have just the subset of commits for the last month or so to integrate. Release notes are updated and when this is green and merged I can publish packages. In addition, once this release goes out I can reverse-integrate with upstream.