Skip to content

Commit 4393a61

Browse files
BillWagnerBillWagner
authored
Merge pull request #4363 from dotnet/publish-13689
Merge master into live
2 parents 135791c + 75ddbcb commit 4393a61

File tree

279 files changed

+2271
-513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+2271
-513
lines changed

‎xml/FrameworksIndex/dotnet-plat-ext-5.0.xml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
<Assembly Name="System.Security.Permissions" Version="5.0.0.0" />
6363
<Assembly Name="System.Security.Principal.Windows" Version="5.0.0.0" />
6464
<Assembly Name="System.ServiceModel" Version="4.0.0.0" />
65-
<Assembly Name="System.ServiceModel.Duplex" Version="4.7.0.0" />
66-
<Assembly Name="System.ServiceModel.Http" Version="4.7.0.0" />
67-
<Assembly Name="System.ServiceModel.NetTcp" Version="4.7.0.0" />
68-
<Assembly Name="System.ServiceModel.Primitives" Version="4.7.0.0" />
69-
<Assembly Name="System.ServiceModel.Security" Version="4.7.0.0" />
65+
<Assembly Name="System.ServiceModel.Duplex" Version="5.0.0.0" />
66+
<Assembly Name="System.ServiceModel.Http" Version="5.0.0.0" />
67+
<Assembly Name="System.ServiceModel.NetTcp" Version="5.0.0.0" />
68+
<Assembly Name="System.ServiceModel.Primitives" Version="5.0.0.0" />
69+
<Assembly Name="System.ServiceModel.Security" Version="5.0.0.0" />
7070
<Assembly Name="System.ServiceModel.Syndication" Version="5.0.0.0" />
7171
<Assembly Name="System.ServiceProcess.ServiceController" Version="5.0.0.0" />
7272
<Assembly Name="System.Threading.AccessControl" Version="5.0.0.0" />
@@ -14583,12 +14583,6 @@
1458314583
</Type>
1458414584
</Namespace>
1458514585
<Namespace Name="System.IdentityModel.Tokens">
14586-
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause">
14587-
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement)" />
14588-
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement,System.Byte[],System.Int32)" />
14589-
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.Matches(System.IdentityModel.Tokens.SecurityKeyIdentifierClause)" />
14590-
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.ReferenceXml" />
14591-
</Type>
1459214586
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityToken" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityToken">
1459314587
<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})" />
1459414588
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityToken.Id" />
@@ -22125,7 +22119,6 @@
2212522119
<Member Id="P:System.ServiceModel.MessageSecurityVersion.SecurityVersion" />
2212622120
<Member Id="P:System.ServiceModel.MessageSecurityVersion.TrustVersion" />
2212722121
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity10WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
22128-
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrust13WSSecureConversation13WSSecurityPolicy12BasicSecurityProfile10" />
2212922122
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11" />
2213022123
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
2213122124
</Type>
@@ -22289,12 +22282,6 @@
2228922282
<Type Name="System.ServiceModel.UpnEndpointIdentity" Id="T:System.ServiceModel.UpnEndpointIdentity">
2229022283
<Member Id="M:System.ServiceModel.UpnEndpointIdentity.#ctor(System.String)" />
2229122284
</Type>
22292-
<Type Name="System.ServiceModel.WS2007HttpBinding" Id="T:System.ServiceModel.WS2007HttpBinding">
22293-
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor" />
22294-
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
22295-
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode,System.Boolean)" />
22296-
<Member Id="M:System.ServiceModel.WS2007HttpBinding.CreateMessageSecurity" />
22297-
</Type>
2229822285
<Type Name="System.ServiceModel.WSHttpBinding" Id="T:System.ServiceModel.WSHttpBinding">
2229922286
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor" />
2230022287
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
@@ -22703,7 +22690,6 @@
2270322690
<Type Name="System.ServiceModel.Channels.LocalClientSecuritySettings" Id="T:System.ServiceModel.Channels.LocalClientSecuritySettings">
2270422691
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.#ctor" />
2270522692
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.Clone" />
22706-
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.DetectReplays" />
2270722693
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.MaxClockSkew" />
2270822694
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.ReplayWindow" />
2270922695
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.TimestampValidityDuration" />
@@ -23296,7 +23282,6 @@
2329623282
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Default" />
2329723283
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Namespace" />
2329823284
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Prefix" />
23299-
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversation13" />
2330023285
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversationFeb2005" />
2330123286
</Type>
2330223287
<Type Name="System.ServiceModel.Security.SecurityAccessDeniedException" Id="T:System.ServiceModel.Security.SecurityAccessDeniedException">
@@ -23337,7 +23322,6 @@
2333723322
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Namespace" />
2333823323
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Prefix" />
2333923324
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy11" />
23340-
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy12" />
2334123325
</Type>
2334223326
<Type Name="System.ServiceModel.Security.SecurityVersion" Id="T:System.ServiceModel.Security.SecurityVersion">
2334323327
<Member Id="P:System.ServiceModel.Security.SecurityVersion.WSSecurity10" />
@@ -23347,7 +23331,6 @@
2334723331
<Member Id="P:System.ServiceModel.Security.TrustVersion.Default" />
2334823332
<Member Id="P:System.ServiceModel.Security.TrustVersion.Namespace" />
2334923333
<Member Id="P:System.ServiceModel.Security.TrustVersion.Prefix" />
23350-
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrust13" />
2335123334
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrustFeb2005" />
2335223335
</Type>
2335323336
<Type Name="System.ServiceModel.Security.UserNamePasswordClientCredential" Id="T:System.ServiceModel.Security.UserNamePasswordClientCredential">
@@ -23404,7 +23387,6 @@
2340423387
<Type Name="System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters">
2340523388
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor" />
2340623389
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor(System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters)" />
23407-
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore" />
2340823390
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.DefaultMessageSecurityVersion" />
2340923391
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress" />
2341023392
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding" />
@@ -23414,13 +23396,11 @@
2341423396
<Type Name="System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters">
2341523397
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor" />
2341623398
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor(System.ServiceModel.Channels.SecurityBindingElement)" />
23417-
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore" />
2341823399
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.BootstrapSecurityBindingElement" />
2341923400
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.RequireCancellation" />
2342023401
</Type>
2342123402
<Type Name="System.ServiceModel.Security.Tokens.SecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters">
2342223403
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone" />
23423-
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore" />
2342423404
<Member Id="P:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys" />
2342523405
</Type>
2342623406
<Type Name="System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement" Id="T:System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement">
@@ -23436,7 +23416,6 @@
2343623416
</Type>
2343723417
<Type Name="System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters">
2343823418
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.#ctor" />
23439-
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore" />
2344023419
</Type>
2344123420
</Namespace>
2344223421
<Namespace Name="System.ServiceModel.Syndication">

0 commit comments

Comments
 (0)