dotnet-svcutil fix: MessageEncoding config was ignored in BasicHttpBinding code generation. (#5104)

Author: imcarolwang

src/dotnet-svcutil/lib/src/CodeDomFixup/MethodCreationHelper.cs

@@ -1721,6 +1721,18 @@ private static void AddBasicHttpBindingConfiguration(CodeStatementCollection sta
 
             MaxOutProperties(statements, resultVar);
 
+            if (defaultBinding.MessageEncoding != basicHttp.MessageEncoding)
+            {
+                statements.Add(
+                    new CodeAssignStatement(
+                        new CodePropertyReferenceExpression(
+                            resultVar,
+                            "MessageEncoding"),
+                        new CodePropertyReferenceExpression(
+                            new CodeTypeReferenceExpression(typeof(WSMessageEncoding)),
+                            basicHttp.MessageEncoding.ToString())));
+            }
+
             // Set AllowCookies's default value to true.
             statements.Add(
                    new CodeAssignStatement(

src/dotnet-svcutil/lib/src/FrameworkFork/System.ServiceModel/System/ServiceModel/BasicHttpBinding.cs

@@ -126,8 +126,12 @@ public override BindingElementCollection CreateBindingElements()
                 bindingElements.Add(wsSecurity);
             }
             // add encoding
-            if (MessageEncoding == WSMessageEncoding.Text)
-                bindingElements.Add(TextMessageEncodingBindingElement);
+            WSMessageEncodingHelper.SyncUpEncodingBindingElementProperties(this.TextMessageEncodingBindingElement, this.MtomMessageEncodingBindingElement);
+            if (this.MessageEncoding == WSMessageEncoding.Text)
+                bindingElements.Add(this.TextMessageEncodingBindingElement);
+            else if (this.MessageEncoding == WSMessageEncoding.Mtom)
+                bindingElements.Add(this.MtomMessageEncodingBindingElement);
+
             // add transport (http or https)
             bindingElements.Add(GetTransport());