diff --git a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/CodeExporter.cs b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/CodeExporter.cs
index abfd932eb8a..e73fe194b3e 100644
--- a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/CodeExporter.cs
+++ b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/CodeExporter.cs
@@ -250,7 +250,10 @@ internal CodeTypeDeclaration ExportEnum(EnumMapping mapping, Type type)
             CodeNamespace.Types.Add(codeClass);
             for (int i = 0; i < mapping.Constants.Length; i++)
             {
-                ExportConstant(codeClass, mapping.Constants[i], type, mapping.IsFlags, 1L << i);
+                ConstantMapping constant = mapping.Constants[i];
+                long defaultValue = mapping.IsFlags ? (1L << i) : i;
+                bool shouldEmitValue = mapping.IsFlags || constant.Value != defaultValue;
+                ExportConstant(codeClass, constant, type, shouldEmitValue, constant.Value);
             }
             if (mapping.IsFlags)
             {
diff --git a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/SoapSchemaImporter.cs b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/SoapSchemaImporter.cs
index f2ad817daa5..d46f4ff9044 100644
--- a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/SoapSchemaImporter.cs
+++ b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/SoapSchemaImporter.cs
@@ -8,6 +8,7 @@ namespace Microsoft.Xml.Serialization
     using Microsoft.Xml.Schema;
     using System.Collections;
     using System.ComponentModel;
+    using System.Globalization;
     using System.Reflection;
     using System.Diagnostics;
     using Microsoft.CodeDom.Compiler;
@@ -638,6 +639,7 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
                 throw new InvalidOperationException(string.Format(ResXml.XmlInvalidEnumContent, dataType.Content.GetType().Name, identifier));
 
             XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction)dataType.Content;
+            int enumIndex = 0;
 
             for (int i = 0; i < restriction.Facets.Count; i++)
             {
@@ -648,7 +650,9 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
                 string constantName = CodeIdentifier.MakeValid(enumeration.Value);
                 constant.Name = constants.AddUnique(constantName, constant);
                 constant.XmlName = enumeration.Value;
-                constant.Value = i;
+                long defaultValue = isList ? (1L << enumIndex) : enumIndex;
+                constant.Value = TryGetDataContractEnumValue(enumeration.Annotation, out long enumValue) ? enumValue : defaultValue;
+                enumIndex++;
             }
             enumMapping.Constants = (ConstantMapping[])constants.ToArray(typeof(ConstantMapping));
             if (isList && enumMapping.Constants.Length > 63)
@@ -665,6 +669,39 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
             return enumMapping;
         }
 
