Skip to content

Commit c858ae5

Browse files
BillWagnerBillWagner
authored
Merge pull request #4438 from dotnet/publish-30153
Merge master into live
2 parents af98ac5 + 0763fc2 commit c858ae5

File tree

1,104 files changed

+13517
-14366
lines changed

Some content is hidden

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

1,104 files changed

+13517
-14366
lines changed

‎samples/snippets/csharp/VS_Snippets_CLR_System/system.invalidoperationexception.threading.uwp/cs/UWPCrossThreadSolutionCS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
</ItemGroup>
132132
<ItemGroup>
133133
<PackageReference Include="Microsoft.ApplicationInsights">
134-
<Version>2.13.1</Version>
134+
<Version>2.14.0</Version>
135135
</PackageReference>
136136
<PackageReference Include="Microsoft.ApplicationInsights.PersistenceChannel">
137137
<Version>1.2.3</Version>
@@ -140,7 +140,7 @@
140140
<Version>1.1.1</Version>
141141
</PackageReference>
142142
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
143-
<Version>6.2.9</Version>
143+
<Version>6.2.10</Version>
144144
</PackageReference>
145145
</ItemGroup>
146146
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

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

Lines changed: 31 additions & 5 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="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" />
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" />
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" />
@@ -8591,6 +8591,7 @@
85918591
<Member Id="P:System.Diagnostics.PresentationTraceSources.ResourceDictionarySource" />
85928592
<Member Id="P:System.Diagnostics.PresentationTraceSources.RoutedEventSource" />
85938593
<Member Id="P:System.Diagnostics.PresentationTraceSources.ShellSource" />
8594+
<Member Id="P:System.Diagnostics.PresentationTraceSources.TraceLevel" />
85948595
</Type>
85958596
</Namespace>
85968597
<Namespace Name="System.Diagnostics.Eventing.Reader">
@@ -14583,6 +14584,12 @@
1458314584
</Type>
1458414585
</Namespace>
1458514586
<Namespace Name="System.IdentityModel.Tokens">
14587+
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause">
14588+
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement)" />
14589+
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.#ctor(System.Xml.XmlElement,System.Byte[],System.Int32)" />
14590+
<Member Id="M:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.Matches(System.IdentityModel.Tokens.SecurityKeyIdentifierClause)" />
14591+
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityKeyIdentifierClause.ReferenceXml" />
14592+
</Type>
1458614593
<Type Name="System.IdentityModel.Tokens.GenericXmlSecurityToken" Id="T:System.IdentityModel.Tokens.GenericXmlSecurityToken">
1458714594
<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})" />
1458814595
<Member Id="P:System.IdentityModel.Tokens.GenericXmlSecurityToken.Id" />
@@ -22119,6 +22126,7 @@
2211922126
<Member Id="P:System.ServiceModel.MessageSecurityVersion.SecurityVersion" />
2212022127
<Member Id="P:System.ServiceModel.MessageSecurityVersion.TrustVersion" />
2212122128
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity10WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
22129+
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrust13WSSecureConversation13WSSecurityPolicy12BasicSecurityProfile10" />
2212222130
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11" />
2212322131
<Member Id="P:System.ServiceModel.MessageSecurityVersion.WSSecurity11WSTrustFebruary2005WSSecureConversationFebruary2005WSSecurityPolicy11BasicSecurityProfile10" />
2212422132
</Type>
@@ -22282,6 +22290,12 @@
2228222290
<Type Name="System.ServiceModel.UpnEndpointIdentity" Id="T:System.ServiceModel.UpnEndpointIdentity">
2228322291
<Member Id="M:System.ServiceModel.UpnEndpointIdentity.#ctor(System.String)" />
2228422292
</Type>
22293+
<Type Name="System.ServiceModel.WS2007HttpBinding" Id="T:System.ServiceModel.WS2007HttpBinding">
22294+
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor" />
22295+
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
22296+
<Member Id="M:System.ServiceModel.WS2007HttpBinding.#ctor(System.ServiceModel.SecurityMode,System.Boolean)" />
22297+
<Member Id="M:System.ServiceModel.WS2007HttpBinding.CreateMessageSecurity" />
22298+
</Type>
2228522299
<Type Name="System.ServiceModel.WSHttpBinding" Id="T:System.ServiceModel.WSHttpBinding">
2228622300
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor" />
2228722301
<Member Id="M:System.ServiceModel.WSHttpBinding.#ctor(System.ServiceModel.SecurityMode)" />
@@ -22690,6 +22704,7 @@
2269022704
<Type Name="System.ServiceModel.Channels.LocalClientSecuritySettings" Id="T:System.ServiceModel.Channels.LocalClientSecuritySettings">
2269122705
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.#ctor" />
2269222706
<Member Id="M:System.ServiceModel.Channels.LocalClientSecuritySettings.Clone" />
22707+
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.DetectReplays" />
2269322708
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.MaxClockSkew" />
2269422709
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.ReplayWindow" />
2269522710
<Member Id="P:System.ServiceModel.Channels.LocalClientSecuritySettings.TimestampValidityDuration" />
@@ -23282,6 +23297,7 @@
2328223297
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Default" />
2328323298
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Namespace" />
2328423299
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.Prefix" />
23300+
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversation13" />
2328523301
<Member Id="P:System.ServiceModel.Security.SecureConversationVersion.WSSecureConversationFeb2005" />
2328623302
</Type>
2328723303
<Type Name="System.ServiceModel.Security.SecurityAccessDeniedException" Id="T:System.ServiceModel.Security.SecurityAccessDeniedException">
@@ -23322,6 +23338,7 @@
2332223338
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Namespace" />
2332323339
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.Prefix" />
2332423340
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy11" />
23341+
<Member Id="P:System.ServiceModel.Security.SecurityPolicyVersion.WSSecurityPolicy12" />
2332523342
</Type>
2332623343
<Type Name="System.ServiceModel.Security.SecurityVersion" Id="T:System.ServiceModel.Security.SecurityVersion">
2332723344
<Member Id="P:System.ServiceModel.Security.SecurityVersion.WSSecurity10" />
@@ -23331,6 +23348,7 @@
2333123348
<Member Id="P:System.ServiceModel.Security.TrustVersion.Default" />
2333223349
<Member Id="P:System.ServiceModel.Security.TrustVersion.Namespace" />
2333323350
<Member Id="P:System.ServiceModel.Security.TrustVersion.Prefix" />
23351+
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrust13" />
2333423352
<Member Id="P:System.ServiceModel.Security.TrustVersion.WSTrustFeb2005" />
2333523353
</Type>
2333623354
<Type Name="System.ServiceModel.Security.UserNamePasswordClientCredential" Id="T:System.ServiceModel.Security.UserNamePasswordClientCredential">
@@ -23387,6 +23405,7 @@
2338723405
<Type Name="System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters">
2338823406
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor" />
2338923407
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.#ctor(System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters)" />
23408+
<Member Id="M:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.CloneCore" />
2339023409
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.DefaultMessageSecurityVersion" />
2339123410
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerAddress" />
2339223411
<Member Id="P:System.ServiceModel.Security.Tokens.IssuedSecurityTokenParameters.IssuerBinding" />
@@ -23396,11 +23415,13 @@
2339623415
<Type Name="System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters">
2339723416
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor" />
2339823417
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.#ctor(System.ServiceModel.Channels.SecurityBindingElement)" />
23418+
<Member Id="M:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.CloneCore" />
2339923419
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.BootstrapSecurityBindingElement" />
2340023420
<Member Id="P:System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters.RequireCancellation" />
2340123421
</Type>
2340223422
<Type Name="System.ServiceModel.Security.Tokens.SecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.SecurityTokenParameters">
2340323423
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.Clone" />
23424+
<Member Id="M:System.ServiceModel.Security.Tokens.SecurityTokenParameters.CloneCore" />
2340423425
<Member Id="P:System.ServiceModel.Security.Tokens.SecurityTokenParameters.RequireDerivedKeys" />
2340523426
</Type>
2340623427
<Type Name="System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement" Id="T:System.ServiceModel.Security.Tokens.ServiceModelSecurityTokenRequirement">
@@ -23416,6 +23437,7 @@
2341623437
</Type>
2341723438
<Type Name="System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters" Id="T:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters">
2341823439
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.#ctor" />
23440+
<Member Id="M:System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters.CloneCore" />
2341923441
</Type>
2342023442
</Namespace>
2342123443
<Namespace Name="System.ServiceModel.Syndication">
@@ -26234,6 +26256,8 @@
2623426256
<Member Id="M:System.Windows.Localization.GetComments(System.Object)" />
2623526257
<Member Id="M:System.Windows.Localization.SetAttributes(System.Object,System.String)" />
2623626258
<Member Id="M:System.Windows.Localization.SetComments(System.Object,System.String)" />
26259+
<Member Id="P:System.Windows.Localization.Attributes" />
26260+
<Member Id="P:System.Windows.Localization.Comments" />
2623726261
</Type>
2623826262
<Type Name="System.Windows.LocalizationCategory" Id="T:System.Windows.LocalizationCategory">
2623926263
<Member Id="F:System.Windows.LocalizationCategory.Button" />
@@ -64989,8 +65013,10 @@
6498965013
<Member Id="P:System.Windows.Shell.WindowChrome.CornerRadius" />
6499065014
<Member Id="P:System.Windows.Shell.WindowChrome.GlassFrameCompleteThickness" />
6499165015
<Member Id="P:System.Windows.Shell.WindowChrome.GlassFrameThickness" />
65016+
<Member Id="P:System.Windows.Shell.WindowChrome.IsHitTestVisibleInChrome" />
6499265017
<Member Id="P:System.Windows.Shell.WindowChrome.NonClientFrameEdges" />
6499365018
<Member Id="P:System.Windows.Shell.WindowChrome.ResizeBorderThickness" />
65019+
<Member Id="P:System.Windows.Shell.WindowChrome.ResizeGripDirection" />
6499465020
<Member Id="P:System.Windows.Shell.WindowChrome.UseAeroCaptionButtons" />
6499565021
<Member Id="P:System.Windows.Shell.WindowChrome.WindowChrome" />
6499665022
</Type>

0 commit comments

Comments
 (0)