Skip to content

Merge master into live #4056

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 9 commits into from
Mar 31, 2020
Merged

Merge master into live #4056

merged 9 commits into from
Mar 31, 2020

Conversation

cxwtool
Copy link

@cxwtool cxwtool commented Mar 31, 2020

Please don't squash-merge this PR.

stephentoub and others added 9 commits March 29, 2020 14:06
F# was not listed in the summary of languages that support the `ConditionalAttribute`. Just a small change, added `F#` there ;).
Remove incorrect nullable information from GetIPv4Properties
Add F# to supported langs of ConditionalAttribute
Fix copy/paste error.
* Update missing Winforms documentation

* Update xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/ComboBox.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/ComboBox.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/Form.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/ListBox.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/MonthCalendar.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml

Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Update xml/System.ComponentModel.Design/DesignerActionService.xml

* Apply suggestions from code review

Co-Authored-By: Merrie McGaw <[email protected]>
Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Apply suggestions from code review

Co-Authored-By: Merrie McGaw <[email protected]>
Co-Authored-By: Carlos Sanchez Lopez <[email protected]>

* Apply suggestions from code review

* Update xml/System.ComponentModel.Design/ObjectSelectorEditor.xml

* added article to describe new Explorer style theme

* add exception documentation

* Update xml/System.ComponentModel.Design/DesignerActionService.xml

Co-Authored-By: Andy De George <[email protected]>

* Change TreeView to cref link

Co-authored-by: Carlos Sanchez Lopez <[email protected]>
Co-authored-by: Merrie McGaw <[email protected]>
Co-authored-by: Andy De George <[email protected]>
* Update assemblyinstaller.cs

* Update 

assemblyinstaller.vb

* Update assemblyinstaller.cpp
@dotnet-bot dotnet-bot added this to the April 2020 milestone Mar 31, 2020
@BillWagner BillWagner merged commit e4dd6c1 into live Mar 31, 2020
@BillWagner BillWagner deleted the publish-27283 branch March 31, 2020 12:42
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.

9 participants