+        private static bool TryGetDataContractEnumValue(XmlSchemaAnnotation annotation, out long value)
+        {
+            value = default;
+
+            if (annotation?.Items == null)
+            {
+                return false;
+            }
+
+            foreach (XmlSchemaObject annotationItem in annotation.Items)
+            {
+                XmlSchemaAppInfo appInfo = annotationItem as XmlSchemaAppInfo;
+                if (appInfo?.Markup == null)
+                {
+                    continue;
+                }
+
+                foreach (XmlNode node in appInfo.Markup)
+                {
+                    XmlElement element = node as XmlElement;
+                    if (element != null
+                        && element.LocalName == "EnumerationValue"
+                        && element.NamespaceURI == "http://schemas.microsoft.com/2003/10/Serialization/"
+                        && long.TryParse(element.InnerText, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         private PrimitiveMapping ImportPrimitiveDataType(XmlSchemaSimpleType dataType)
         {
             TypeDesc sourceTypeDesc = GetDataTypeSource(dataType);
diff --git a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/XmlSchemaImporter.cs b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/XmlSchemaImporter.cs
index 78d5a88ee97..d6c440c3b69 100644
--- a/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/XmlSchemaImporter.cs
+++ b/src/dotnet-svcutil/lib/src/FrameworkFork/Microsoft.Xml/Xml/Serialization/XmlSchemaImporter.cs
@@ -1855,6 +1855,7 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
             if (content is XmlSchemaSimpleTypeRestriction)
             {
                 XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction)content;
+                int enumIndex = 0;
                 for (int i = 0; i < restriction.Facets.Count; i++)
                 {
                     object facet = restriction.Facets[i];
@@ -1869,7 +1870,9 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
                     string constantName = CodeIdentifier.MakeValid(enumeration.Value);
                     constant.Name = constants.AddUnique(constantName, constant);
                     constant.XmlName = enumeration.Value;
-                    constant.Value = i;
+                    long defaultValue = isList ? (1L << enumIndex) : enumIndex;
+                    constant.Value = TryGetDataContractEnumValue(enumeration.Annotation, out long enumValue) ? enumValue : defaultValue;
+                    enumIndex++;
                 }
             }
             enumMapping.Constants = (ConstantMapping[])constants.ToArray(typeof(ConstantMapping));
@@ -1885,6 +1888,39 @@ private TypeMapping ImportEnumeratedDataType(XmlSchemaSimpleType dataType, strin
             return enumMapping;
         }
 
+        private static bool TryGetDataContractEnumValue(XmlSchemaAnnotation annotation, out long value)
+        {
+            value = default;
+
+            if (annotation?.Items == null)
+            {
+                return false;
+            }
+
+            foreach (XmlSchemaObject annotationItem in annotation.Items)
+            {
+                XmlSchemaAppInfo appInfo = annotationItem as XmlSchemaAppInfo;
+                if (appInfo?.Markup == null)
+                {
+                    continue;
+                }
+
+                foreach (XmlNode node in appInfo.Markup)
+                {
+                    XmlElement element = node as XmlElement;
+                    if (element != null
+                        && element.LocalName == "EnumerationValue"
+                        && element.NamespaceURI == "http://schemas.microsoft.com/2003/10/Serialization/"
+                        && long.TryParse(element.InnerText, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
         internal class ElementComparer : IComparer
         {
             public int Compare(object o1, object o2)
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/XmlSerializer/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/XmlSerializer/Reference.cs
index b46bb00c912..989287f613e 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/XmlSerializer/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/XmlSerializer/Reference.cs
@@ -1140,145 +1140,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/wrapped/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/wrapped/Reference.cs
index 0f0b6b3b806..e9fa31ee4df 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/wrapped/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/wrapped/Reference.cs
@@ -1505,145 +1505,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs
index b8f86543018..de086601215 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<Saml2IssuedToken_mex_NS.TestFaultsResponse> TestFaultsAsync(Saml2IssuedToken_mex_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs
index f0d8777f9c8..4119c3744d8 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttpsTransSecMessCredsUserName_NS.TestFaultsResponse> TestFaultsAsync(BasicHttpsTransSecMessCredsUserName_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs
index e40ba4745e6..fcc1f58d974 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttp_NS.TestFaultsResponse> TestFaultsAsync(BasicHttp_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs
index 00cbcadb133..46f172176c6 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttps_NS.TestFaultsResponse> TestFaultsAsync(BasicHttps_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs
index 2c15f30fa13..e488e611bc5 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttp_NS.TestFaultsResponse> TestFaultsAsync(NetHttp_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs
index cd944a366f5..a5691cd6b73 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttpWebSockets_NS.TestFaultsResponse> TestFaultsAsync(NetHttpWebSockets_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttps/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttps/Reference.cs
index 3314fc6651b..0a7909307d5 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttps/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttps/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttps_NS.TestFaultsResponse> TestFaultsAsync(NetHttps_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpsWebSockets/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpsWebSockets/Reference.cs
index a5a3682011e..ff1047dc942 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpsWebSockets/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpsWebSockets/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpsWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttpsWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpsWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttpsWebSockets_NS.TestFaultsResponse> TestFaultsAsync(NetHttpsWebSockets_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNettcpTransSecMessCredsUserName/TcpTransSecMessCredsUserName/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNettcpTransSecMessCredsUserName/TcpTransSecMessCredsUserName/Reference.cs
index 8ba4d019207..34ee22b0b39 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNettcpTransSecMessCredsUserName/TcpTransSecMessCredsUserName/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNettcpTransSecMessCredsUserName/TcpTransSecMessCredsUserName/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(TcpTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(TcpTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(TcpTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<TcpTransSecMessCredsUserName_NS.TestFaultsResponse> TestFaultsAsync(TcpTransSecMessCredsUserName_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WsHttpBindingAndws2007HttpBindingTransSecMessCredsUserName/HttpsTransSecMessCredsUserName/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WsHttpBindingAndws2007HttpBindingTransSecMessCredsUserName/HttpsTransSecMessCredsUserName/Reference.cs
index a6434cf4c22..39ebdabb91e 100644
--- a/src/dotnet-svcutil/lib/tests/Baselines/WsHttpBindingAndws2007HttpBindingTransSecMessCredsUserName/HttpsTransSecMessCredsUserName/Reference.cs
+++ b/src/dotnet-svcutil/lib/tests/Baselines/WsHttpBindingAndws2007HttpBindingTransSecMessCredsUserName/HttpsTransSecMessCredsUserName/Reference.cs
@@ -618,8 +618,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(HttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(HttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(HttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<HttpsTransSecMessCredsUserName_NS.TestFaultsResponse> TestFaultsAsync(HttpsTransSecMessCredsUserName_NS.TestFaultsRequest request);
         
@@ -1347,145 +1347,145 @@ public enum HttpStatusCode
     {
         
         /// <remarks/>
-        Continue,
+        Continue = 100,
         
         /// <remarks/>
-        SwitchingProtocols,
+        SwitchingProtocols = 101,
         
         /// <remarks/>
-        OK,
+        OK = 200,
         
         /// <remarks/>
-        Created,
+        Created = 201,
         
         /// <remarks/>
-        Accepted,
+        Accepted = 202,
         
         /// <remarks/>
-        NonAuthoritativeInformation,
+        NonAuthoritativeInformation = 203,
         
         /// <remarks/>
-        NoContent,
+        NoContent = 204,
         
         /// <remarks/>
-        ResetContent,
+        ResetContent = 205,
         
         /// <remarks/>
-        PartialContent,
+        PartialContent = 206,
         
         /// <remarks/>
-        MultipleChoices,
+        MultipleChoices = 300,
         
         /// <remarks/>
-        Ambiguous,
+        Ambiguous = 300,
         
         /// <remarks/>
-        MovedPermanently,
+        MovedPermanently = 301,
         
         /// <remarks/>
-        Moved,
+        Moved = 301,
         
         /// <remarks/>
-        Found,
+        Found = 302,
         
         /// <remarks/>
-        Redirect,
+        Redirect = 302,
         
         /// <remarks/>
-        SeeOther,
+        SeeOther = 303,
         
         /// <remarks/>
-        RedirectMethod,
+        RedirectMethod = 303,
         
         /// <remarks/>
-        NotModified,
+        NotModified = 304,
         
         /// <remarks/>
-        UseProxy,
+        UseProxy = 305,
         
         /// <remarks/>
-        Unused,
+        Unused = 306,
         
         /// <remarks/>
-        TemporaryRedirect,
+        TemporaryRedirect = 307,
         
         /// <remarks/>
-        RedirectKeepVerb,
+        RedirectKeepVerb = 307,
         
         /// <remarks/>
-        BadRequest,
+        BadRequest = 400,
         
         /// <remarks/>
-        Unauthorized,
+        Unauthorized = 401,
         
         /// <remarks/>
-        PaymentRequired,
+        PaymentRequired = 402,
         
         /// <remarks/>
-        Forbidden,
+        Forbidden = 403,
         
         /// <remarks/>
-        NotFound,
+        NotFound = 404,
         
         /// <remarks/>
-        MethodNotAllowed,
+        MethodNotAllowed = 405,
         
         /// <remarks/>
-        NotAcceptable,
+        NotAcceptable = 406,
         
         /// <remarks/>
-        ProxyAuthenticationRequired,
+        ProxyAuthenticationRequired = 407,
         
         /// <remarks/>
-        RequestTimeout,
+        RequestTimeout = 408,
         
         /// <remarks/>
-        Conflict,
+        Conflict = 409,
         
         /// <remarks/>
-        Gone,
+        Gone = 410,
         
         /// <remarks/>
-        LengthRequired,
+        LengthRequired = 411,
         
         /// <remarks/>
-        PreconditionFailed,
+        PreconditionFailed = 412,
         
         /// <remarks/>
-        RequestEntityTooLarge,
+        RequestEntityTooLarge = 413,
         
         /// <remarks/>
-        RequestUriTooLong,
+        RequestUriTooLong = 414,
         
         /// <remarks/>
-        UnsupportedMediaType,
+        UnsupportedMediaType = 415,
         
         /// <remarks/>
-        RequestedRangeNotSatisfiable,
+        RequestedRangeNotSatisfiable = 416,
         
         /// <remarks/>
-        ExpectationFailed,
+        ExpectationFailed = 417,
         
         /// <remarks/>
-        UpgradeRequired,
+        UpgradeRequired = 426,
         
         /// <remarks/>
-        InternalServerError,
+        InternalServerError = 500,
         
         /// <remarks/>
-        NotImplemented,
+        NotImplemented = 501,
         
         /// <remarks/>
-        BadGateway,
+        BadGateway = 502,
         
         /// <remarks/>
-        ServiceUnavailable,
+        ServiceUnavailable = 503,
         
         /// <remarks/>
-        GatewayTimeout,
+        GatewayTimeout = 504,
         
         /// <remarks/>
-        HttpVersionNotSupported,
+        HttpVersionNotSupported = 505,
     }
     
     [System.Diagnostics.DebuggerStepThroughAttribute()]