From 1cf6607e75090d2bc6aee9b85a6c0b27b976ab85 Mon Sep 17 00:00:00 2001 From: NTaylorMullen Date: Sat, 15 Nov 2014 12:56:47 -0800 Subject: [PATCH] React to aspnet/Razor#214 changes. - TagHelperAttributeDescriptors changed to be lighterweight and not depend on PropertyInfo, had to modify our use of them to work with the new contract. --- .../MvcTagHelperAttributeValueCodeRenderer.cs | 4 +--- .../MvcTagHelperAttributeValueCodeRendererTest.cs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs index 1be3000b1d..7c012a34b2 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs +++ b/src/Microsoft.AspNet.Mvc.Razor.Host/MvcTagHelperAttributeValueCodeRenderer.cs @@ -34,9 +34,7 @@ namespace Microsoft.AspNet.Mvc.Razor [NotNull] CodeBuilderContext codeBuilderContext, [NotNull] Action renderAttributeValue) { - var propertyType = attributeDescriptor.PropertyInfo.PropertyType; - - if (propertyType.FullName.Equals(_context.ModelExpressionTypeName, StringComparison.Ordinal)) + if (attributeDescriptor.TypeName.Equals(_context.ModelExpressionTypeName, StringComparison.Ordinal)) { writer.WriteStartMethodInvocation(_context.CreateModelExpressionMethodName) .Write(ModelLambdaVariableName) diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs index 1ccea9520c..9561877a47 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcTagHelperAttributeValueCodeRendererTest.cs @@ -26,9 +26,7 @@ namespace Microsoft.AspNet.Mvc.Razor ModelExpressionTypeName = modelExpressionType, CreateModelExpressionMethodName = "SomeMethod" }); - var propertyInfo = new Mock(); - propertyInfo.Setup(mock => mock.PropertyType.FullName).Returns(propertyType); - var attributeDescriptor = new TagHelperAttributeDescriptor("MyAttribute", propertyInfo.Object); + var attributeDescriptor = new TagHelperAttributeDescriptor("MyAttribute", "SomeProperty", propertyType); var writer = new CSharpCodeWriter(); var generatorContext = new CodeGeneratorContext(host: null, className: string.Empty,