Skip to content

Merge master into live #4344

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.

Sign up for GitHub

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 7 commits into from
Jun 8, 2020
Merged

Merge master into live #4344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd52d6a
Fix up tables (2 of 2) (#4330)
gewarren Jun 5, 2020
6e5d9f5
Add documentation to XmlDocumentXPathExtensions (#4316)
krwq Jun 5, 2020
6284e66
Fix up tables (1 of 2) (#4329)
gewarren Jun 5, 2020
485eb38
Fix <seealso> links (#4337)
gewarren Jun 5, 2020
764ce99
Escaped backslash character on markdown syntax (#4321)
kanelikki Jun 5, 2020
59b9d50
move seealso tag outside summary (#4342)
gewarren Jun 5, 2020
1a9742e
Merge branch 'master' into publish-8420
cxwtool Jun 6, 2020
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
12 changes: 5 additions & 7 deletions samples/snippets/csharp/VS_Snippets_CLR/CodeDomHelloWorldSample/cs/program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]{
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down
9 changes: 2 additions & 7 deletions samples/snippets/visualbasic/VS_Snippets_CLR/CodeDomHelloWorldSample/vb/program.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -21,7 +19,6 @@ Class Program
cu = BuildHelloWorldGraph()

'<Snippet5>

Dim sourceFile As New StreamWriter(sourceFileName)

LogMessage("Generating code...")
Expand Down Expand Up @@ -56,7 +53,6 @@ Class Program

End Sub


'<Snippet2>
' Build a Hello World program graph using
' System.CodeDom types.
Expand All @@ -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)
Expand Down Expand Up @@ -139,7 +135,6 @@ Class Program

End Sub


Shared Sub OutputResults(ByVal results As CompilerResults)
LogMessage(("NativeCompilerReturnValue=" & _
results.NativeCompilerReturnValue.ToString()))
Expand All @@ -150,4 +145,4 @@ Class Program

End Sub
End Class
'</Snippet1>
'</Snippet1>
4 changes: 2 additions & 2 deletions xml/Microsoft.Extensions.DependencyInjection/OptionsBuilderDataAnnotationsExtensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
27 changes: 11 additions & 16 deletions xml/Microsoft.Extensions.DependencyInjection/OptionsServiceCollectionExtensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading