Downgrading dependencies version from 1.1.0-* to 1.0.0-*

 - Added workarounds to make TagHelper discovery work

Author: ajaybhargavb

src/Microsoft.AspNetCore.Razor.Design/Internal/AssemblyTagHelperDescriptorResolver.cs

@@ -6,7 +6,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -20,6 +19,7 @@ public class AssemblyTagHelperDescriptorResolver
         private const string MvcAssemblyName = "Microsoft.AspNetCore.Mvc";
         private const string MethodName = "PopulateServiceCollection";
         private const string ViewComponentNameKey = "ViewComponentName";
+        private const string PropertyBagPropertyName = "PropertyBag";
 
         private readonly TagHelperDescriptorFactory _tagHelperDescriptorFactory;
         private readonly TagHelperTypeResolver _tagHelperTypeResolver;
@@ -92,7 +92,7 @@ public IEnumerable<TagHelperDescriptor> Resolve(string assemblyName, ErrorSink e
 
             // Temporary workaround to make design time for ViewComponent tag helpers work without needing a VS update.
             // This will be removed in a future version.
-            var vcthDescriptors = descriptors.Where(d => d.PropertyBag.ContainsKey(ViewComponentNameKey));
+            var vcthDescriptors = descriptors.Where(d => IsViewComponentTagHelperDescriptor(d));
             var fakeVcthDescriptors = GetFakeDescriptors(vcthDescriptors);
 
             var finalDescriptors = descriptors.Except(vcthDescriptors).Union(fakeVcthDescriptors);
@@ -141,15 +141,13 @@ private IEnumerable<TagHelperDescriptor> GetFakeDescriptors(IEnumerable<TagHelpe
             foreach (var descriptor in vcthDescriptors)
             {
                 var fakeType = typeof(ViewComponentTagHelperDesignTimeType).FullName;
-                var fakeDescriptor = new TagHelperDescriptor(descriptor);
-                fakeDescriptor.TypeName = fakeType;
+                var fakeDescriptor = GetFakeDescriptorForTypeName(descriptor, fakeType);
 
                 var fakeAttributes = new List<TagHelperAttributeDescriptor>();
                 fakeDescriptor.Attributes = fakeAttributes;
 
                 var fakeHelperType = typeof(ViewComponentTagHelperDesignTimeHelperType).FullName;
-                var fakeHelperDescriptor = new TagHelperDescriptor(descriptor);
-                fakeHelperDescriptor.TypeName = fakeHelperType;
+                var fakeHelperDescriptor = GetFakeDescriptorForTypeName(descriptor, fakeHelperType);
 
                 var fakeHelperAttributes = new List<TagHelperAttributeDescriptor>();
                 fakeHelperDescriptor.Attributes = fakeHelperAttributes;
@@ -216,6 +214,38 @@ private IEnumerable<TagHelperDescriptor> GetFakeDescriptors(IEnumerable<TagHelpe
 
             return fakeDescriptors;
         }
+
+        private static TagHelperDescriptor GetFakeDescriptorForTypeName(TagHelperDescriptor descriptor, string typeName)
+        {
+            var fakeDescriptor = new TagHelperDescriptor()
+            {
+                Prefix = descriptor.Prefix,
+                TagName = descriptor.TagName,
+                TypeName = typeName,
+                AssemblyName = descriptor.AssemblyName,
+                Attributes = descriptor.Attributes,
+                RequiredAttributes = descriptor.RequiredAttributes,
+                AllowedChildren = descriptor.AllowedChildren,
+                RequiredParent = descriptor.RequiredParent,
+                TagStructure = descriptor.TagStructure,
+                DesignTimeDescriptor = descriptor.DesignTimeDescriptor
+            };
+
+            return fakeDescriptor;
+        }
+
+        private static bool IsViewComponentTagHelperDescriptor(TagHelperDescriptor descriptor)
+        {
+            var propertyBag = descriptor.GetType().GetProperty(PropertyBagPropertyName)?.GetValue(descriptor)
+                as IDictionary<string, string>;
+
+            if (propertyBag != null)
+            {
+                return propertyBag.ContainsKey(ViewComponentNameKey);
+            }
+
+            return false;
+        }
     }
 
     public abstract class ViewComponentTagHelperDesignTimeType : TagHelper

src/Microsoft.AspNetCore.Razor.Design/project.json

@@ -36,17 +36,17 @@
     }
   },
   "dependencies": {
-    "Microsoft.AspNetCore.Razor.Runtime": "1.1.0-*",
-    "Microsoft.Extensions.CommandLineUtils": "1.1.0-*",
-    "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
+    "Microsoft.AspNetCore.Razor.Runtime": "1.0.0",
+    "Microsoft.Extensions.CommandLineUtils": "1.0.0",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0",
     "Newtonsoft.Json": "9.0.1"
   },
   "frameworks": {
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.1.0-*"
+          "version": "1.0.0"
         }
       }
     },

src/Microsoft.AspNetCore.Razor.Tools/project.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "Microsoft.AspNetCore.Razor.Design": "1.0.0-*",
     "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
-    "Microsoft.Extensions.PlatformAbstractions": "1.1.0-*",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
     "Microsoft.Extensions.DotnetToolDispatcher.Sources": {
       "type": "build",
       "version": "1.1.0-*"
@@ -39,9 +39,9 @@
         "Microsoft.DotNet.ProjectModel.Loader": "1.0.0-*",
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.1.0-*"
+          "version": "1.0.0"
         },
-        "System.Runtime.Serialization.Primitives": "4.3.0-*"
+        "System.Runtime.Serialization.Primitives": "4.1.1"
       }
     },
     "net451": {}