Skip to content

Commit

Permalink
Fix S.SM.Http ref assembly for net8.0 (#5691)
Browse files Browse the repository at this point in the history 
* Fix S.SM.Http ref assembly for net8.0

Http ref assembly had been generated from netstandard dummy implementation instead of real implementation.

Some properties/methods/types shouldn't have been public so cleaned up in implementation so ref is correct

* Only add the placeholder files to suppress usage on other platforms when targeting netstandard and dotnet
  • Loading branch information
@mconnew
mconnew authored Nov 20, 2024
1 parent 43b91da commit bed3c6a
Show file tree
Hide file tree
Showing 15 changed files with 77 additions and 4,820 deletions.
3 changes: 2 additions & 1 deletion eng/RuntimePackages.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@
<ItemGroup>
<None Include="$(PlaceholderFile)"
Pack="true"
Visible="false"
PackagePath="ref\netcoreapp2.0\;
$(BuildOutputTargetFolder)\MonoAndroid10\;
$(BuildOutputTargetFolder)\MonoTouch10\;
$(BuildOutputTargetFolder)\xamarinios10\;
$(BuildOutputTargetFolder)\xamarinmac20\;
$(BuildOutputTargetFolder)\xamarintvos10\;
$(BuildOutputTargetFolder)\xamarinwatchos10\"
Condition="$(TargetFrameworks.Contains('netstandard2.'))" />
Condition="$(TargetFrameworks.Contains('netstandard2.0')) and $(TargetFrameworks.Contains('$(DotNetVersion)'))" />
</ItemGroup>
</Project>
52 changes: 30 additions & 22 deletions src/System.ServiceModel.Http/ref/System.ServiceModel.Http.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// GenAPI Version: 8.0.10.36005
// GenAPI Version: 10.0.11.5701
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand All @@ -13,7 +13,7 @@ public partial class BasicHttpBinding : System.ServiceModel.HttpBindingBase
{
public BasicHttpBinding() { }
public BasicHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode) { }
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.ServiceModel.BasicHttpSecurity Security { get { throw null; } set { } }
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
Expand All @@ -33,7 +33,7 @@ public partial class BasicHttpsBinding : System.ServiceModel.HttpBindingBase
{
public BasicHttpsBinding() { }
public BasicHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode) { }
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.ServiceModel.BasicHttpsSecurity Security { get { throw null; } set { } }
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
Expand All @@ -55,7 +55,7 @@ public enum BasicHttpSecurityMode
}
public sealed partial class BasicHttpsSecurity
{
internal BasicHttpsSecurity() { }
public BasicHttpsSecurity() { }
public System.ServiceModel.BasicHttpMessageSecurity Message { get { throw null; } set { } }
public System.ServiceModel.BasicHttpsSecurityMode Mode { get { throw null; } set { } }
public System.ServiceModel.HttpTransportSecurity Transport { get { throw null; } set { } }
Expand Down Expand Up @@ -120,18 +120,16 @@ public partial class MessageSecurityOverHttp
public MessageSecurityOverHttp() { }
public System.ServiceModel.Security.SecurityAlgorithmSuite AlgorithmSuite { get { throw null; } set { } }
public System.ServiceModel.MessageCredentialType ClientCredentialType { get { throw null; } set { } }
public bool NegotiateServiceCredential { get { throw null; } set { } }
public bool NegotiateServiceCredential { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
protected virtual bool IsSecureConversationEnabled() { throw null; }
}
public partial class NetHttpBinding : System.ServiceModel.HttpBindingBase
{
public NetHttpBinding() { }
public NetHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode) { }
public NetHttpBinding(System.ServiceModel.BasicHttpSecurityMode securityMode, bool reliableSessionEnabled) { }
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public NetHttpBinding(string configurationName) { }
[System.ComponentModel.DefaultValueAttribute(System.ServiceModel.NetHttpMessageEncoding.Binary)]
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { throw null; } set { } }
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
public System.ServiceModel.BasicHttpSecurity Security { get { throw null; } set { } }
public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { throw null; } }
Expand All @@ -149,8 +147,7 @@ public partial class NetHttpsBinding : System.ServiceModel.HttpBindingBase
public NetHttpsBinding() { }
public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode) { }
public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode, bool reliableSessionEnabled) { }
[System.ComponentModel.DefaultValueAttribute(System.ServiceModel.NetHttpMessageEncoding.Binary)]
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { get { throw null; } set { } }
public System.ServiceModel.NetHttpMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
public System.ServiceModel.BasicHttpsSecurity Security { get { throw null; } set { } }
public System.ServiceModel.Channels.WebSocketTransportSettings WebSocketSettings { get { throw null; } }
Expand All @@ -160,7 +157,7 @@ public NetHttpsBinding(System.ServiceModel.BasicHttpsSecurityMode securityMode,
public sealed partial class NonDualMessageSecurityOverHttp : System.ServiceModel.MessageSecurityOverHttp
{
public NonDualMessageSecurityOverHttp() { }
public bool EstablishSecurityContext { get { throw null; } set { } }
public bool EstablishSecurityContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
protected override bool IsSecureConversationEnabled() { throw null; }
}
public partial class WS2007HttpBinding : System.ServiceModel.WSHttpBinding
Expand All @@ -175,6 +172,7 @@ public partial class WSHttpBinding : System.ServiceModel.WSHttpBindingBase
public WSHttpBinding() { }
public WSHttpBinding(System.ServiceModel.SecurityMode securityMode) { }
public WSHttpBinding(System.ServiceModel.SecurityMode securityMode, bool reliableSessionEnabled) { }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool AllowCookies { get { throw null; } set { } }
public System.ServiceModel.WSHttpSecurity Security { get { throw null; } set { } }
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingParameterCollection parameters) { throw null; }
Expand All @@ -186,17 +184,23 @@ public abstract partial class WSHttpBindingBase : System.ServiceModel.Channels.B
{
protected WSHttpBindingBase() { }
protected WSHttpBindingBase(bool reliableSessionEnabled) { }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool BypassProxyOnLocal { get { throw null; } set { } }
public System.ServiceModel.EnvelopeVersion EnvelopeVersion { get { throw null; } set { } }
public System.ServiceModel.EnvelopeVersion EnvelopeVersion { get { throw null; } }
[System.ComponentModel.DefaultValueAttribute((long)524288)]
public long MaxBufferPoolSize { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute((long)65536)]
public long MaxReceivedMessageSize { get { throw null; } set { } }
public System.ServiceModel.WSMessageEncoding MessageEncoding { get { throw null; } set { } }
public System.ServiceModel.WSMessageEncoding MessageEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
public System.Uri ProxyAddress { get { throw null; } set { } }
public System.Xml.XmlDictionaryReaderQuotas ReaderQuotas { get { throw null; } set { } }
public System.ServiceModel.OptionalReliableSession ReliableSession { get { throw null; } set { } }
public override string Scheme { get { throw null; } }
public System.Text.Encoding TextEncoding { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool TransactionFlow { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(true)]
public bool UseDefaultWebProxy { get { throw null; } set { } }
public override System.ServiceModel.Channels.BindingElementCollection CreateBindingElements() { throw null; }
protected abstract System.ServiceModel.Channels.SecurityBindingElement CreateMessageSecurity();
Expand Down Expand Up @@ -231,6 +235,7 @@ public sealed partial class HttpResponseMessageProperty : System.ServiceModel.Ch
{
public HttpResponseMessageProperty() { }
public System.Net.WebHeaderCollection Headers { get { throw null; } }
public System.Net.Http.HttpResponseMessage HttpResponseMessage { get { throw null; } }
public static string Name { get { throw null; } }
public System.Net.HttpStatusCode StatusCode { get { throw null; } set { } }
public string StatusDescription { get { throw null; } set { } }
Expand All @@ -240,7 +245,8 @@ public partial class HttpsTransportBindingElement : System.ServiceModel.Channels
{
public HttpsTransportBindingElement() { }
protected HttpsTransportBindingElement(System.ServiceModel.Channels.HttpsTransportBindingElement elementToBeCloned) { }
public bool RequireClientCertificate { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool RequireClientCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public override string Scheme { get { throw null; } }
public override System.ServiceModel.Channels.IChannelFactory<TChannel> BuildChannelFactory<TChannel>(System.ServiceModel.Channels.BindingContext context) { throw null; }
public override System.ServiceModel.Channels.BindingElement Clone() { throw null; }
Expand All @@ -251,22 +257,23 @@ public partial class HttpTransportBindingElement : System.ServiceModel.Channels.
public HttpTransportBindingElement() { }
protected HttpTransportBindingElement(System.ServiceModel.Channels.HttpTransportBindingElement elementToBeCloned) { }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool AllowCookies { get { throw null; } set { } }
public bool AllowCookies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(System.Net.AuthenticationSchemes.Anonymous)]
public System.Net.AuthenticationSchemes AuthenticationScheme { get { throw null; } set { } }
public System.Net.AuthenticationSchemes AuthenticationScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool BypassProxyOnLocal { get { throw null; } set { } }
public bool BypassProxyOnLocal { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(true)]
public bool DecompressionEnabled { get { throw null; } set { } }
public bool DecompressionEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(true)]
public bool KeepAliveEnabled { get { throw null; } set { } }
public bool KeepAliveEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(65536)]
public int MaxBufferSize { get { throw null; } set { } }
public System.Net.IWebProxy Proxy { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(null)]
[System.ComponentModel.TypeConverterAttribute(typeof(System.UriTypeConverter))]
public System.Uri ProxyAddress { get { throw null; } set { } }
public System.Uri ProxyAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
[System.ComponentModel.DefaultValueAttribute(System.Net.AuthenticationSchemes.Anonymous)]
public System.Net.AuthenticationSchemes ProxyAuthenticationScheme { get { throw null; } set { } }
public override string Scheme { get { throw null; } }
Expand All @@ -286,10 +293,11 @@ public partial interface IHttpCookieContainerManager
}
public sealed partial class WebSocketTransportSettings : System.IEquatable<System.ServiceModel.Channels.WebSocketTransportSettings>
{
public const string BinaryEncoderTransferModeHeader = "microsoft-binary-transfer-mode";
public const string BinaryMessageReceivedAction = "http://schemas.microsoft.com/2011/02/websockets/onbinarymessage";
public const string SoapContentTypeHeader = "soap-content-type";
public const string TextMessageReceivedAction = "http://schemas.microsoft.com/2011/02/websockets/ontextmessage";
public WebSocketTransportSettings() { }
[System.ComponentModel.DefaultValueAttribute(false)]
public bool DisablePayloadMasking { get { throw null; } set { } }
[System.ComponentModel.DefaultValueAttribute(typeof(System.TimeSpan), "00:00:00")]
public System.TimeSpan KeepAliveInterval { get { throw null; } set { } }
Expand Down
Loading

0 comments on commit bed3c6a

Please sign in to comment.