From 30ae449b99a9736cd12c7b8be27bc57d0d8b48c2 Mon Sep 17 00:00:00 2001 From: Michael Hallock Date: Thu, 14 Jan 2021 18:55:02 -0500 Subject: [PATCH] Addresses #69 --- src/SAML2/Schema/Core/AuthnContextType.cs | 2 +- src/SAML2/Schema/Metadata/EntityDescriptor.cs | 1 - src/SAML2/Schema/Metadata/SsoDescriptor.cs | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SAML2/Schema/Core/AuthnContextType.cs b/src/SAML2/Schema/Core/AuthnContextType.cs index 066a90e..0d29522 100644 --- a/src/SAML2/Schema/Core/AuthnContextType.cs +++ b/src/SAML2/Schema/Core/AuthnContextType.cs @@ -7,7 +7,7 @@ namespace SAML2.Schema.Core /// Authentication context type enumeration. /// [Serializable] - [XmlTypeAttribute(Namespace = Saml20Constants.Assertion, IncludeInSchema = false)] + [XmlType(Namespace = Saml20Constants.Assertion, IncludeInSchema = false)] public enum AuthnContextType { /// diff --git a/src/SAML2/Schema/Metadata/EntityDescriptor.cs b/src/SAML2/Schema/Metadata/EntityDescriptor.cs index e03bb5b..31d542a 100644 --- a/src/SAML2/Schema/Metadata/EntityDescriptor.cs +++ b/src/SAML2/Schema/Metadata/EntityDescriptor.cs @@ -128,7 +128,6 @@ public string ValidUntilString [XmlElement(AuthnAuthorityDescriptor.ElementName, typeof(AuthnAuthorityDescriptor), Order = 3)] [XmlElement(IdpSsoDescriptor.ElementName, typeof(IdpSsoDescriptor), Order = 3)] [XmlElement(PdpDescriptor.ElementName, typeof(PdpDescriptor), Order = 3)] - [XmlElement(RoleDescriptor.ElementName, typeof(RoleDescriptor), Order = 3)] [XmlElement(SpSsoDescriptor.ElementName, typeof(SpSsoDescriptor), Order = 3)] public object[] Items { get; set; } diff --git a/src/SAML2/Schema/Metadata/SsoDescriptor.cs b/src/SAML2/Schema/Metadata/SsoDescriptor.cs index 13d3a03..370f062 100644 --- a/src/SAML2/Schema/Metadata/SsoDescriptor.cs +++ b/src/SAML2/Schema/Metadata/SsoDescriptor.cs @@ -11,10 +11,10 @@ namespace SAML2.Schema.Metadata /// providers that support SSO /// [XmlInclude(typeof(SpSsoDescriptor))] - [XmlIncludeAttribute(typeof(IdpSsoDescriptor))] + [XmlInclude(typeof(IdpSsoDescriptor))] [Serializable] [DebuggerStepThrough] - [XmlTypeAttribute(Namespace = Saml20Constants.Metadata)] + [XmlType(Namespace = Saml20Constants.Metadata)] public abstract class SsoDescriptor : RoleDescriptor { #region Elements