Skip to content

Updates from master #4354

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

Closed
wants to merge 10 commits into from
Closed

Updates from master #4354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 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
4ac896f
ReadOnlyMemoryContent class description (#4277)
Jun 8, 2020
146df60
Ping - update documentation (#4333)
Jun 9, 2020
07482dc
NET Interactive: Enable_try_dotnet_to_batch_10a (#4306)
v-mepa Jun 10, 2020
a9a8413
CI Update (#4317)
BillWagner Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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>
31 changes: 5 additions & 26 deletions xml/FrameworksIndex/dotnet-plat-ext-5.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
<Assembly Name="System.Security.Permissions" Version="5.0.0.0" />
<Assembly Name="System.Security.Principal.Windows" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel" Version="4.0.0.0" />
<Assembly Name="System.ServiceModel.Duplex" Version="4.7.0.0" />
<Assembly Name="System.ServiceModel.Http" Version="4.7.0.0" />
<Assembly Name="System.ServiceModel.NetTcp" Version="4.7.0.0" />
<Assembly Name="System.ServiceModel.Primitives" Version="4.7.0.0" />
<Assembly Name="System.ServiceModel.Security" Version="4.7.0.0" />
<Assembly Name="System.ServiceModel.Duplex" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel.Http" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel.NetTcp" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel.Primitives" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel.Security" Version="5.0.0.0" />
<Assembly Name="System.ServiceModel.Syndication" Version="5.0.0.0" />
<Assembly Name="System.ServiceProcess.ServiceController" Version="5.0.0.0" />
<Assembly Name="System.Threading.AccessControl" Version="5.0.0.0" />
Expand Down Expand Up @@ -14583,12 +14583,6 @@
</Type>
</Namespace>
<Namespace Name="System.IdentityModel.Tokens">
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause">
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement)" />
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement,System.Byte[],System.Int32)" />
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.Matches(System.IdentityModel.Tokens.SecurityKeyIdentifierClause)" />
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.ReferenceXml" />
</Type>
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityToken" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityToken">
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityToken.#ctor(System.Xml.XmlElement,System.IdentityModel.Tokens.SecurityToken,System.DateTime,System.DateTime,System.IdentityModel.Tokens.SecurityKeyIdentifierClause,System.IdentityModel.Tokens.SecurityKeyIdentifierClause,System.Collections.ObjectModel.ReadOnlyCollection{System.IdentityModel.Policy.IAuthorizationPolicy})" />
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityToken.Id" />
Expand Down Expand Up @@ -22125,7 +22119,6 @@
<Member Id="P:System.ServiceModel.MessageSecurityVersion.SecurityVersion" />
<Member Id="P:System.ServiceModel.MessageSecurityVersion.TrustVersion" />
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity10WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrust13WSSecureConversation13WSSecurityPolicy12BasicSecurityProfile10" />
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11" />
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
</Type>
Expand Down Expand Up @@ -22289,12 +22282,6 @@
<Type Name="System.ServiceModel.UpnEndpointIdentity" Id="T:System.ServiceModel.UpnEndpointIdentity">
<Member Id="M:System.ServiceModel.UpnEndpointIdentity.#ctor(System.String)" />
</Type>
<Type Name="System.ServiceModel.WS2007HttpBinding" Id="T:System.ServiceModel.WS2007HttpBinding">
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor" />
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode,System.Boolean)" />
<Member Id="M:System.ServiceModel.WS2007HttpBinding.CreateMessageSecurity" />
</Type>
<Type Name="System.ServiceModel.WSHttpBinding" Id="T:System.ServiceModel.WSHttpBinding">
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor" />
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
Expand Down Expand Up @@ -22703,7 +22690,6 @@
<Type Name="System.ServiceModel.Channels.LocalClientSecuritySettings" Id="T:System.ServiceModel.Channels.LocalClientSecuritySettings">
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.#ctor" />
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.Clone" />
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.DetectReplays" />
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.MaxClockSkew" />
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.ReplayWindow" />
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.TimestampValidityDuration" />
Expand Down Expand Up @@ -23296,7 +23282,6 @@
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Default" />
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Namespace" />
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Prefix" />
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversation13" />
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversationFeb2005" />
</Type>
<Type Name="System.ServiceModel.Security.SecurityAccessDeniedException" Id="T:System.ServiceModel.Security.SecurityAccessDeniedException">
Expand Down Expand Up @@ -23337,7 +23322,6 @@
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Namespace" />
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Prefix" />
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy11" />
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy12" />
</Type>
<Type Name="System.ServiceModel.Security.SecurityVersion" Id="T:System.ServiceModel.Security.SecurityVersion">
<Member Id="P:System.ServiceModel.Security.SecurityVersion.WSSecurity10" />
Expand All @@ -23347,7 +23331,6 @@
<Member Id="P:System.ServiceModel.Security.TrustVersion.Default" />
<Member Id="P:System.ServiceModel.Security.TrustVersion.Namespace" />
<Member Id="P:System.ServiceModel.Security.TrustVersion.Prefix" />
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrust13" />
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrustFeb2005" />
</Type>
<Type Name="System.ServiceModel.Security.UserNamePasswordClientCredential" Id="T:System.ServiceModel.Security.UserNamePasswordClientCredential">
Expand Down Expand Up @@ -23404,7 +23387,6 @@
<Type Name="System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters">
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor" />
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor(System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters)" />
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore" />
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.DefaultMessageSecurityVersion" />
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress" />
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding" />
Expand All @@ -23414,13 +23396,11 @@
<Type Name="System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters">
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor" />
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor(System.ServiceModel.Channels.SecurityBindingElement)" />
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore" />
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.BootstrapSecurityBindingElement" />
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.RequireCancellation" />
</Type>
<Type Name="System.ServiceModel.Security.Tokens.SecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters">
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone" />
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore" />
<Member Id="P:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys" />
</Type>
<Type Name="System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement" Id="T:System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement">
Expand All @@ -23436,7 +23416,6 @@
</Type>
<Type Name="System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters">
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.#ctor" />
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore" />
</Type>
</Namespace>
<Namespace Name="System.ServiceModel.Syndication">
Expand Down
Loading