Skip to content
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

Add Roslyn 15.1 binaries to Roslyn branch, updating to latest from master #1351

Merged
merged 168 commits into from
Jul 20, 2016
Merged

Add Roslyn 15.1 binaries to Roslyn branch, updating to latest from master #1351

merged 168 commits into from
Jul 20, 2016

Conversation

OmarTawfik
Copy link
Contributor

@Microsoft/fsharp-compiler @cartermp

@dsyme
Copy link
Contributor

dsyme commented Jul 15, 2016

Hard to review because of so many changed files inn the overall merge :)

@OmarTawfik
Copy link
Contributor Author

@dsyme It is just bringing the latest changes from master, and updating all project references to Roslyn 2.0 beta version. No code changes. I'll fix the remaining references now as some are missing from jenkins/appveyor.

@dsyme
Copy link
Contributor

dsyme commented Jul 15, 2016

Ah ok :)

@forki
Copy link
Contributor

forki commented Jul 18, 2016

I'm not really sure what the purpose of this roslyn branch is. I propose the following:

  • rebase the rosyln branch on the current master using git pull --rebase origin master
  • create a WIP PR on master with the roslyn changes
  • write an abstract with the purpose and plan of the roslyn branch
  • create a checklist in the description of the PR which documents status of the roslyn features
  • from time to time run git pull --rebase origin master and git push origin roslyn -f to update the PR with the latest bits that are commited to master

this is basically what I do with my PRs here and what I think allows others to review the code and the progress of a feature. Thanks,

@veikkoeeva
Copy link

@forki Should that be git pull --rebase upstream master (while in local branch roslyn and assuming the origin of fork is aliased conventially as upstream)? Maybe worth considering to use git push --force-with-lease origin +roslyn, git push --force-with-lease origin roslyn or git push origin +roslyn.

@forki
Copy link
Contributor

forki commented Jul 18, 2016

@veikkoeeva yes if you are using second remote called upstream, then yes.

@ghost
Copy link

ghost commented Jul 18, 2016

@forki the work is described in #913 in detail. Please let me know if that doesn't answer your questions.

@smoothdeveloper
Copy link
Contributor

@oamsath what @forki describes would allow people to actually review the changes from github, we have seen few of those "big merge" PR related to roslyn but I'm at loss as to how to review the code changes.

Doing what @forki describes there would be a single roslyn PR based off the same https://github.com/otawfik-ms/visualfsharp/tree/roslyn branch, that branch would be rebased from time to time off https://github.com/Microsoft/visualfsharp/tree/master. At any point, someone consulting the "files" tabs of this hypothetical PR, would see only the changes related to roslyn integration, with 0 noise related to merge or catching up with master (which represents the majority of the commits that are not related to roslyn in this current PR).

@smoothdeveloper
Copy link
Contributor

@forki: found how to see the roslyn changes from github: https://github.com/Microsoft/visualfsharp/compare/roslyn

@OmarTawfik
Copy link
Contributor Author

@smoothdeveloper this is just bringing the branch up to date. No feature work is done in this PR. Features are always sent in new PRs that just contain the changes being done.

@OmarTawfik OmarTawfik merged commit b7a3144 into dotnet:roslyn Jul 20, 2016
@OmarTawfik OmarTawfik deleted the roslyn branch July 20, 2016 00:01
@smoothdeveloper
Copy link
Contributor

@otawfik-ms thanks for the notice, since I'm contributing a bit to VFPT which has few code suggestions, it might be useful to know where those features are being worked on to take inspiration from their structure / APIs used.

Also, is there a list of considered features (even if most/some won't ship)? this would give a hint of what we can expect the new roslyn workspace to provide Visual F# with.

@OmarTawfik
Copy link
Contributor Author

OmarTawfik commented Jul 20, 2016

@smoothdeveloper Yes. Please check issue #913.
The previous PRs I sent were #974 and #993.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.