diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs index f34cf1efdc..0254e0d912 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcOptionsExtensions.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.Xml.Linq; using Microsoft.AspNet.Mvc.Formatters.Xml; using Microsoft.AspNet.Mvc.ModelBinding.Metadata; using Microsoft.Framework.Internal; @@ -23,7 +22,7 @@ namespace Microsoft.AspNet.Mvc options.OutputFormatters.Add(new XmlDataContractSerializerOutputFormatter()); options.InputFormatters.Add(new XmlDataContractSerializerInputFormatter()); - options.ValidationExcludeFilters.Add(typeof(XObject)); + options.ValidationExcludeFilters.Add(typeFullName: "System.Xml.Linq.XObject"); options.ValidationExcludeFilters.Add(typeFullName: "System.Xml.XmlNode"); } } diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs index 4f4ef40676..ccffa5bb8e 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs @@ -219,10 +219,10 @@ namespace Microsoft.AspNet.Mvc = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); Assert.Equal(jTokenFilter.ExcludedType, typeof(JToken)); - Assert.IsType(typeof(DefaultTypeBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); + Assert.IsType(typeof(DefaultTypeNameBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); var xObjectFilter - = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); - Assert.Equal(xObjectFilter.ExcludedType, typeof(XObject)); + = Assert.IsType(mvcOptions.ValidationExcludeFilters[i++]); + Assert.Equal(xObjectFilter.ExcludedTypeName, typeof(XObject).FullName); Assert.IsType(typeof(DefaultTypeNameBasedExcludeFilter), mvcOptions.ValidationExcludeFilters[i]); var xmlNodeFilter = diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index c36c6087ed..bea19ba810 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -5,6 +5,7 @@ }, "dependencies": { "Kestrel": "1.0.0-*", + "Microsoft.AspNet.Authentication": "1.0.0-*", "Microsoft.AspNet.Mvc": "6.0.0-*", "Microsoft.AspNet.Mvc.Formatters.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",