Merge pull request #4241 from dotnet/publish-9619

Merge master into live

Author: BillWagner

xml/System.Windows.Forms/Control+ControlCollection.xml

@@ -93,6 +93,7 @@
         <param name="owner">A <see cref="T:System.Windows.Forms.Control" /> representing the control that owns the control collection.</param>
         <summary>Initializes a new instance of the <see cref="T:System.Windows.Forms.Control.ControlCollection" /> class.</summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="owner" /> argument is <see langword="null" />.</exception>
         <altmember cref="P:System.Windows.Forms.Control.Controls" />
       </Docs>
     </Member>

xml/System.Windows.Forms/DataGridViewComboBoxEditingControl.xml

@@ -125,6 +125,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="dataGridViewCellStyle" /> argument is <see langword="null" />.</exception>
         <altmember cref="T:System.Windows.Forms.DataGridView" />
         <altmember cref="T:System.Windows.Forms.DataGridViewCellStyle" />
         <altmember cref="P:System.Windows.Forms.Control.Font" />

xml/System.Windows.Forms/RichTextBox.xml

@@ -751,12 +751,11 @@
   
  ]]></format>
         </remarks>
-        <exception cref="T:System.ArgumentNullException">
-          <paramref name="tabPageName" /> is <see langword="null" />.  
+        <exception cref="T:System.ArgumentNullException">The <paramref name="tabPageName" /> argument is <see langword="null" />.  
 
  -or-  
 
- <paramref name="tabPageName" /> does not match the <see cref="P:System.Windows.Forms.Control.Name" /> property of any <see cref="T:System.Windows.Forms.TabPage" /> in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
+ The <paramref name="tabPageName" /> argument does not match the <see cref="P:System.Windows.Forms.Control.Name" /> property of any <see cref="T:System.Windows.Forms.TabPage" /> in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
         <altmember cref="T:System.Windows.Forms.TabPage" />
         <altmember cref="Overload:System.Windows.Forms.TabControl.SelectTab" />
         <altmember cref="P:System.Windows.Forms.TabControl.SelectedIndex" />
@@ -804,8 +803,7 @@
  -or-  
 
  <paramref name="tabPage" /> is not in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
-        <exception cref="T:System.ArgumentNullException">
-          <paramref name="tabPage" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.ArgumentNullException">The <paramref name="tabPage" /> argument is <see langword="null" />.</exception>
         <altmember cref="T:System.Windows.Forms.TabPage" />
         <altmember cref="Overload:System.Windows.Forms.TabControl.SelectTab" />
         <altmember cref="P:System.Windows.Forms.TabControl.SelectedIndex" />
@@ -1248,6 +1246,8 @@
         <summary>Gets the ToolTip for the specified <see cref="T:System.Windows.Forms.TabPage" />.</summary>
         <returns>The ToolTip text.</returns>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="item" /> argument is <see langword="null" />.</exception>
+        <exception cref="T:System.ArgumentException">.NET 5.0 and later: The <paramref name="item" /> argument is not of type <see cref="T:System.Windows.Forms.TabPage" />.</exception>
       </Docs>
     </Member>
     <Member MemberName="HotTrack">
@@ -2715,12 +2715,11 @@
   
  ]]></format>
         </remarks>
-        <exception cref="T:System.ArgumentNullException">
-          <paramref name="tabPageName" /> is <see langword="null" />.  
+        <exception cref="T:System.ArgumentNullException">The <paramref name="tabPageName" /> argument is <see langword="null" />.  
 
  -or-  
 
- <paramref name="tabPageName" /> does not match the <see cref="P:System.Windows.Forms.Control.Name" /> property of any <see cref="T:System.Windows.Forms.TabPage" /> in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
+ The <paramref name="tabPageName" /> argument does not match the <see cref="P:System.Windows.Forms.Control.Name" /> property of any <see cref="T:System.Windows.Forms.TabPage" /> in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
         <altmember cref="T:System.Windows.Forms.TabPage" />
         <altmember cref="Overload:System.Windows.Forms.TabControl.DeselectTab" />
         <altmember cref="P:System.Windows.Forms.TabControl.SelectedIndex" />
@@ -2768,8 +2767,7 @@
  -or-  
 
  <paramref name="tabPage" /> is not in the <see cref="P:System.Windows.Forms.TabControl.TabPages" /> collection.</exception>
-        <exception cref="T:System.ArgumentNullException">
-          <paramref name="tabPage" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.ArgumentNullException">The <paramref name="tabPage" /> argument is <see langword="null" />.</exception>
         <altmember cref="Overload:System.Windows.Forms.TabControl.DeselectTab" />
         <altmember cref="T:System.Windows.Forms.TabPage" />
         <altmember cref="P:System.Windows.Forms.TabControl.SelectedIndex" />

xml/System.Windows.Forms/TabControl.xml

@@ -74,6 +74,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="container" /> argument is <see langword="null" />.</exception>
         <altmember cref="P:System.Windows.Forms.TableLayoutPanel.Controls" />
       </Docs>
     </Member>

xml/System.Windows.Forms/TableLayoutControlCollection.xml

@@ -942,6 +942,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="e" /> argument is <see langword="null" />.</exception>
         <block subset="none" type="overrides">
           <para>When overriding <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderArrow(System.Windows.Forms.ToolStripArrowRenderEventArgs)" /> in a derived class, be sure to call the base class's <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderArrow(System.Windows.Forms.ToolStripArrowRenderEventArgs)" /> method so that registered delegates receive the event.</para>
         </block>
@@ -976,9 +977,7 @@
 ## Remarks  
  Raising an event invokes the event handler through a delegate. For more information, see [Handling and Raising Events](~/docs/standard/events/index.md).  
   
