Merge branch 'master' into publish-8420

Author: cxwtool

samples/snippets/csharp/VS_Snippets_CLR/CodeDomHelloWorldSample/cs/program.cs

@@ -13,20 +13,19 @@ class Program
         static string sourceFileName = "test.cs";
         static void Main(string[] args)
         {
-            CodeDomProvider provider =
-                CodeDomProvider.CreateProvider(providerName);
+            CodeDomProvider provider = CodeDomProvider.CreateProvider(providerName);
 
             LogMessage("Building CodeDOM graph...");
 
             CodeCompileUnit cu = new CodeCompileUnit();
 
             cu = BuildHelloWorldGraph();
 
-     	     //<Snippet5>
+            //<Snippet5>
             StreamWriter sourceFile = new StreamWriter(sourceFileName);
             provider.GenerateCodeFromCompileUnit(cu, sourceFile, null);
             sourceFile.Close();
-	     //</Snippet5>
+            //</Snippet5>
 
             //<Snippet6>
             CompilerParameters opt = new CompilerParameters(new string[]{
@@ -59,8 +58,7 @@ static void Main(string[] args)
         }
 
         //<Snippet2>
-        // Build a Hello World program graph using
-        // System.CodeDom types.
+        // Build a Hello World program graph using System.CodeDom types.
         public static CodeCompileUnit BuildHelloWorldGraph()
         {
             // Create a new CodeCompileUnit to contain
@@ -82,9 +80,9 @@ public static CodeCompileUnit BuildHelloWorldGraph()
             class1.Comments.Add(new CodeCommentStatement("<summary>", true));
             class1.Comments.Add(new CodeCommentStatement(
                 "Create a Hello World application.", true));
+            class1.Comments.Add(new CodeCommentStatement("</summary>", true));
             class1.Comments.Add(new CodeCommentStatement(
                 @"<seealso cref=" + '"' + "Class1.Main" + '"' + "/>", true));
-            class1.Comments.Add(new CodeCommentStatement("</summary>", true));
 
             // Add the new type to the namespace type collection.
             samples.Types.Add(class1);

samples/snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb

@@ -4,8 +4,6 @@ Imports System.CodeDom.Compiler
 Imports System.IO
 Imports System.Text.RegularExpressions
 
-
-
 Class Program
     Private Shared providerName As String = "vb"
     Private Shared sourceFileName As String = "test.vb"
@@ -21,7 +19,6 @@ Class Program
         cu = BuildHelloWorldGraph()
 
         '<Snippet5>
-
         Dim sourceFile As New StreamWriter(sourceFileName)
 
         LogMessage("Generating code...")
@@ -56,7 +53,6 @@ Class Program
 
     End Sub
 
-
     '<Snippet2>
     ' Build a Hello World program graph using 
     ' System.CodeDom types.
@@ -80,10 +76,10 @@ Class Program
         class1.Comments.Add(New CodeCommentStatement("<summary>", True))
         class1.Comments.Add(New CodeCommentStatement( _
             "Create a Hello World application.", True))
+        class1.Comments.Add(New CodeCommentStatement("</summary>", True))
         class1.Comments.Add(New CodeCommentStatement( _
             "<seealso cref=" & ControlChars.Quote & "Class1.Main" & _
             ControlChars.Quote & "/>", True))
-        class1.Comments.Add(New CodeCommentStatement("</summary>", True))
 
         ' Add the new type to the namespace type collection.
         samples.Types.Add(class1)
@@ -139,7 +135,6 @@ Class Program
 
     End Sub
 
-
     Shared Sub OutputResults(ByVal results As CompilerResults)
         LogMessage(("NativeCompilerReturnValue=" & _
             results.NativeCompilerReturnValue.ToString()))
@@ -150,4 +145,4 @@ Class Program
 
     End Sub
 End Class
-'</Snippet1>
+'</Snippet1>

xml/Microsoft.Extensions.DependencyInjection/OptionsBuilderDataAnnotationsExtensions.xml

@@ -16,7 +16,7 @@
   </Base>
   <Interfaces />
   <Docs>
-    <summary>Extension methods for adding configuration related options services to the DI container via <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" />.</summary>
+    <summary>Extension methods for adding configuration-related options services to the DI container via <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" />.</summary>
     <remarks>To be added.</remarks>
   </Docs>
   <Members>
@@ -50,7 +50,7 @@
       <Docs>
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="optionsBuilder">The options builder to add the services to.</param>
-        <summary>Register this options instance for validation of its DataAnnotations.</summary>
+        <summary>Registers this options instance for validation of its DataAnnotations.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>

xml/Microsoft.Extensions.DependencyInjection/OptionsServiceCollectionExtensions.xml

@@ -86,7 +86,7 @@
       <Docs>
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
-        <summary>Gets an options builder that forwards Configure calls for the same <typeparamref name="TOptions" /> to the underlying service collection.</summary>
+        <summary>Gets an options builder that forwards <c>Configure</c> calls for the same named <typeparamref name="TOptions" /> to the underlying service collection.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" /> so that configure calls can be chained in it.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -124,8 +124,8 @@
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="name">The name of the options instance.</param>
-        <summary>Gets an options builder that forwards Configure calls for the same named <typeparamref name="TOptions" /> to the underlying service collection.</summary>
-        <returns>The <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" /> so that configure calls can be chained in it.</returns>
+        <summary>Gets an options builder that forwards <c>Configure</c> calls for the same named <typeparamref name="TOptions" /> to the underlying service collection.</summary>
+        <returns>The <see cref="T:Microsoft.Extensions.Options.OptionsBuilder`1" /> so that <c>Configure</c> calls can be chained in it.</returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -165,8 +165,7 @@
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="configureOptions">The action used to configure the options.</param>
-        <summary>Registers an action used to configure a particular type of options.
-            Note: These are run before all <seealso cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.PostConfigure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
+        <summary>Registers an action used to configure a particular type of options. These are run before <see cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.PostConfigure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -207,8 +206,7 @@
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="name">The name of the options instance.</param>
         <param name="configureOptions">The action used to configure the options.</param>
-        <summary>Registers an action used to configure a particular type of options.
-            Note: These are run before all <seealso cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.PostConfigure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
+        <summary>Registers an action used to configure a particular type of options. These are run before <see cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.PostConfigure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -277,7 +275,7 @@
       <Docs>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="configureInstance">The instance that will configure options.</param>
-        <summary>Registers an object that will have all of its I[Post]ConfigureOptions registered.</summary>
+        <summary>Registers an object that will have all of its <c>I[Post]ConfigureOptions</c> registered.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -307,7 +305,7 @@
       <Docs>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="configureType">The type that will configure options.</param>
-        <summary>Registers a type that will have all of its I[Post]ConfigureOptions registered.</summary>
+        <summary>Registers a type that will have all of its <c>I[Post]ConfigureOptions</c> registered.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -343,7 +341,7 @@
       <Docs>
         <typeparam name="TConfigureOptions">The type that will configure options.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
-        <summary>Registers a type that will have all of its I[Post]ConfigureOptions registered.</summary>
+        <summary>Registers a type that will have all of its <c>I[Post]ConfigureOptions</c> registered.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -382,8 +380,7 @@
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="configureOptions">The action used to configure the options.</param>
-        <summary>Registers an action used to initialize a particular type of options.
-            Note: These are run after all <seealso cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
+        <summary>Registers an action used to initialize a particular type of options. These are run after <see cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -424,8 +421,7 @@
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="name">The name of the options instance.</param>
         <param name="configureOptions">The action used to configure the options.</param>
-        <summary>Registers an action used to configure a particular type of options.
-            Note: These are run after all <seealso cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
+        <summary>Registers an action used to configure a particular type of options. These are run after <see cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -464,8 +460,7 @@
         <typeparam name="TOptions">The options type to be configured.</typeparam>
         <param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> to add the services to.</param>
         <param name="configureOptions">The action used to configure the options.</param>
-        <summary>Registers an action used to post configure all instances of a particular type of options.
-            Note: These are run after all <seealso cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
+        <summary>Registers an action used to post configure all instances of a particular type of options. These are run after <see cref="M:Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions.Configure``1(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{``0})" />.</summary>
         <returns>The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" /> so that additional calls can be chained.</returns>
         <remarks>To be added.</remarks>
       </Docs>