Metadata element order bug solved.

Author: Revsgaard

src/ITfoxtec.Identity.Saml2/Schemas/Metadata/IdPSsoDescriptor.cs

@@ -35,14 +35,6 @@ protected IEnumerable<XObject> GetXContent()
         {
             yield return new XAttribute(Saml2MetadataConstants.Message.ProtocolSupportEnumeration, protocolSupportEnumeration);
 
-            if (SigningCertificates != null)
-            {
-                foreach (var signingCertificate in SigningCertificates)
-                {
-                    yield return KeyDescriptor(signingCertificate, Saml2MetadataConstants.KeyTypes.Signing);
-                }
-            }
-
             if (EncryptionCertificates != null)
             {
                 foreach (var encryptionCertificate in EncryptionCertificates)
@@ -51,11 +43,11 @@ protected IEnumerable<XObject> GetXContent()
                 }
             }
 
-            if (SingleSignOnServices != null)
+            if (SigningCertificates != null)
             {
-                foreach (var singleSignOnService in SingleSignOnServices)
+                foreach (var signingCertificate in SigningCertificates)
                 {
-                    yield return singleSignOnService.ToXElement();
+                    yield return KeyDescriptor(signingCertificate, Saml2MetadataConstants.KeyTypes.Signing);
                 }
             }
 
@@ -73,7 +65,15 @@ protected IEnumerable<XObject> GetXContent()
                 {
                     yield return new XElement(Saml2MetadataConstants.MetadataNamespaceX + Saml2MetadataConstants.Message.NameIDFormat, nameIDFormat.OriginalString);
                 }
-            }   
+            }
+
+            if (SingleSignOnServices != null)
+            {
+                foreach (var singleSignOnService in SingleSignOnServices)
+                {
+                    yield return singleSignOnService.ToXElement();
+                }
+            }
         }
 
         protected internal IdPSsoDescriptor Read(XmlElement xmlElement)

src/ITfoxtec.Identity.Saml2/Schemas/Metadata/SPSsoDescriptor.cs

@@ -68,6 +68,14 @@ protected IEnumerable<XObject> GetXContent()
                 yield return new XAttribute(Saml2MetadataConstants.Message.WantAssertionsSigned, WantAssertionsSigned.Value);
             }
 
+            if (EncryptionCertificates != null)
+            {
+                foreach(var encryptionCertificate in EncryptionCertificates)
+                {
+                    yield return KeyDescriptor(encryptionCertificate, Saml2MetadataConstants.KeyTypes.Encryption);
+                }                
+            }
+
             if (SigningCertificates != null)
             {
                 foreach (var signingCertificate in SigningCertificates)
@@ -76,14 +84,6 @@ protected IEnumerable<XObject> GetXContent()
                 }
             }
 
-            if (EncryptionCertificates != null)
-            {
-                foreach(var encryptionCertificate in EncryptionCertificates)
-                {
-                    yield return KeyDescriptor(encryptionCertificate, Saml2MetadataConstants.KeyTypes.Encryption);
-                }                
-            }
-            
             if (SingleLogoutServices != null)
             {
                 foreach (var singleLogoutService in SingleLogoutServices)