Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/ClientClassGenerator.cs

@@ -61,7 +61,7 @@ namespace System.ServiceModel.Description
         static string getDefaultValueForInitializationMethodName = "GetDefaultValueForInitialization";
 
         // IMPORTANT: this table tracks the set of .ctors in ClientBase and DuplexClientBase. 
-        // This table must be kept in [....]
+        // This table must be kept in sync
         // for DuplexClientBase, the initial InstanceContext param is assumed; ctor overloads must match between ClientBase and DuplexClientBase
         static Type[][] ClientCtorParamTypes = new Type[][]
             {
@@ -107,7 +107,7 @@ namespace System.ServiceModel.Description
 
 #if DEBUG
         static BindingFlags ctorBindingFlags = BindingFlags.Instance | BindingFlags.NonPublic;
-        static string DebugCheckTable_errorString = "Client code generation table out of [....] with ClientBase and DuplexClientBase ctors. Please investigate.";
+        static string DebugCheckTable_errorString = "Client code generation table out of sync with ClientBase and DuplexClientBase ctors. Please investigate.";
 
         // check the table against what we would get from reflection
         static void DebugCheckTable()

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/ConfigWriter.cs

@@ -40,7 +40,7 @@ namespace System.ServiceModel.Description
 
             channelElement = new ChannelEndpointElement(endpoint.Address, typeName);
 
-            // [....]: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm
+            // Microsoft: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm
             // does not touch ASCII names, a name that looks like encoded name will not roundtrip(Example: "_x002C_" will turned into ",")
             channelElement.Name = NamingHelper.GetUniqueName(NamingHelper.CodeName(endpoint.Name), this.CheckIfChannelNameInUse, null);
 
@@ -64,7 +64,7 @@ namespace System.ServiceModel.Description
             BindingDictionaryValue bindingDV;
             if (!bindingTable.TryGetValue(binding, out bindingDV))
             {
-                // [....]: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm
+                // Microsoft: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm
                 // does not touch ASCII names, a name that looks like encoded name will not roundtrip(Example: "_x002C_" will turned into ",")
                 string bindingName = NamingHelper.GetUniqueName(NamingHelper.CodeName(binding.Name), this.CheckIfBindingNameInUse, null);
                 string bindingSectionName;

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/ImportedPolicyConversionContext.cs

@@ -13,7 +13,7 @@ namespace System.ServiceModel.Description
 
     public abstract partial class MetadataImporter
     {
-        //Consider, [....]: make this public
+        //Consider, Microsoft: make this public
         internal static IEnumerable<PolicyConversionContext> GetPolicyConversionContextEnumerator(ServiceEndpoint endpoint, PolicyAlternatives policyAlternatives)
         {
             return ImportedPolicyConversionContext.GetPolicyConversionContextEnumerator(endpoint, policyAlternatives, MetadataImporterQuotas.Defaults);

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/MessageContractExporter.cs

@@ -511,7 +511,7 @@ namespace System.ServiceModel.Description
                 string operationName = contractContext.GetOperation(operation).Name;
 
                 string callbackString = operation.IsServerInitiated() ? "Callback" : string.Empty;
-                // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
+                // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
                 if (messageDescription.Direction == MessageDirection.Input)
                     messageNameBase = string.Format(System.Globalization.CultureInfo.InvariantCulture,
                                         "{0}_{1}_Input{2}Message", portTypeName, operationName, callbackString);
@@ -539,7 +539,7 @@ namespace System.ServiceModel.Description
         {
             string portTypeName = contractContext.WsdlPortType.Name;
             string operationName = contractContext.GetOperation(operation).Name;
-            // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
+            // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
             string faultNameBase = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}_FaultMessage", portTypeName, operationName, faultName);
 
             WsdlNS.ServiceDescription wsdl = contractContext.WsdlPortType.ServiceDescription;

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/MetadataSection.cs

@@ -92,7 +92,7 @@ namespace System.ServiceModel.Description
             if (!IsPolicyElement(policy))
             {
                 throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("policy",
-#pragma warning suppress 56506 // [....], policy cannot be null at this point since it has been validated above.
+#pragma warning suppress 56506 // Microsoft, policy cannot be null at this point since it has been validated above.
  SR.GetString(SR.SFxBadMetadataMustBePolicy, MetadataStrings.WSPolicy.NamespaceUri, MetadataStrings.WSPolicy.Elements.Policy, policy.NamespaceURI, policy.LocalName));
             }
 

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/PolicyReader.cs

@@ -21,7 +21,7 @@ namespace System.ServiceModel.Description
         
         internal delegate void PolicyWarningHandler(XmlElement contextAssertion, string warningMessage);
         
-        // Consider, [....], make this public?
+        // Consider, Microsoft, make this public?
         internal event PolicyWarningHandler PolicyWarningOccured;
 
         internal IEnumerable<IEnumerable<XmlElement>> NormalizePolicy(IEnumerable<XmlElement> policyAssertions)
@@ -92,7 +92,7 @@ namespace System.ServiceModel.Description
                         string warningMsg = SR.GetString(SR.UnrecognizedPolicyElementInNamespace, node.Name, node.NamespaceURI);
                         metadataImporter.PolicyWarningOccured.Invoke(contextAssertion, warningMsg);
                         break;
-                    //consider [....], add more error handling here. default?
+                    //consider Microsoft, add more error handling here. default?
                 }
                 return nodes;
             }
@@ -365,7 +365,7 @@ namespace System.ServiceModel.Description
                 {
                     get
                     {
-#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext
+#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext
                         throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.NoValue0)));
                     }
                 }

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/ServiceEndpoint.cs

