diff options
Diffstat (limited to 'mcs/class/referencesource/System.ServiceModel.Web')
9 files changed, 33 insertions, 33 deletions
diff --git a/mcs/class/referencesource/System.ServiceModel.Web/GlobalSuppressions.cs b/mcs/class/referencesource/System.ServiceModel.Web/GlobalSuppressions.cs index e430960c253..332b14376f2 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/GlobalSuppressions.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/GlobalSuppressions.cs @@ -7,7 +7,7 @@ using System.Diagnostics.CodeAnalysis; [module: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "System.ServiceModel.SR2.resources", MessageId = "Infos", Justification = "This represents the ParameterInfo class defined in System.Reflection")] [module: SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", Scope = "namespace", Target = "System.Xml.Linq", MessageId = "Linq")] -// [....], BEGIN FxCop violations for code in Microsoft.Web.Script.Services.* +// krisragh, BEGIN FxCop violations for code in Microsoft.Web.Script.Services.* [module: SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceTypeData..cctor()")] [module: SuppressMessage("Reliability", "Reliability102:WrapExceptionsRule", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceTypeData.ThrowCannotGenerateProxyForTypeError(System.Xml.XmlQualifiedName):System.Void")] [module: SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceClientProxyGenerator..ctor(System.String,System.Boolean)", MessageId = "debug")] @@ -25,7 +25,7 @@ using System.Diagnostics.CodeAnalysis; [module: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceParameterData.get_ParameterType():Microsoft.Web.Script.Services.WebServiceTypeData")] [module: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceTypeData.set_TypeName(System.String):System.Void")] [module: SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "Microsoft.Web.Script.Services.WebServiceTypeData.set_TypeNamespace(System.String):System.Void")] -// [....], END FxCop violations for code in Microsoft.Web.Script.Services.* +// krisragh, END FxCop violations for code in Microsoft.Web.Script.Services.* [module: SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Scope = "member", Target = "System.Runtime.Serialization.DataContractContentExtensions.ReadAsDataContract(System.ServiceModel.Web.Client.Http.HttpContent,System.Runtime.Serialization.DataContractSerializer):T")] diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs index 7e9b5bf657e..83b5943fbc2 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs @@ -116,12 +116,12 @@ namespace System.ServiceModel.Description { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR2.CrossDomainJavascriptNotsupported)); } -#pragma warning disable 56506 // [....], endpoint.Contract is never null +#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null this.reflector = new XmlSerializerOperationBehavior.Reflector(endpoint.Contract.Namespace, null); foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { -#pragma warning disable 56506 // [....], clientRuntime.Operations is never null +#pragma warning disable 56506 // Microsoft, clientRuntime.Operations is never null if (clientRuntime.Operations.Contains(od.Name)) #pragma warning restore 56506 { @@ -169,7 +169,7 @@ namespace System.ServiceModel.Description { this.HelpUri = new UriTemplate(HelpPage.OperationListHelpPageUriTemplate).BindByPosition(endpoint.ListenUri); } -#pragma warning disable 56506 // [....], endpoint.Contract is never null +#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null this.reflector = new XmlSerializerOperationBehavior.Reflector(endpoint.Contract.Namespace, null); #pragma warning restore 56506 @@ -177,12 +177,12 @@ namespace System.ServiceModel.Description endpointDispatcher.AddressFilter = new PrefixEndpointAddressMessageFilter(endpoint.Address); endpointDispatcher.ContractFilter = new MatchAllMessageFilter(); // operation selector -#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime is never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime is never null endpointDispatcher.DispatchRuntime.OperationSelector = this.GetOperationSelector(endpoint); #pragma warning restore 56506 // unhandled operation string actionStarOperationName = null; -#pragma warning disable 56506 // [....], endpoint.Contract is never null +#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -197,7 +197,7 @@ namespace System.ServiceModel.Description { // WCF v1 installs any Action="*" op into UnhandledDispatchOperation, but WebHttpBehavior // doesn't want this, so we 'move' that operation back into normal set of operations -#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.{Operations,UnhandledDispatchOperation} is never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.{Operations,UnhandledDispatchOperation} is never null endpointDispatcher.DispatchRuntime.Operations.Add( endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation); #pragma warning restore 56506 @@ -228,7 +228,7 @@ namespace System.ServiceModel.Description jsonContentType = JsonMessageEncoderFactory.GetContentType(null); } -#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null // always install UnhandledDispatchOperation (WebHttpDispatchOperationSelector may choose not to use it) endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation = new DispatchOperation(endpointDispatcher.DispatchRuntime, "*", WildcardAction, WildcardAction); endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation.DeserializeRequest = false; @@ -239,13 +239,13 @@ namespace System.ServiceModel.Description foreach (OperationDescription od in endpoint.Contract.Operations) { DispatchOperation dop = null; -#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime, DispatchRuntime.Operations are never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime, DispatchRuntime.Operations are never null if (endpointDispatcher.DispatchRuntime.Operations.Contains(od.Name)) #pragma warning restore 56506 { dop = endpointDispatcher.DispatchRuntime.Operations[od.Name]; } -#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null else if (endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation.Name == od.Name) { dop = endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation; @@ -600,7 +600,7 @@ namespace System.ServiceModel.Description WebMessageFormat responseFormat = GetResponseFormat(operationDescription); // Determine if we should add a json formatter; If the ResponseFormat is json, we always add the json formatter even if the - // operation is XmlSerializerFormat because the formatter constructor throws the exception: "json not valid with XmlSerializerFormat" [[....]] + // operation is XmlSerializerFormat because the formatter constructor throws the exception: "json not valid with XmlSerializerFormat" [Microsoft] bool useJson = (responseFormat == WebMessageFormat.Json || SupportsJsonFormat(operationDescription)); IDispatchMessageFormatter innerFormatter; diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs index bfa99823767..8913c7090b5 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs @@ -126,7 +126,7 @@ namespace System.ServiceModel.Description public override void ApplyClientBehavior(ServiceEndpoint endpoint, ClientRuntime clientRuntime) { base.ApplyClientBehavior(endpoint, clientRuntime); -#pragma warning disable 56506 // [....], clientRuntime.MessageInspectors is never null +#pragma warning disable 56506 // Microsoft, clientRuntime.MessageInspectors is never null clientRuntime.MessageInspectors.Add(new JsonClientMessageInspector()); #pragma warning restore 56506 } @@ -142,7 +142,7 @@ namespace System.ServiceModel.Description } catch (XmlException exception) { - // [....], need to reference this resource string although fix for 13332 was removed + // Microsoft, need to reference this resource string although fix for 13332 was removed throw System.ServiceModel.DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR2.GetString(SR2.InvalidXmlCharactersInNameUsedWithPOSTMethod, string.Empty, string.Empty, string.Empty), exception)); } } @@ -151,7 +151,7 @@ namespace System.ServiceModel.Description { base.Validate(endpoint); -#pragma warning disable 56506 // [....], endpoint.Contract is never null +#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null foreach (OperationDescription operation in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -232,7 +232,7 @@ namespace System.ServiceModel.Description throw System.ServiceModel.DiagnosticUtility.ExceptionUtility.ThrowHelperArgument( "endpointDispatcher", SR2.GetString(SR2.ChannelDispatcherMustBePresent)); } -#pragma warning disable 56506 // [....], endpointDispatcher.ChannelDispatcher.ErrorHandlers never null +#pragma warning disable 56506 // Microsoft, endpointDispatcher.ChannelDispatcher.ErrorHandlers never null endpointDispatcher.ChannelDispatcher.ErrorHandlers.Add(new JsonErrorHandler(endpoint, endpointDispatcher.ChannelDispatcher.IncludeExceptionDetailInFaults)); #pragma warning restore 56506 } diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs index 9f3b6f56998..8596a0101e7 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs @@ -165,7 +165,7 @@ namespace System.ServiceModel.Dispatcher { if (error != null) { - //TFS Bug 500275: it is not necessary to HtmlEncode the error.Message string here because XElement ctor will encode it. + //TFS div.Add(new XElement(HtmlPElementName, SR2.GetString(SR2.HelpServerErrorProcessingRequestWithDetails, error.Message))); div.Add(new XElement(HtmlPElementName, error.StackTrace ?? String.Empty)); } @@ -179,7 +179,7 @@ namespace System.ServiceModel.Dispatcher string encodedHelpLink = HttpUtility.HtmlEncode(helpUri.AbsoluteUri); if (error != null) { - //TFS Bug 500275: XElement.Parse does not HtmlEncode the string passed to it, so we need to encode it before calling Parse. + //TFS string errorMessage = AppSettings.DisableHtmlErrorPageExceptionHtmlEncoding ? error.Message : HttpUtility.HtmlEncode(error.Message); div.Add(XElement.Parse(SR2.GetString(SR2.HelpServerErrorProcessingRequestWithDetailsAndLink, encodedHelpLink, errorMessage))); div.Add(new XElement(HtmlPElementName, error.StackTrace ?? String.Empty)); @@ -363,7 +363,7 @@ namespace System.ServiceModel.Dispatcher else { return new XElement(HtmlPElementName, - new XElement(HtmlAElementName, new XAttribute(HtmlNameAttributeName, "#" + label), title), + new XElement(HtmlAElementName, new XAttribute(HtmlNameAttributeName, label), title), new XElement(HtmlPreElementName, new XAttribute(HtmlClassAttributeName, label), content)); } } diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs index 22389d6d90b..523e330f016 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs @@ -36,7 +36,7 @@ namespace System.ServiceModel.Dispatcher { Message message = inputs[0] as Message; outputs = null; -#pragma warning disable 56506 // [....], message.Properties is never null +#pragma warning disable 56506 // Microsoft, message.Properties is never null if (message == null) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException( diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs index ee73a7fd9a4..dba20ddce99 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs @@ -47,7 +47,7 @@ namespace System.ServiceModel.Dispatcher throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException( SR2.GetString(SR2.EndpointAddressCannotBeNull))); } -#pragma warning disable 56506 // [....], endpoint.Address.Uri is never null +#pragma warning disable 56506 // Microsoft, endpoint.Address.Uri is never null Uri baseUri = endpoint.Address.Uri; this.methodSpecificTables = new Dictionary<string, UriTemplateTable>(); this.templates = new Dictionary<string, UriTemplate>(); @@ -61,7 +61,7 @@ namespace System.ServiceModel.Dispatcher Dictionary<WCFKey, string> alreadyHaves = new Dictionary<WCFKey, string>(); -#pragma warning disable 56506 // [....], endpoint.Contract is never null +#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -156,7 +156,7 @@ namespace System.ServiceModel.Dispatcher } bool uriMatched; string result = this.SelectOperation(ref message, out uriMatched); -#pragma warning disable 56506 // [....], Message.Properties is never null +#pragma warning disable 56506 // Microsoft, Message.Properties is never null message.Properties.Add(HttpOperationSelectorUriMatchedPropertyName, uriMatched); #pragma warning restore 56506 if (result != null) @@ -164,7 +164,7 @@ namespace System.ServiceModel.Dispatcher message.Properties.Add(HttpOperationNamePropertyName, result); if (DiagnosticUtility.ShouldTraceInformation) { -#pragma warning disable 56506 // [....], Message.Headers is never null +#pragma warning disable 56506 // Microsoft, Message.Headers is never null TraceUtility.TraceEvent(TraceEventType.Information, TraceCode.WebRequestMatchesOperation, SR2.GetString(SR2.TraceCodeWebRequestMatchesOperation, message.Headers.To, result)); #pragma warning restore 56506 } @@ -186,7 +186,7 @@ namespace System.ServiceModel.Dispatcher return this.catchAllOperationName; } -#pragma warning disable 56506 // [....], message.Properties is never null +#pragma warning disable 56506 // Microsoft, message.Properties is never null if (!message.Properties.ContainsKey(HttpRequestMessageProperty.Name)) { return this.catchAllOperationName; diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs index 4a3d17d51e7..34857a8654f 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------ +//------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. //------------------------------------------------------------ namespace System.ServiceModel.Web @@ -9,9 +9,9 @@ namespace System.ServiceModel.Web // DO NOT EDIT THIS CODE. // // All of the code from this class was taken from build 20717.00 - // of System.Net.HttpDateParse. If there is a bug with this code - // it should be fixed in the original System.Net.HttpDateParse - // and then ported here. [[....]] + // of System.Net.HttpDateParse. If there is a + + internal static class HttpDateParse { @@ -48,7 +48,7 @@ namespace System.ServiceModel.Web private const int DATE_TOKEN_JANUARY = 1; private const int DATE_TOKEN_FEBRUARY = 2; - private const int DATE_TOKEN_MARCH = 3; + private const int DATE_TOKEN_Microsoft = 3; private const int DATE_TOKEN_APRIL = 4; private const int DATE_TOKEN_MAY = 5; private const int DATE_TOKEN_JUNE = 6; @@ -145,7 +145,7 @@ namespace System.ServiceModel.Web switch (MakeUpper(lpszDay[index + 2])) { case 'R': - return DATE_TOKEN_MARCH; + return DATE_TOKEN_Microsoft; case 'Y': return DATE_TOKEN_MAY; } diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs index e6d3a74f47d..aaff3cea26a 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs @@ -37,7 +37,7 @@ namespace System.ServiceModel.Web throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("operationContext"); } this.operationContext = operationContext; -#pragma warning disable 56506 // [....], operationContext.Extensions is never null +#pragma warning disable 56506 // Microsoft, operationContext.Extensions is never null if (operationContext.Extensions.Find<WebOperationContext>() == null) { operationContext.Extensions.Add(this); diff --git a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs index 7fd8d6fd514..2b72d55770b 100644 --- a/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs +++ b/mcs/class/referencesource/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs @@ -195,7 +195,7 @@ namespace System.ServiceModel } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] // [....], This is the pattern we use on the standard bindings in Indigo V1 + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] // Microsoft, This is the pattern we use on the standard bindings in Indigo V1 bool IBindingRuntimePreferences.ReceiveSynchronously { get { return false; } |