Skip to content

Commit 4e70991

Browse files
committed
Merge branch 'main' into AddCoreWcfServicesLatest
2 parents d1ec63f + ed1bd7a commit 4e70991

18 files changed

+145
-4823
lines changed

eng/RuntimePackages.targets

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@
5252
<ItemGroup>
5353
<None Include="$(PlaceholderFile)"
5454
Pack="true"
55+
Visible="false"
5556
PackagePath="ref\netcoreapp2.0\;
5657
$(BuildOutputTargetFolder)\MonoAndroid10\;
5758
$(BuildOutputTargetFolder)\MonoTouch10\;
5859
$(BuildOutputTargetFolder)\xamarinios10\;
5960
$(BuildOutputTargetFolder)\xamarinmac20\;
6061
$(BuildOutputTargetFolder)\xamarintvos10\;
6162
$(BuildOutputTargetFolder)\xamarinwatchos10\"
62-
Condition="$(TargetFrameworks.Contains('netstandard2.'))" />
63+
Condition="$(TargetFrameworks.Contains('netstandard2.0')) and $(TargetFrameworks.Contains('$(DotNetVersion)'))" />
6364
</ItemGroup>
6465
</Project>

eng/Versions.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<Project>
33
<!-- Versioning specifications: https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md -->
44
<PropertyGroup>
5-
<ProductVersion>8.1.0</ProductVersion>
5+
<ProductVersion>8.1.1</ProductVersion>
66
<MajorVersion>8</MajorVersion>
77
<MinorVersion>1</MinorVersion>
8-
<WcfAssemblyVersion>8.1.0.0</WcfAssemblyVersion>
8+
<PatchVersion>1</PatchVersion>
9+
<WcfAssemblyVersion>8.1.1.0</WcfAssemblyVersion>
910
<!-- To produce shipping versions in non-official builds, instead of default fixed dummy version number (42.42.42.42). -->
1011
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1112
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>