- The <xref:System.Windows.Forms.ToolStripRenderer.OnRenderButtonBackground%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.  
-  
-   
+ The <xref:System.Windows.Forms.ToolStripRenderer.OnRenderButtonBackground%2A> method also allows derived classes to handle the event without attaching a delegate. This is the preferred technique for handling the event in a derived class.
   
 ## Examples  
  The following code example demonstrates how to override the <xref:System.Windows.Forms.ToolStripRenderer.OnRenderButtonBackground%2A> method to draw a border around a <xref:System.Windows.Forms.ToolStripButton> control's <xref:System.Windows.Forms.ToolStripItem.Image%2A>. This code example is part of a larger example provided for the <xref:System.Windows.Forms.ToolStripRenderer> class.  
@@ -1179,6 +1178,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="e" /> argument is <see langword="null" />.</exception>
         <block subset="none" type="overrides">
           <para>When overriding <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemCheck(System.Windows.Forms.ToolStripItemImageRenderEventArgs)" /> in a derived class, be sure to call the base class's <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemCheck(System.Windows.Forms.ToolStripItemImageRenderEventArgs)" /> method so that registered delegates receive the event.</para>
         </block>
@@ -1217,6 +1217,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="e" /> argument is <see langword="null" />.</exception>
         <block subset="none" type="overrides">
           <para>When overriding <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemImage(System.Windows.Forms.ToolStripItemImageRenderEventArgs)" /> in a derived class, be sure to call the base class's <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemImage(System.Windows.Forms.ToolStripItemImageRenderEventArgs)" /> method so that registered delegates receive the event.</para>
         </block>
@@ -1255,6 +1256,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="e" /> argument is <see langword="null" />.</exception>
         <block subset="none" type="overrides">
           <para>When overriding <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemText(System.Windows.Forms.ToolStripItemTextRenderEventArgs)" /> in a derived class, be sure to call the base class's <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderItemText(System.Windows.Forms.ToolStripItemTextRenderEventArgs)" /> method so that registered delegates receive the event.</para>
         </block>
@@ -1483,6 +1485,7 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">.NET 5.0 and later: The <paramref name="e" /> argument is <see langword="null" />.</exception>
         <block subset="none" type="overrides">
           <para>When overriding <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderStatusStripSizingGrip(System.Windows.Forms.ToolStripRenderEventArgs)" /> in a derived class, be sure to call the base class's <see cref="M:System.Windows.Forms.ToolStripRenderer.OnRenderStatusStripSizingGrip(System.Windows.Forms.ToolStripRenderEventArgs)" /> method so that registered delegates receive the event.</para>
         </block>

xml/System.Windows.Forms/ToolStripRenderer.xml

@@ -188,6 +188,36 @@ Uri uri1 = new Uri("C:/test/path/file.txt") // Implicit file path.
 Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
 ```
  These implicit file paths are not compliant with the URI specification and so should be avoided when possible. When using .NET Core on Unix-based systems, implicit file paths can be especially problematic, because an absolute implicit file path is *indistinguishable* from a relative path. When such ambiguity is present, <xref:System.Uri> default to interpreting the path as an absolute URI.
+
+## Security Considerations
+
+Because of security concerns, your application should use caution when accepting <xref:System.Uri> instances from untrusted sources and with `dontEscape` set to `true` in the [constructor](xref:System.Uri.%23ctor(System.String,System.Boolean)). You can check a URI string for validity by calling the <xref:System.Uri.IsWellFormedOriginalString%2A> method.
+
+When dealing with untrusted user input, confirm assumptions about the newly created `Uri` instance before trusting its properties.
+This can be done in the following way:
+
+```csharp
+string userInput = ...;
+
+Uri baseUri = new Uri("https://myWebsite/files/");
+
+if (!Uri.TryCreate(baseUri, userInput, out Uri newUri))
+{
+    // Fail: invalid input.
+}
+
+if (!baseUri.IsBaseOf(newUri))
+{
+    // Fail: the Uri base has been modified - the created Uri is not rooted in the original directory.
+}
+```
+
+This validation can be used in other cases, like when dealing with UNC paths, by simply changing the `baseUri`:
+
+```csharp
+Uri baseUri = new Uri(@"\\host\share\some\directory\name\");
+```
+
   
 ## Performance Considerations  
  If you use a *Web.config *file that contains URIs to initialize your application, additional time is required to process the URIs if their scheme identifiers are nonstandard. In such a case, initialize the affected parts of your application when the URIs are needed, not at start time.  
@@ -203,9 +233,6 @@ Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
   
  ]]></format>
     </remarks>
-    <block subset="none" type="usage">
-      <para>Because of security concerns, your application should use caution when accepting <see cref="T:System.Uri" /> instances from untrusted sources and with <paramref name="dontEscape" /> set to <see langword="true" />.You can check a URI string for validity by calling the <see cref="M:System.Uri.IsWellFormedOriginalString" /> method.</para>
-    </block>
     <altmember cref="T:System.Configuration.IdnElement" />
     <altmember cref="T:System.Configuration.IriParsingElement" />
     <altmember cref="T:System.Configuration.UriSection" />

xml/System/Uri.xml

@@ -165,5 +165,14 @@
       <typeFilter name="DependencyInjectionSpecificationTests" expose="false" />
       <typeFilter name="DependencyInjectionSpecificationTests.CreateInstanceFunc" expose="false" />
     </namespaceFilter>
+    <namespaceFilter name="StackExchange.Redis">
+      <typeFitler name="*" expose="false" />
+    </namespaceFilter>
+    <namespaceFilter name="Polly">
+      <typeFilter name="*" expose="false" />
+    </namespaceFilter>
+    <namespaceFilter name="Polly.Registry">
+      <typeFilter name="*" expose="false" />
+    </namespaceFilter>
   </apiFilter>
 </filter>