Merge pull request #1073 from avoronin565/XmlIncludeAttribute

Add XmlIncludeAttribute support when generating wsdl.

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

@@ -0,0 +1,40 @@
+using System;
+using System.ServiceModel;
+using System.Xml.Serialization;
+
+namespace SoapCore.Tests.Wsdl.Services
+{
+	[ServiceContract]
+	internal interface IXmlIncludeService
+	{
+		[XmlInclude(typeof(XmlIncludeService.Dog))]
+		[XmlInclude(typeof(XmlIncludeService.Cat))]
+		[OperationContract]
+		XmlIncludeService.Animal Test(XmlIncludeService.Animal value);
+	}
+
+	public class XmlIncludeService : IXmlIncludeService
+	{
+		public Animal Test(Animal value)
+		{
+			return value;
+		}
+
+		[Serializable]
+		[XmlInclude(typeof(Dog))]
+		[XmlInclude(typeof(Cat))]
+		public class Animal
+		{
+		}
+
+		[Serializable]
+		public class Dog : Animal
+		{
+		}
+
+		[Serializable]
+		public class Cat : Animal
+		{
+		}
+	}
+}

src/SoapCore.Tests/Wsdl/WsdlTests.cs

@@ -182,6 +182,27 @@ public void CheckAnonymousServiceKnownType()
 			Assert.IsNotNull(dogElement);
 		}
 
+		[TestMethod]
+		public void CheckXmlIncludeTypesASMX()
+		{
+			StartService(typeof(XmlIncludeService));
+			var wsdl = GetWsdlFromAsmx();
+			StopServer();
+
+			var root = XElement.Parse(wsdl);
+			var dogElement = GetElements(root, _xmlSchema + "complexType").SingleOrDefault(a => a.Attribute("name")?.Value.Equals("Dog") == true);
+			Assert.IsNotNull(dogElement);
+
+			var catElement = GetElements(root, _xmlSchema + "complexType").SingleOrDefault(a => a.Attribute("name")?.Value.Equals("Cat") == true);
+			Assert.IsNotNull(dogElement);
+
+			var animalElement = GetElements(dogElement, _xmlSchema + "extension").SingleOrDefault(a => a.Attribute("base")?.Value.Equals("tns:Animal") == true);
+			Assert.IsNotNull(animalElement);
+
+			animalElement = GetElements(catElement, _xmlSchema + "extension").SingleOrDefault(a => a.Attribute("base")?.Value.Equals("tns:Animal") == true);
+			Assert.IsNotNull(animalElement);
+		}
+
 		[TestMethod]
 		public void CheckEmptyMembersServiceASMX()
 		{

src/SoapCore/Meta/MetaBodyWriter.cs

@@ -307,6 +307,12 @@ private void AddTypes(XmlDictionaryWriter writer)
 			{
 				bool hasWrittenOutParameters = false;
 
+				Type[] additionalTypesForOperation = GetKnownTypesFromMethod(operation.DispatchMethod);
+				foreach (Type additionalTypeForOperation in additionalTypesForOperation)
+				{
+					_complexTypeToBuild.Enqueue(new TypeToBuild(additionalTypeForOperation));
+				}
+
 				// input parameters of operation
 				writer.WriteStartElement("element", Namespaces.XMLNS_XSD);
 				writer.WriteAttributeString("name", GetOuterInputElementName(operation));
@@ -535,6 +541,22 @@ join m in toBuild.GetMembers() on n equals m.Name
 			writer.WriteEndElement(); // wsdl:types
 		}
 
+		private Type[] GetKnownTypesFromMethod(MethodInfo methodInfo)
+		{
+			List<Type> includeTypes = new();
+
+			if (methodInfo != null)
+			{
+				object[] customAttributes = methodInfo.GetCustomAttributes(typeof(XmlIncludeAttribute), true);
+				foreach (XmlIncludeAttribute attribute in customAttributes)
+				{
+					includeTypes.Add(attribute.Type);
+				}
+			}
+
+			return includeTypes.ToArray();
+		}
+
 		private void AddMessage(XmlDictionaryWriter writer)
 		{
 			foreach (var operation in _service.Operations)

src/SoapCore/ServiceBodyWriter.cs

@@ -189,8 +189,6 @@ private void OnWriteXmlSerializerBodyContents(XmlDictionaryWriter writer)
 					}
 					else
 					{
-						var serializer = CachedXmlSerializer.GetXmlSerializer(resultType, xmlName, xmlNs);
-
 						if (_result is Stream)
 						{
 							writer.WriteStartElement(_resultName, _serviceNamespace);
@@ -222,6 +220,7 @@ private void OnWriteXmlSerializerBodyContents(XmlDictionaryWriter writer)
 							}
 							else
 							{
+								var serializer = CachedXmlSerializer.GetXmlSerializer(resultType, xmlName, xmlNs);
 								//https://github.com/DigDes/SoapCore/issues/719
 								serializer.Serialize(writer, _result);
 							}