Skip to content

Commit e4dd6c1

Browse files
BillWagnerBillWagner
authored
Merge pull request #4056 from dotnet/publish-27283
Merge master into live
2 parents 673db54 + b31576e commit e4dd6c1

File tree

16 files changed

+65
-49
lines changed

16 files changed

+65
-49
lines changed

‎samples/snippets/cpp/VS_Snippets_CLR/AssemblyInstaller/CPP/assemblyinstaller.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ int main()
3333
// Commit the 'MyAssembly' assembly.
3434
myAssemblyInstaller->Commit( mySavedState );
3535
}
36-
catch ( ArgumentException^ )
37-
{
38-
}
3936
catch ( Exception^ e )
4037
{
4138
Console::WriteLine( e->Message );

‎samples/snippets/csharp/VS_Snippets_CLR/AssemblyInstaller/CS/assemblyinstaller.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@ static void Main()
3737
// Commit the 'MyAssembly' assembly.
3838
myAssemblyInstaller.Commit( mySavedState );
3939
}
40-
catch (ArgumentException)
41-
{
42-
}
4340
catch (Exception e)
4441
{
4542
Console.WriteLine( e.Message );
4643
}
4744
}
4845
}
49-
// </Snippet1>
46+
// </Snippet1>

‎samples/snippets/csharp/VS_Snippets_CLR/InstallContext_InstallContext/CS/installcontext_installcontext.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class InstallContext_Example : Installer
3434

