From 2ad1f937ce89ec4100b28365f40474c7f23f265e Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 19 Feb 2015 19:15:03 -0800
Subject: [PATCH] Revert "Changes to support use of TagHelpers in applications
 with precompiled"

This reverts commit 61be874af89bf32b6aadead2dfd1928b1ffde6a6.
---
 .../TagHelpers/TagHelperDescriptorFactory.cs  |  4 ++--
 .../TagHelpers/TagHelperDescriptorResolver.cs | 20 +++++++------------
 src/Microsoft.AspNet.Razor/RazorEngineHost.cs |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
index 0beb8d9955..560c723a4a 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorFactory.cs
@@ -31,14 +31,14 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         /// <summary>
         /// Creates a <see cref="TagHelperDescriptor"/> from the given <paramref name="type"/>.
         /// </summary>
-        /// <param name="assemblyName">The assembly name that contains <paramref name="type"/>.</param>
         /// <param name="type">The type to create a <see cref="TagHelperDescriptor"/> from.</param>
         /// <returns>A <see cref="TagHelperDescriptor"/> that describes the given <paramref name="type"/>.</returns>
-        public static IEnumerable<TagHelperDescriptor> CreateDescriptors(string assemblyName, Type type)
+        public static IEnumerable<TagHelperDescriptor> CreateDescriptors(Type type)
         {
             var tagNames = GetTagNames(type);
             var typeName = type.FullName;
             var attributeDescriptors = GetAttributeDescriptors(type);
+            var assemblyName = type.GetTypeInfo().Assembly.GetName().Name;
 
             return tagNames.Select(tagName =>
                 new TagHelperDescriptor(tagName,
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
index b053673d4a..8ddacf76cc 100644
--- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperDescriptorResolver.cs
@@ -26,23 +26,18 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 
         private readonly TagHelperTypeResolver _typeResolver;
 
+        // internal for testing
+        internal TagHelperDescriptorResolver(TagHelperTypeResolver typeResolver)
+        {
+            _typeResolver = typeResolver;
+        }
+
         /// <summary>
         /// Instantiates a new instance of the <see cref="TagHelperDescriptorResolver"/> class.
         /// </summary>
         public TagHelperDescriptorResolver()
             : this(new TagHelperTypeResolver())
         {
-
-        }
-
-        /// <summary>
-        /// Instantiates a new instance of <see cref="TagHelperDescriptorResolver"/> class with the
-        /// specified <paramref name="typeResolver"/>.
-        /// </summary>
-        /// <param name="typeResolver">The <see cref="TagHelperTypeResolver"/>.</param>
-        public TagHelperDescriptorResolver(TagHelperTypeResolver typeResolver)
-        {
-            _typeResolver = typeResolver;
         }
 
         /// <inheritdoc />
@@ -117,8 +112,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
             var tagHelperTypes = _typeResolver.Resolve(assemblyName, documentLocation, errorSink);
 
             // Convert types to TagHelperDescriptors
-            var descriptors = tagHelperTypes.SelectMany(
-                type => TagHelperDescriptorFactory.CreateDescriptors(assemblyName, type));
+            var descriptors = tagHelperTypes.SelectMany(TagHelperDescriptorFactory.CreateDescriptors);
 
             return descriptors;
         }
diff --git a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
index f73336cecc..ba5b501398 100644
--- a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
+++ b/src/Microsoft.AspNet.Razor/RazorEngineHost.cs
@@ -115,7 +115,7 @@ namespace Microsoft.AspNet.Razor
         /// <summary>
         /// The <see cref="ITagHelperDescriptorResolver"/> used to resolve <see cref="TagHelperDescriptor"/>s.
         /// </summary>
-        public virtual ITagHelperDescriptorResolver TagHelperDescriptorResolver { get; set; }
+        public virtual ITagHelperDescriptorResolver TagHelperDescriptorResolver { get; protected set; }
 
         /// <summary>
         /// Boolean indicating if instrumentation code should be injected into the output page