Skip to content

[dotnet-svcutil] remove fixup that dropped extension data and update the test baselines #5900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imcarolwang merged 2 commits into from
Apr 13, 2026
Merged

[dotnet-svcutil] remove fixup that dropped extension data and update the test baselines #5900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96aa9d2
[dotnet-svcutil] remove fixup that dropped extension data and update …
imcarolwang Feb 6, 2026
881d99f
Rebase and update affected test baseline.
imcarolwang Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions src/dotnet-svcutil/lib/src/CodeDomFixup/CodeDomVisitors/RemoveExtensibleDataObjectImpl.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/dotnet-svcutil/lib/src/CodeDomFixup/VisitorFixup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ private static CodeDomVisitor[] GetVisitors(ServiceContractGenerator generator,
new ConstructorFixer(),
// Visitors to remove sync methods if !options.Sync
new MakeOldAsyncMethodsPrivate(),
new RemoveExtensibleDataObjectImpl(),
new XmlDomAttributeFixer(),
new SpecialIXmlSerializableRemapper(arrayOfXElementTypeHelper),
new EnsureAdditionalAssemblyReference(),
Expand Down
2 changes: 0 additions & 2 deletions src/dotnet-svcutil/lib/src/GlobalSuppressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Scope = "type", Target = "Microsoft.Tools.ServiceModel.Svcutil.ToolMexException")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors", Scope = "type", Target = "Microsoft.Tools.ServiceModel.Svcutil.ToolInputException")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.RemoveSyncMethodsFromInterface.#VisitAttributedType(Microsoft.CodeDom.CodeTypeDeclaration)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.RemoveExtensibleDataObjectImpl.#VisitAttributedType(Microsoft.CodeDom.CodeTypeDeclaration)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.DataContractXmlNodeArrayFixer.#VisitAttributedType(Microsoft.CodeDom.CodeTypeDeclaration)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1064:ExceptionsShouldBePublic", Scope = "type", Target = "Microsoft.Tools.ServiceModel.Svcutil.ToolRuntimeException")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Tools.ServiceModel.Svcutil.Tool.Assert(System.Boolean,System.String)", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.ArgumentDictionary.#GetArgument(System.String)")]
Expand All @@ -62,7 +61,6 @@
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.EndpointSelector.#IsBindingSupported(System.ServiceModel.Channels.Binding)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.CreateCallbackImpl.#CreateOperationReceivedEventArgsType(Microsoft.Tools.ServiceModel.Svcutil.CodeTypeNameScope,Microsoft.CodeDom.CodeMemberMethod)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.EndpointSelector.#IsBindingSupported(System.ServiceModel.Channels.Binding)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.RemoveExtensibleDataObjectImpl.#IsExtensionDataMember(Microsoft.CodeDom.CodeTypeMember)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.EndpointSelector.#IsBindingSupported(System.ServiceModel.Channels.Binding)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.DataContractXmlNodeArrayFixer.#VisitAttributedType(Microsoft.CodeDom.CodeTypeDeclaration)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "GetArguments", Scope = "member", Target = "Microsoft.Tools.ServiceModel.Svcutil.ArgumentDictionary.#GetArgument(System.String)")]
Expand Down
112 changes: 105 additions & 7 deletions src/dotnet-svcutil/lib/tests/Baselines/CodeGenOptions/Auto/Reference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ namespace Auto_NS
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="ComplexCompositeType", Namespace="http://schemas.datacontract.org/2004/07/WcfProjectNService")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class ComplexCompositeType : object
public partial class ComplexCompositeType : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private bool BoolValueField;

private byte[] ByteArrayValueField;
Expand Down Expand Up @@ -57,6 +59,18 @@ public partial class ComplexCompositeType : object

private ushort UshortValueField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public bool BoolValue
{
Expand Down Expand Up @@ -309,11 +323,25 @@ public ushort UshortValue
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="FaultDetail", Namespace="http://schemas.wcf.projectn.com/wcfnamespace")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class FaultDetail : object
public partial class FaultDetail : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private string MessageField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public string Message
{
Expand All @@ -332,13 +360,27 @@ public string Message
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="CompositeType", Namespace="http://schemas.datacontract.org/2004/07/WcfProjectNService")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class CompositeType : object
public partial class CompositeType : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private bool BoolValueField;

private string StringValueField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public bool BoolValue
{
Expand Down Expand Up @@ -370,9 +412,11 @@ public string StringValue
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="ResultOfstring", Namespace="http://schemas.wcf.projectn.com/wcfnamespace")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class ResultOfstring : object
public partial class ResultOfstring : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private int ErrorCodeField;

private string ErrorMessageField;
Expand All @@ -381,6 +425,18 @@ public partial class ResultOfstring : object

private string ResultField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public int ErrorCode
{
Expand Down Expand Up @@ -438,9 +494,11 @@ public string Result
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="ResultOfArrayOfUserGamePlay", Namespace="http://schemas.wcf.projectn.com/wcfnamespace")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class ResultOfArrayOfUserGamePlay : object
public partial class ResultOfArrayOfUserGamePlay : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private int ErrorCodeField;

private string ErrorMessageField;
Expand All @@ -449,6 +507,18 @@ public partial class ResultOfArrayOfUserGamePlay : object

private Auto_NS.UserGamePlay[] ResultField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public int ErrorCode
{
Expand Down Expand Up @@ -506,9 +576,11 @@ public Auto_NS.UserGamePlay[] Result
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="UserGamePlay", Namespace="http://schemas.datacontract.org/2004/07/WcfProjectNService")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class UserGamePlay : object
public partial class UserGamePlay : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private string GameKeyField;

private string KeyField;
Expand All @@ -519,6 +591,18 @@ public partial class UserGamePlay : object

private string ValueField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public string GameKey
{
Expand Down Expand Up @@ -589,9 +673,11 @@ public string Value
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
[System.Runtime.Serialization.DataContractAttribute(Name="TestHttpRequestMessageProperty", Namespace="http://schemas.datacontract.org/2004/07/WcfProjectNService")]
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute()]
public partial class TestHttpRequestMessageProperty : object
public partial class TestHttpRequestMessageProperty : object, System.Runtime.Serialization.IExtensibleDataObject
{

private System.Runtime.Serialization.ExtensionDataObject extensionDataField;

private System.Collections.Generic.Dictionary<string, string> HeadersField;

private string MethodField;
Expand All @@ -600,6 +686,18 @@ public partial class TestHttpRequestMessageProperty : object

private bool SuppressEntityBodyField;

public System.Runtime.Serialization.ExtensionDataObject ExtensionData
{
get
{
return this.extensionDataField;
}
set
{
this.extensionDataField = value;
}
}

[System.Runtime.Serialization.DataMemberAttribute()]
public System.Collections.Generic.Dictionary<string, string> Headers
{
Expand Down
Loading