Merge pull request #1171 from maxineal/develop

Fix WSDL schema generator with non-annotated System.Object

Author: andersjonsson

src/SoapCore.Tests/Wsdl/Services/ComplexTypeWithSystemObject.cs

@@ -0,0 +1,6 @@
+namespace SoapCore.Tests.Wsdl.Services;
+
+public class ComplexTypeWithSystemObject
+{
+	public object SystemObject { get; set; }
+}

src/SoapCore.Tests/Wsdl/Services/IComplexTypeWithSystemObjectService.cs

@@ -0,0 +1,17 @@
+using System;
+using System.ServiceModel;
+
+namespace SoapCore.Tests.Wsdl.Services
+{
+	[ServiceContract]
+	public interface IComplexTypeWithSystemObjectService
+	{
+		[OperationContract]
+		ComplexTypeWithSystemObject Test();
+	}
+
+	public class ComplexTypeWithSystemObjectService : IComplexTypeWithSystemObjectService
+	{
+		public ComplexTypeWithSystemObject Test() => throw new NotImplementedException();
+	}
+}

src/SoapCore.Tests/Wsdl/WsdlTests.cs

@@ -1407,6 +1407,25 @@ public async Task CheckComplexGenericTypeWithMultipleArgumentsWsdl(SoapSerialize
 			Assert.AreEqual($"tns:{genericTypeName}Of{genericTypeArgumentName}{genericTypeArgumentName}", typeName);
 		}
 
+		[DataTestMethod]
+		[DataRow(SoapSerializer.XmlSerializer)]
+		public async Task CheckComplexTypeWithSystemObjectWsdl(SoapSerializer soapSerializer)
+		{
+			var wsdl = await GetWsdlFromMetaBodyWriter<ComplexTypeWithSystemObjectService>(soapSerializer);
+			Trace.TraceInformation(wsdl);
+			Assert.IsNotNull(wsdl);
+
+			var root = XElement.Parse(wsdl);
+
+			var systemObjectElement = GetElements(root, _xmlSchema + "element")
+				.SingleOrDefault(a => a.Attribute("name")?.Value.Equals(nameof(ComplexTypeWithSystemObject.SystemObject)) == true);
+
+			Assert.IsNotNull(systemObjectElement);
+
+			var typeAttribute = systemObjectElement.Attribute("type");
+			Assert.IsNull(typeAttribute);
+		}
+
 		[TestMethod]
 		public void CheckSchemeOverride()
 		{

src/SoapCore/Meta/MetaBodyWriter.cs

@@ -1273,6 +1273,11 @@ private void AddSchemaType(XmlDictionaryWriter writer, TypeToBuild toBuild, stri
 						_complexTypeToBuild.Enqueue(newTypeToBuild);
 					}
 				}
+				else if (type == typeof(object))
+				{
+					writer.WriteAttributeString("name", name);
+					WriteQualification(writer, isUnqualified);
+				}
 				else if (toBuild.IsAnonumous)
 				{
 					if (string.IsNullOrEmpty(name))