Map http://microsoft.com/wsdl/types/:guid to Guid (fixes #402)

Remove beta label

Author: Michael Ganss

XmlSchemaClassGenerator.Tests/XmlTests.cs

@@ -111,6 +111,7 @@ private static IEnumerable<string> ConvertXml(string name, string xsd, Generator
         const string EppPattern = "xsd/epp/*.xsd";
         const string GraphMLPattern = "xsd/graphml/ygraphml.xsd";
         const string UnionPattern = "xsd/union/union.xsd";
+        const string GuidPattern = "xsd/guid/*.xsd";
         const string NullableReferenceAttributesPattern = "xsd/nullablereferenceattributes/nullablereference.xsd";
 
         // IATA test takes too long to perform every time
@@ -156,6 +157,40 @@ public void TestClient()
             SharedTestFunctions.TestSamples(Output, "Client", ClientPattern);
         }
 
+        [Fact, TestPriority(1)]
+        [UseCulture("en-US")]
+        public void TestGuid()
+        {
+            var assembly = Compiler.Generate("Guid", GuidPattern);
+            var testType = assembly.GetType("Guid.Test");
+            var idProperty = testType.GetProperty("Id");
+            var elementIdProperty = testType.GetProperty("ElementId");
+
+            Assert.Equal(typeof(Nullable<>).MakeGenericType(typeof(Guid)), idProperty.PropertyType);
+            Assert.Equal(typeof(Guid), elementIdProperty.PropertyType);
+
+            var serializer = new XmlSerializer(testType);
+
+            var test = Activator.CreateInstance(testType);
+            var idGuid = Guid.NewGuid();
+            var elementGuid = Guid.NewGuid();
+
+            idProperty.SetValue(test, idGuid);
+            elementIdProperty.SetValue(test, elementGuid);
+
+            var sw = new StringWriter();
+
+            serializer.Serialize(sw, test);
+
+            var xml = sw.ToString();
+            var sr = new StringReader(xml);
+
+            var o = serializer.Deserialize(sr);
+
+            Assert.Equal(idGuid, idProperty.GetValue(o));
+            Assert.Equal(elementGuid, elementIdProperty.GetValue(o));
+        }
+
         [Fact, TestPriority(1)]
         [UseCulture("en-US")]
         public void TestUnion()

XmlSchemaClassGenerator.Tests/xsd/guid/guid.xsd

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://microsoft.com/wsdl/types/">
+	<xs:simpleType name="guid">
+		<xs:annotation>
+			<xs:documentation xml:lang="en">
+				The representation of a GUID, generally the id of an element.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>

XmlSchemaClassGenerator.Tests/xsd/guid/guidtest.xsd

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://tempuri.org/XMLSchema.xsd"
+    elementFormDefault="qualified"
+    xmlns="http://tempuri.org/XMLSchema.xsd"
+    xmlns:mstns="http://tempuri.org/XMLSchema.xsd"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:s="http://microsoft.com/wsdl/types/"
+>
+	<xs:import namespace="http://microsoft.com/wsdl/types/" schemaLocation="guid.xsd"></xs:import>
+	<xs:element name="Test">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="ElementId" type="s:guid"></xs:element>
+			</xs:sequence>
+			<xs:attribute name="Id" type="s:guid"></xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

XmlSchemaClassGenerator/CodeUtilities.cs

@@ -99,6 +99,8 @@ private static Type GetIntegerDerivedType(XmlSchemaDatatype xml, GeneratorConfig
             Type FromFallback() => configuration.UseIntegerDataTypeAsFallback && configuration.IntegerDataType != null ? configuration.IntegerDataType : typeof(string);
         }
 
+        private static readonly XmlQualifiedName GuidQualifiedName = new("guid", "http://microsoft.com/wsdl/types/");
+
         public static Type GetEffectiveType(this XmlSchemaDatatype type, GeneratorConfiguration configuration, IEnumerable<RestrictionModel> restrictions, XmlSchemaType schemaType, bool attribute = false)
         {
             var resultType = type.TypeCode switch
@@ -112,6 +114,11 @@ public static Type GetEffectiveType(this XmlSchemaDatatype type, GeneratorConfig
                 _ => type.ValueType,
             };
 
+            if (schemaType.QualifiedName == GuidQualifiedName)
+            {
+                resultType = typeof(Guid);
+            }
+
             if (type.Variety == XmlSchemaDatatypeVariety.List)
             {
                 if (resultType.IsArray)

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.0.{build}-beta
+version: 2.0.{build}
 skip_tags: true
 image: Visual Studio 2022
 environment: