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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ int main()
// Commit the 'MyAssembly' assembly.
myAssemblyInstaller->Commit( mySavedState );
}
catch ( ArgumentException^ )
{
}
catch ( Exception^ e )
{
Console::WriteLine( e->Message );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,10 @@ static void Main()
// Commit the 'MyAssembly' assembly.
myAssemblyInstaller.Commit( mySavedState );
}
catch (ArgumentException)
{
}
catch (Exception e)
{
Console.WriteLine( e.Message );
}
}
}
// </Snippet1>
// </Snippet1>
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class InstallContext_Example : Installer

public override void Install( IDictionary mySavedState )
{
base.Install( mySavedState );
// <Snippet6>
StringDictionary myStringDictionary = myInstallContext.Parameters;
if( myStringDictionary.Count == 0 )
Expand Down Expand Up @@ -61,11 +62,13 @@ public override void Install( IDictionary mySavedState )

public override void Uninstall( IDictionary mySavedState )
{
base.Uninstall( mySavedState );
// The 'Uninstall' procedure should be added here.
}

public override void Rollback( IDictionary mySavedState )
{
base.Rollback( mySavedState );
if( myInstallContext.IsParameterTrue( "LogtoConsole" ) == true )
{
myInstallContext.LogMessage( "The 'Rollback' method has been called" );
Expand All @@ -76,6 +79,7 @@ public override void Rollback( IDictionary mySavedState )

public override void Commit( IDictionary mySavedState )
{
base.Commit( mySavedState );
if( myInstallContext.IsParameterTrue( "LogtoConsole" ) == true )
{
myInstallContext.LogMessage( "The 'Commit' method has been called" );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ Class AssemblyInstaller_Example

' Commit the 'MyAssembly' assembly.
myAssemblyInstaller.Commit(mySavedState)
Catch e As ArgumentException
Catch e As Exception
Console.WriteLine(e.Message)
End Try
End Sub
End Class
' </Snippet1>
' </Snippet1>
26 changes: 21 additions & 5 deletions xml/System.ComponentModel.Design/DesignerActionService.xml
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,27 @@
<Parameter Name="type" Type="System.Windows.Forms.Design.ComponentActionsType" Index="1" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="component">To be added.</param>
<param name="type">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="component">The component that the DesignerActions are associated with.</param>
<param name="type">The <see cref="T:System.ComponentModel.Design.ComponentActionsType" /> to filter the associated designer actions with.</param>
<summary>Returns the collection of designer action item lists of the specified type associated with a component.</summary>
<returns>The collection of designer actions of the specified type for the specified component.</returns>
<exception cref="T:System.ArgumentNullException"><paramref name="component" /> is <see langword="null" />.</exception>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks
This version of the overloaded <xref:System.ComponentModel.Design.DesignerActionService.GetComponentActions%2A> method filters on the `type` parameter, which can have one of the following values.

|Value|Description|
|-----------|-----------------|
|<xref:System.ComponentModel.Design.ComponentActionsType.All>|All associated designer actions.|
|<xref:System.ComponentModel.Design.ComponentActionsType.Component>|Pull-model designer actions only.|
|<xref:System.ComponentModel.Design.ComponentActionsType.Service>|Push-model designer actions only.|

If the associated designer for a component does not supply a pull-model designer action list, then the <xref:System.ComponentModel.Design.DesignerActionService.GetComponentActions%2A> method will instead use the designer's design-time shortcut menu items from the <xref:System.ComponentModel.Design.ComponentDesigner.Verbs%2A> property.

]]></format>
</remarks>
</Docs>
</Member>
<Member MemberName="GetComponentDesignerActions">
Expand Down
5 changes: 2 additions & 3 deletions xml/System.ComponentModel.Design/ObjectSelectorEditor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,8 @@
<Parameter Name="treeView" Type="System.Windows.Forms.TreeView" Index="0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="treeView">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<param name="treeView">The tree view control to modify.</param>
<summary>Modify a Windows Forms <see cref="T:System.Windows.Forms.TreeView" /> control to use the <related type="Article" href="https://docs.microsoft.com/en-us/dotnet/framework/winforms/controls/creating-an-explorer-style-interface-with-the-listview-and-treeview"> new Explorer style theme</related>.</summary>
</Docs>
</Member>
<Member MemberName="currValue">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Diagnostics/ConditionalAttribute.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
#Const DEBUG=False
```

Compilers that comply with the Common Language Specification (CLS) are permitted to ignore <xref:System.Diagnostics.ConditionalAttribute>. The C#, Visual Basic, and C++ compilers support <xref:System.Diagnostics.ConditionalAttribute>; the JScript compiler does not support the attribute.
Compilers that comply with the Common Language Specification (CLS) are permitted to ignore <xref:System.Diagnostics.ConditionalAttribute>. The C#, F#, Visual Basic, and C++ compilers support <xref:System.Diagnostics.ConditionalAttribute>; the JScript compiler does not support the attribute.

> [!NOTE]
> In Visual Basic, the `AddressOf` operator is not affected by this attribute. For example, `Call CType(AddressOf delegate, Action)` always invokes `delegate`, although `Call delegate()` might not.
Expand Down
4 changes: 1 addition & 3 deletions xml/System.Net.NetworkInformation/IPInterfaceProperties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,11 @@
<Parameters />
<Docs>
<summary>Provides Internet Protocol version 4 (IPv4) configuration data for this network interface.</summary>
<returns>An <see cref="T:System.Net.NetworkInformation.IPv4InterfaceProperties" /> object that contains IPv4 configuration data, or <see langword="null" /> if no data is available for the interface.</returns>
<returns>An <see cref="T:System.Net.NetworkInformation.IPv4InterfaceProperties" /> object that contains IPv4 configuration data.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks
This property returns `null` for <xref:System.Net.NetworkInformation.NetworkInterfaceType.Loopback> interfaces.

For a detailed description of the information available for an interface that supports IPv4, see the <xref:System.Net.NetworkInformation.IPv4InterfaceProperties> class documentation. Note that the object returned by the <xref:System.Net.NetworkInformation.IPInterfaceProperties.GetIPv4Properties%2A> method reflects the configuration as of the time the object is created. This information is not updated dynamically.

]]></format>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Numerics/BigInteger.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3554,7 +3554,7 @@ value Mod 2 = 0
## Remarks
The overloads of the <xref:System.Numerics.BigInteger.op_Explicit(System.Decimal)~System.Numerics.BigInteger> method define the types to which or from which a <xref:System.Numerics.BigInteger> object can be converted. Language compilers do not perform this conversion automatically because it can involve data loss. Instead, they perform the conversion only if a casting operator (in C#) or a conversion function (such as `CType` or `CInt` in Visual Basic) is used. Otherwise, they display a compiler error.

Because this operation defines a narrowing conversion, it can throw an <xref:System.OverflowException> at run time if the <xref:System.Numerics.BigInteger> value is outside the range of the <xref:System.Int32> data type. There is no loss of precision in the resulting <xref:System.Int16> value if the conversion is successful.
Because this operation defines a narrowing conversion, it can throw an <xref:System.OverflowException> at run time if the <xref:System.Numerics.BigInteger> value is outside the range of the <xref:System.Int32> data type. There is no loss of precision in the resulting <xref:System.Int32> value if the conversion is successful.

## Examples
The following example illustrates the conversion of <xref:System.Numerics.BigInteger> to <xref:System.Int32> values. It also handles an <xref:System.OverflowException> that is thrown because the <xref:System.Numerics.BigInteger> value is outside the range of the <xref:System.Int32> data type.
Expand Down
8 changes: 4 additions & 4 deletions xml/System.Windows.Forms.Design/ComponentActionsType.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<BaseTypeName>System.Enum</BaseTypeName>
</Base>
<Docs>
<summary>To be added.</summary>
<summary>Designer action items that can be associated with a component.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
Expand All @@ -36,7 +36,7 @@
</ReturnValue>
<MemberValue>0</MemberValue>
<Docs>
<summary>To be added.</summary>
<summary>Represents component and service type designer actions.</summary>
</Docs>
</Member>
<Member MemberName="Component">
Expand All @@ -57,7 +57,7 @@
</ReturnValue>
<MemberValue>1</MemberValue>
<Docs>
<summary>To be added.</summary>
<summary>Represents pull-model designer actions.</summary>
</Docs>
</Member>
<Member MemberName="Service">
Expand All @@ -78,7 +78,7 @@
</ReturnValue>
<MemberValue>2</MemberValue>
<Docs>
<summary>To be added.</summary>
<summary>Represents push-model designer actions.</summary>
</Docs>
</Member>
</Members>
Expand Down
20 changes: 15 additions & 5 deletions xml/System.Windows.Forms/ComboBox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3106,11 +3106,21 @@
<Parameter Name="keyData" Type="System.Windows.Forms.Keys" Index="1" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="msg">To be added.</param>
<param name="keyData">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="msg">The window message to process, passed by reference.</param>
<param name="keyData">One of the enumeration values that represent the key to process.</param>
<summary>Processes a command key.</summary>
<returns>
<see langword="true" /> if the character was processed by the control; otherwise, <see langword="false" />.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks
This method is called during message preprocessing to handle command keys. Command keys are keys that always take precedence over regular input keys. Examples of command keys include accelerators and menu shortcuts. The method must return `true` to indicate that it has processed the command key, or `false` to indicate that the key is not a command key. This method is only called when the control is hosted in a Windows Forms application or as an ActiveX control.

The <xref:System.Windows.Forms.Control.ProcessCmdKey%2A> method first determines whether the control has a <xref:System.Windows.Forms.ContextMenu>, and if so, enables the <xref:System.Windows.Forms.ContextMenu> to process the command key. If the command key is not a menu shortcut and the control has a parent, the key is passed to the parent's <xref:System.Windows.Forms.Control.ProcessCmdKey%2A> method. The net effect is that command keys are "bubbled" up the control hierarchy. In addition to the key the user pressed, the key data also indicates which, if any, modifier keys were pressed at the same time as the key. Modifier keys include the SHIFT, CTRL, and ALT keys.

]]></format>
</remarks>
</Docs>
</Member>
<Member MemberName="ProcessKeyEventArgs">
Expand Down
8 changes: 4 additions & 4 deletions xml/System.Windows.Forms/DataGridView.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15233,10 +15233,10 @@
<Parameter Name="keyData" Type="System.Windows.Forms.Keys" Index="0" FrameworkAlternate="net-5.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="keyData">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="keyData">A bitwise combination of the enumeration values that represent the key or keys to process.</param>
<summary>Activates the keyboard tooltip.</summary>
<returns>
<see langword="true" /> if the key was processed; otherwise, <see langword="false" />.</returns>
</Docs>
</Member>
<Member MemberName="ProcessDataGridViewKey">
Expand Down
5 changes: 2 additions & 3 deletions xml/System.Windows.Forms/Form.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1377,9 +1377,8 @@
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<summary>Creates a new accessibility object for the <see cref="T:System.Windows.Forms.Form" /> control.</summary>
<returns>A new accessible object for the control.</returns>
</Docs>
</Member>
<Member MemberName="CreateControlsInstance">
Expand Down
5 changes: 2 additions & 3 deletions xml/System.Windows.Forms/ListBox.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2020,9 +2020,8 @@
<Parameter Name="e" Type="System.EventArgs" Index="0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="e">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<param name="e">An event data instance.</param>
<summary>Raises the <see cref="E:System.Windows.Forms.Control.GotFocus" /> event.</summary>
</Docs>
</Member>
<Member MemberName="OnHandleCreated">
Expand Down
5 changes: 2 additions & 3 deletions xml/System.Windows.Forms/MonthCalendar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1757,9 +1757,8 @@ The <xref:System.Windows.Forms.AccessibleObject> is only available in applicatio
<Parameter Name="e" Type="System.EventArgs" Index="0" FrameworkAlternate="net-5.0;netcore-3.1" />
</Parameters>
<Docs>
<param name="e">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<param name="e">An event data instance.</param>
<summary>Raises the <see cref="E:System.Windows.Forms.Control.GotFocus" /> event.</summary>
</Docs>
</Member>
<Member MemberName="OnHandleCreated">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</Base>
<Interfaces />
<Docs>
<summary>To be added.</summary>
<summary>Represents the accessible object control host responsible for accessible navigation within the <see cref="T:System.Windows.Forms.ToolStrip" /> standard items and hosted controls like TextBox, ComboBox, ProgressBar, etc.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
Expand All @@ -37,10 +37,9 @@
<Parameter Name="toolStripControlHost" Type="System.Windows.Forms.ToolStripControlHost" />
</Parameters>
<Docs>
<param name="toolStripHostedControl">To be added.</param>
<param name="toolStripControlHost">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<param name="toolStripHostedControl">The control hosted in the <see cref="T:System.Windows.Forms.ToolStripControlHost" /> container.</param>
<param name="toolStripControlHost">The container which hosts a control on the <see cref="T:System.Windows.Forms.ToolStrip" />.</param>
<summary> Initializes a new <see cref="T:System.Windows.Forms.ToolStripControlHost.ToolStripHostedControlAccessibleObject" /> instance with the specified tool strip hosted control and tool strip control host. </summary>
</Docs>
</Member>
</Members>
Expand Down