@@ -105,7 +105,7 @@ namespace System.ServiceModel.Description
                 }
                 else if (binding != null)
                 {
-                    // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
+                    // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_'
                     return String.Format(CultureInfo.InvariantCulture, "{0}_{1}", new XmlName(Binding.Name).EncodedName, Contract.Name);
                 }
                 else

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/SoapHelper.cs

@@ -186,7 +186,7 @@ namespace System.ServiceModel.Description
         static class SoapConverter
         {
 
-            // [....], this could be simplified if we used generics.
+            // Microsoft, this could be simplified if we used generics.
             internal static void ConvertExtensions(WsdlNS.ServiceDescriptionFormatExtensionCollection extensions, EnvelopeVersion version, ConvertExtension conversionMethod)
             {
                 bool foundOne = false;

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/TaskOperationDescriptionValidator.cs

@@ -15,7 +15,7 @@ namespace System.ServiceModel.Description
             {
                 if (isForService)
                 {
-                    // no other method ([....], async) is allowed to co-exist with a task-based method on the server-side.
+                    // no other method (sync, async) is allowed to co-exist with a task-based method on the server-side.
                     EnsureNoSyncMethod(operationDescription);
                     EnsureNoBeginEndMethod(operationDescription);
                 }

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/TypeLoader.cs.REMOVED.git-id

@@ -1 +1 @@
-105821f4e781b5416a204f35dbe52b5ffb907524
+45d56cc0518a7e655be69a2f02bb621e31249d3d

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/WsdlExporter.cs

@@ -991,7 +991,7 @@ namespace System.ServiceModel.Description
                     int i = 0;
                     prefix = prefixBase + i.ToString(CultureInfo.InvariantCulture);
 
-                    //[....], consider do we need to check at higher scopes as well?
+                    //Microsoft, consider do we need to check at higher scopes as well?
                     while (PrefixExists(scopes[0].Namespaces.ToArray(), prefix))
                         prefix = prefixBase + (++i).ToString(CultureInfo.InvariantCulture);
                 }

mcs/class/referencesource/System.ServiceModel/System/ServiceModel/Description/WsdlImporter.cs.REMOVED.git-id

@@ -1 +1 @@
-cf5abf7fb7abe2461729cc562ead21bd3e49073a
+f980585bc7105829a2eb31eada39e84f0b94a7a5