3535
public override void Install( IDictionary mySavedState )
3636
{
37+
base.Install( mySavedState );
3738
// <Snippet6>
3839
StringDictionary myStringDictionary = myInstallContext.Parameters;
3940
if( myStringDictionary.Count == 0 )
@@ -61,11 +62,13 @@ public override void Install( IDictionary mySavedState )
6162

6263
public override void Uninstall( IDictionary mySavedState )
6364
{
65+
base.Uninstall( mySavedState );
6466
// The 'Uninstall' procedure should be added here.
6567
}
6668

6769
public override void Rollback( IDictionary mySavedState )
6870
{
71+
base.Rollback( mySavedState );
6972
if( myInstallContext.IsParameterTrue( "LogtoConsole" ) == true )
7073
{
7174
myInstallContext.LogMessage( "The 'Rollback' method has been called" );
@@ -76,6 +79,7 @@ public override void Rollback( IDictionary mySavedState )
7679

7780
public override void Commit( IDictionary mySavedState )
7881
{
82+
base.Commit( mySavedState );
7983
if( myInstallContext.IsParameterTrue( "LogtoConsole" ) == true )
8084
{
8185
myInstallContext.LogMessage( "The 'Commit' method has been called" );

‎samples/snippets/visualbasic/VS_Snippets_CLR/AssemblyInstaller/VB/assemblyinstaller.vb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ Class AssemblyInstaller_Example
3333

3434
' Commit the 'MyAssembly' assembly.
3535
myAssemblyInstaller.Commit(mySavedState)
36-
Catch e As ArgumentException
3736
Catch e As Exception
3837
Console.WriteLine(e.Message)
3938
End Try
4039
End Sub
4140
End Class
42-
' </Snippet1>
41+
' </Snippet1>

‎xml/System.ComponentModel.Design/DesignerActionService.xml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -619,11 +619,27 @@
619619
<Parameter Name="type" Type="System.Windows.Forms.Design.ComponentActionsType" Index="1" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
620620
</Parameters>
621621
<Docs>
622-
<param name="component">To be added.</param>
623-
<param name="type">To be added.</param>
624-
<summary>To be added.</summary>
625-
<returns>To be added.</returns>
626-
<remarks>To be added.</remarks>
622+
<param name="component">The component that the DesignerActions are associated with.</param>
623+
<param name="type">The <see cref="T:System.ComponentModel.Design.ComponentActionsType" /> to filter the associated designer actions with.</param>
624+
<summary>Returns the collection of designer action item lists of the specified type associated with a component.</summary>
625+
<returns>The collection of designer actions of the specified type for the specified component.</returns>
626+
<exception cref="T:System.ArgumentNullException"><paramref name="component" /> is <see langword="null" />.</exception>
627+
<remarks>
628+
<format type="text/markdown"><![CDATA[
629+
630+
## Remarks
631+
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.
632+
633+
|Value|Description|
634+
|-----------|-----------------|
635+
|<xref:System.ComponentModel.Design.ComponentActionsType.All>|All associated designer actions.|
636+
|<xref:System.ComponentModel.Design.ComponentActionsType.Component>|Pull-model designer actions only.|
637+
|<xref:System.ComponentModel.Design.ComponentActionsType.Service>|Push-model designer actions only.|
638+
639+
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.
640+
641+
]]></format>
642+
</remarks>
627643
</Docs>
628644
</Member>
629645
<Member MemberName="GetComponentDesignerActions">

‎xml/System.ComponentModel.Design/ObjectSelectorEditor.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@
135135
<Parameter Name="treeView" Type="System.Windows.Forms.TreeView" Index="0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
136136
</Parameters>
137137
<Docs>
138-
<param name="treeView">To be added.</param>
139-
<summary>To be added.</summary>
140-
<remarks>To be added.</remarks>
138+
<param name="treeView">The tree view control to modify.</param>
139+
<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>
141140
</Docs>
142141
</Member>
143142
<Member MemberName="currValue">

‎xml/System.Diagnostics/ConditionalAttribute.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
#Const DEBUG=False
8787
```
8888
89-
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.
89+
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.
9090
9191
> [!NOTE]
9292
> 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.

‎xml/System.Net.NetworkInformation/IPInterfaceProperties.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,11 @@
387387
<Parameters />
388388
<Docs>
389389
<summary>Provides Internet Protocol version 4 (IPv4) configuration data for this network interface.</summary>
390-
<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>
390+
<returns>An <see cref="T:System.Net.NetworkInformation.IPv4InterfaceProperties" /> object that contains IPv4 configuration data.</returns>
391391
<remarks>
392392
<format type="text/markdown"><![CDATA[
393393
394394
## Remarks
395-
This property returns `null` for <xref:System.Net.NetworkInformation.NetworkInterfaceType.Loopback> interfaces.
396-
397395
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.
398396
399397
]]></format>

‎xml/System.Numerics/BigInteger.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3554,7 +3554,7 @@ value Mod 2 = 0
35543554
## Remarks
35553555
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.
35563556

3557-
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.
3557+
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.
35583558

35593559
## Examples
35603560
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.

‎xml/System.Windows.Forms.Design/ComponentActionsType.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<BaseTypeName>System.Enum</BaseTypeName>
1515
</Base>
1616
<Docs>
17-
<summary>To be added.</summary>
17+
<summary>Designer action items that can be associated with a component.</summary>
1818
<remarks>To be added.</remarks>
1919
</Docs>
2020
<Members>
@@ -36,7 +36,7 @@
3636
</ReturnValue>
3737
<MemberValue>0</MemberValue>
3838
<Docs>
39-
<summary>To be added.</summary>
39+
<summary>Represents component and service type designer actions.</summary>
4040
</Docs>
4141
</Member>
4242
<Member MemberName="Component">
@@ -57,7 +57,7 @@
5757
</ReturnValue>
5858
<MemberValue>1</MemberValue>
5959
<Docs>
60-
<summary>To be added.</summary>
60+
<summary>Represents pull-model designer actions.</summary>
6161
</Docs>
6262
</Member>
6363
<Member MemberName="Service">
@@ -78,7 +78,7 @@
7878
</ReturnValue>
7979
<MemberValue>2</MemberValue>
8080
<Docs>
81-
<summary>To be added.</summary>
81+
<summary>Represents push-model designer actions.</summary>
8282
</Docs>
8383
</Member>
8484
</Members>

0 commit comments

Comments
 (0)