src/System.ServiceModel.Http/ref/System.ServiceModel.Http.cs

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// GenAPI Version: 8.0.10.36005
4+
// GenAPI Version: 10.0.11.5701
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.
@@ -13,7 +13,7 @@ public partial class BasicHttpBinding : System.ServiceModel.HttpBindingBase
1313
{
1414
public BasicHttpBinding() { }
1515
public BasicHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode) { }
16-
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
16+
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
1717
public System.ServiceModel.BasicHttpSecurity Security { get { throw null; } set { } }
1818
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
1919
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
@@ -33,7 +33,7 @@ public partial class BasicHttpsBinding : System.ServiceModel.HttpBindingBase
3333
{
3434
public BasicHttpsBinding() { }
3535
public BasicHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode) { }
36-
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
36+
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
3737
public System.ServiceModel.BasicHttpsSecurity Security { get { throw null; } set { } }
3838
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
3939
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
@@ -55,7 +55,7 @@ public enum BasicHttpSecurityMode
5555
}
5656
public sealed partial class BasicHttpsSecurity
5757
{
58-
internal BasicHttpsSecurity() { }
58+
public BasicHttpsSecurity() { }
5959
public System.ServiceModel.BasicHttpMessageSecurity Message { get { throw null; } set { } }
6060
public System.ServiceModel.BasicHttpsSecurityMode Mode { get { throw null; } set { } }
6161
public System.ServiceModel.HttpTransportSecurity Transport { get { throw null; } set { } }
@@ -120,18 +120,16 @@ public partial class MessageSecurityOverHttp
120120
public MessageSecurityOverHttp() { }
121121
public System.ServiceModel.Security.SecurityAlgorithmSuite AlgorithmSuite { get { throw null; } set { } }
122122
public System.ServiceModel.MessageCredentialType ClientCredentialType { get { throw null; } set { } }
123-
public bool NegotiateServiceCredential { get { throw null; } set { } }
123+
public bool NegotiateServiceCredential { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
124124
protected virtual bool IsSecureConversationEnabled() { throw null; }
125125
}
126126
public partial class NetHttpBinding : System.ServiceModel.HttpBindingBase
127127
{
128128
public NetHttpBinding() { }
129129
public NetHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode) { }
130130
public NetHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode, bool reliableSessionEnabled) { }
131-
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
132-
public NetHttpBinding(string configurationName) { }
133131
[System.ComponentModel.DefaultValueAttribute(System.ServiceModel.NetHttpMessageEncoding.Binary)]
134-
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { throw null; } set { } }
132+
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
135133
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
136134
public System.ServiceModel.BasicHttpSecurity Security { get { throw null; } set { } }
137135
public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { throw null; } }
@@ -149,8 +147,7 @@ public partial class NetHttpsBinding : System.ServiceModel.HttpBindingBase
149147
public NetHttpsBinding() { }
150148
public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode) { }
151149
public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode, bool reliableSessionEnabled) { }
152-
[System.ComponentModel.DefaultValueAttribute(System.ServiceModel.NetHttpMessageEncoding.Binary)]
153-
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { throw null; } set { } }
150+
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
154151
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
155152
public System.ServiceModel.BasicHttpsSecurity Security { get { throw null; } set { } }
156153
public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { throw null; } }
@@ -160,7 +157,7 @@ public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode,
160157
public sealed partial class NonDualMessageSecurityOverHttp : System.ServiceModel.MessageSecurityOverHttp
161158
{
162159
public NonDualMessageSecurityOverHttp() { }
163-
public bool EstablishSecurityContext { get { throw null; } set { } }
160+
public bool EstablishSecurityContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
164161
protected override bool IsSecureConversationEnabled() { throw null; }
165162
}
166163
public partial class WS2007HttpBinding : System.ServiceModel.WSHttpBinding
@@ -175,6 +172,7 @@ public partial class WSHttpBinding : System.ServiceModel.WSHttpBindingBase
175172
public WSHttpBinding() { }
176173
public WSHttpBinding(System.ServiceModel.SecurityMode securityMode) { }
177174
public WSHttpBinding(System.ServiceModel.SecurityMode securityMode, bool reliableSessionEnabled) { }
175+
[System.ComponentModel.DefaultValueAttribute(false)]
178176
public bool AllowCookies { get { throw null; } set { } }
179177
public System.ServiceModel.WSHttpSecurity Security { get { throw null; } set { } }
180178
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
@@ -186,17 +184,23 @@ public abstract partial class WSHttpBindingBase : System.ServiceModel.Channels.B
186184
{
187185
protected WSHttpBindingBase() { }
188186
protected WSHttpBindingBase(bool reliableSessionEnabled) { }
187+
[System.ComponentModel.DefaultValueAttribute(false)]
189188
public bool BypassProxyOnLocal { get { throw null; } set { } }
190-
public System.ServiceModel.EnvelopeVersion EnvelopeVersion { get { throw null; } set { } }
189+
public System.ServiceModel.EnvelopeVersion EnvelopeVersion { get { throw null; } }
190+
[System.ComponentModel.DefaultValueAttribute((long)524288)]
191191
public long MaxBufferPoolSize { get { throw null; } set { } }
192+
[System.ComponentModel.DefaultValueAttribute((long)65536)]
192193
public long MaxReceivedMessageSize { get { throw null; } set { } }
193-
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
194+
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
195+
[System.ComponentModel.DefaultValueAttribute(null)]
194196
public System.Uri ProxyAddress { get { throw null; } set { } }
195197
public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { get { throw null; } set { } }
196198
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
197199
public override string Scheme { get { throw null; } }
198200
public System.Text.Encoding TextEncoding { get { throw null; } set { } }
201+
[System.ComponentModel.DefaultValueAttribute(false)]
199202
public bool TransactionFlow { get { throw null; } set { } }
203+
[System.ComponentModel.DefaultValueAttribute(true)]
200204
public bool UseDefaultWebProxy { get { throw null; } set { } }
201205
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
202206
protected abstract System.ServiceModel.Channels.SecurityBindingElement CreateMessageSecurity();
@@ -231,6 +235,7 @@ public sealed partial class HttpResponseMessageProperty : System.ServiceModel.Ch
231235
{
232236
public HttpResponseMessageProperty() { }
233237
public System.Net.WebHeaderCollection Headers { get { throw null; } }
238+
public System.Net.Http.HttpResponseMessage HttpResponseMessage { get { throw null; } }
234239
public static string Name { get { throw null; } }
235240
public System.Net.HttpStatusCode StatusCode { get { throw null; } set { } }
236241
public string StatusDescription { get { throw null; } set { } }
@@ -240,7 +245,8 @@ public partial class HttpsTransportBindingElement : System.ServiceModel.Channels
240245
{
241246
public HttpsTransportBindingElement() { }
242247
protected HttpsTransportBindingElement(System.ServiceModel.Channels.HttpsTransportBindingElement elementToBeCloned) { }
243-
public bool RequireClientCertificate { get { throw null; } set { } }
248+
[System.ComponentModel.DefaultValueAttribute(false)]
249+
public bool RequireClientCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
244250
public override string Scheme { get { throw null; } }
245251
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingContext context) { throw null; }
246252
public override System.ServiceModel.Channels.BindingElement Clone() { throw null; }
@@ -251,22 +257,23 @@ public partial class HttpTransportBindingElement : System.ServiceModel.Channels.
251257
public HttpTransportBindingElement() { }
252258
protected HttpTransportBindingElement(System.ServiceModel.Channels.HttpTransportBindingElement elementToBeCloned) { }
253259
[System.ComponentModel.DefaultValueAttribute(false)]
254-
public bool AllowCookies { get { throw null; } set { } }
260+
public bool AllowCookies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
255261
[System.ComponentModel.DefaultValueAttribute(System.Net.AuthenticationSchemes.Anonymous)]
256-
public System.Net.AuthenticationSchemes AuthenticationScheme { get { throw null; } set { } }
262+
public System.Net.AuthenticationSchemes AuthenticationScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
257263
[System.ComponentModel.DefaultValueAttribute(false)]
258-
public bool BypassProxyOnLocal { get { throw null; } set { } }
264+
public bool BypassProxyOnLocal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
259265
[System.ComponentModel.DefaultValueAttribute(true)]
260-
public bool DecompressionEnabled { get { throw null; } set { } }
266+
public bool DecompressionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
261267
public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { throw null; } set { } }
262268
[System.ComponentModel.DefaultValueAttribute(true)]
263-
public bool KeepAliveEnabled { get { throw null; } set { } }
269+
public bool KeepAliveEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
264270
[System.ComponentModel.DefaultValueAttribute(65536)]
265271
public int MaxBufferSize { get { throw null; } set { } }
266-
public System.Net.IWebProxy Proxy { get { throw null; } set { } }
272+
[System.ComponentModel.DefaultValueAttribute(null)]
273+
public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
267274
[System.ComponentModel.DefaultValueAttribute(null)]
268275
[System.ComponentModel.TypeConverterAttribute(typeof(System.UriTypeConverter))]
269-
public System.Uri ProxyAddress { get { throw null; } set { } }
276+
public System.Uri ProxyAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
270277
[System.ComponentModel.DefaultValueAttribute(System.Net.AuthenticationSchemes.Anonymous)]
271278
public System.Net.AuthenticationSchemes ProxyAuthenticationScheme { get { throw null; } set { } }
272279
public override string Scheme { get { throw null; } }
@@ -286,10 +293,11 @@ public partial interface IHttpCookieContainerManager
286293
}
287294
public sealed partial class WebSocketTransportSettings : System.IEquatable<System.ServiceModel.Channels.WebSocketTransportSettings>
288295
{
296+
public const string BinaryEncoderTransferModeHeader = "microsoft-binary-transfer-mode";
289297
public const string BinaryMessageReceivedAction = "http://schemas.microsoft.com/2011/02/websockets/onbinarymessage";
298+
public const string SoapContentTypeHeader = "soap-content-type";
290299
public const string TextMessageReceivedAction = "http://schemas.microsoft.com/2011/02/websockets/ontextmessage";
291300
public WebSocketTransportSettings() { }
292-
[System.ComponentModel.DefaultValueAttribute(false)]
293301
public bool DisablePayloadMasking { get { throw null; } set { } }
294302
[System.ComponentModel.DefaultValueAttribute(typeof(System.TimeSpan), "00:00:00")]
295303
public System.TimeSpan KeepAliveInterval { get { throw null; } set { } }

0 commit comments

Comments
 (0)