Remove RazorCompilationDescriptor and merge with RazorFileInfo

Author: YishaiGalatzer

src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorCompilationDescriptor.cs

@@ -17,10 +17,19 @@ public class RazorFileInfo
         /// </summary>
         public DateTime LastModified { get; set; }
 
+        /// <summary>
+        /// The length of the file in bytes.
+        /// </summary>
         public long Length { get; set; }
 
+        /// <summary>
+        /// Path to to the file relative to the application base.
+        /// </summary>
         public string RelativePath { get; set; }
 
+        /// <summary>
+        /// A hash of the file content.
+        /// </summary>
         public string Hash { get; set; }
     }
 }

src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazoFileInfo.cs renamed to src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfo.cs

@@ -55,7 +55,7 @@ public virtual void CompileViews([NotNull] IBeforeCompileContext context)
             context.CSharpCompilation = context.CSharpCompilation.AddSyntaxTrees(tree);
         }
 
-        protected virtual IReadOnlyList<RazorCompilationDescriptor>
+        protected virtual IReadOnlyList<RazorFileInfo>
             CreateCompilationDescriptors([NotNull] IBeforeCompileContext context)
         {
             var state = new CompilationContext(context);
@@ -95,9 +95,9 @@ private void CompileViews(CompilationContext compilationContext, string currentP
             }
         }
 
-        protected virtual RazorCompilationDescriptor ParseView([NotNull] IFileInfo fileInfo,
-                                                               [NotNull] IBeforeCompileContext context,
-                                                               [NotNull] CSharpParseOptions options)
+        protected virtual RazorFileInfo ParseView([NotNull] IFileInfo fileInfo,
+                                                  [NotNull] IBeforeCompileContext context,
+                                                  [NotNull] CSharpParseOptions options)
         {
             using (var stream = fileInfo.CreateReadStream())
             {
@@ -126,11 +126,12 @@ protected virtual RazorCompilationDescriptor ParseView([NotNull] IFileInfo fileI
 
                         var hash = RazorFileHash.GetHash(fileInfo);
 
-                        return new RazorCompilationDescriptor()
+                        return new RazorFileInfo()
                         {
-                            FullViewTypeName = typeName,
+                            FullTypeName = typeName,
                             RelativePath = relativePath,
-                            RazorFile = fileInfo,
+                            LastModified = fileInfo.LastModified,
+                            Length = fileInfo.Length,
                             Hash = hash,
                         };
                     }
@@ -149,7 +150,7 @@ public CompilationContext(IBeforeCompileContext context)
                 Options = ParseOptions.GetParseOptions(context.CSharpCompilation);
             }
 
-            public List<RazorCompilationDescriptor> CompiledFiles { get; } = new List<RazorCompilationDescriptor>();
+            public List<RazorFileInfo> CompiledFiles { get; } = new List<RazorFileInfo>();
             public IBeforeCompileContext Context { get; private set; }
             public CSharpParseOptions Options { get; private set; }
         }

src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs

@@ -12,13 +12,13 @@ public class ViewDescriptorCollectionGenerator
     {
         private string _fileFormat;
 
-        protected IReadOnlyList<RazorCompilationDescriptor> Descriptors { get; private set; }
+        protected IReadOnlyList<RazorFileInfo> FileInfos { get; private set; }
         protected CSharpParseOptions Options { get; private set; }
 
-        public ViewDescriptorCollectionGenerator([NotNull] IReadOnlyList<RazorCompilationDescriptor> descriptors,
+        public ViewDescriptorCollectionGenerator([NotNull] IReadOnlyList<RazorFileInfo> fileInfos,
                                                  [NotNull] CSharpParseOptions options)
         {
-            Descriptors = descriptors;
+            FileInfos = fileInfos;
             Options = options;
         }
 
@@ -27,9 +27,9 @@ public virtual SyntaxTree GenerateCollection()
             var builder = new StringBuilder();
             builder.Append(Top);
 
-            foreach (var descriptor in Descriptors)
+            foreach (var fileInfo in FileInfos)
             {
-                var perFileEntry = GenerateFile(descriptor);
+                var perFileEntry = GenerateFile(fileInfo);
                 builder.Append(perFileEntry);
             }
 
@@ -45,14 +45,14 @@ public virtual SyntaxTree GenerateCollection()
         }
 
 
-        protected virtual string GenerateFile([NotNull] RazorCompilationDescriptor descriptor)
+        protected virtual string GenerateFile([NotNull] RazorFileInfo fileInfo)
         {
             return string.Format(FileFormat,
-                                 descriptor.RazorFile.LastModified.ToFileTimeUtc(),
-                                 descriptor.RazorFile.Length,
-                                 descriptor.RelativePath,
-                                 descriptor.FullViewTypeName,
-                                 descriptor.Hash);
+                                 fileInfo.LastModified.ToFileTimeUtc(),
+                                 fileInfo.Length,
+                                 fileInfo.RelativePath,
+                                 fileInfo.FullTypeName,
+                                 fileInfo.Hash);
         }
 
         protected virtual string Top