CreateAndCompileToStream now returns a

CompiledStreams object

Author: shehrozeee

RazorEngineCore/RazorEngine.cs

@@ -22,9 +22,8 @@ public IRazorEngineCompiledTemplate<T> Compile<T>(string content, Action<IRazorE
 
             builderAction?.Invoke(compilationOptionsBuilder);
 
-            MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
-
-            return new RazorEngineCompiledTemplate<T>(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);
+            CompiledStreams streams = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
+            return new RazorEngineCompiledTemplate<T>(streams.assembly, compilationOptionsBuilder.Options.TemplateNamespace);
         }
 
         public Task<IRazorEngineCompiledTemplate<T>> CompileAsync<T>(string content, Action<IRazorEngineCompilationOptionsBuilder> builderAction = null) where T : IRazorEngineTemplate
@@ -43,14 +42,13 @@ public IRazorEngineCompiledTemplate Compile(string content, Action<IRazorEngineC
             builderAction?.Invoke(compilationOptionsBuilder);
             if (compilationOptionsBuilder.Options.GeneratePdbSteram)
             {
-                MemoryStream pdbStream = new MemoryStream();
-                MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options, pdbStream);
-                return new RazorEngineCompiledTemplate(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace, pdbStream);
+                CompiledStreams streams = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
+                return new RazorEngineCompiledTemplate(streams.assembly, compilationOptionsBuilder.Options.TemplateNamespace, streams.pdb);
             }
             else
             {
-                MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
-                return new RazorEngineCompiledTemplate(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);
+                CompiledStreams streams = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
+                return new RazorEngineCompiledTemplate(streams.assembly, compilationOptionsBuilder.Options.TemplateNamespace);
             }
 
         }
@@ -60,12 +58,12 @@ public Task<IRazorEngineCompiledTemplate> CompileAsync(string content, Action<IR
             return Task.Factory.StartNew(() => this.Compile(content: content, builderAction: builderAction));
         }
 
-        protected virtual MemoryStream CreateAndCompileToStream(string templateSource, RazorEngineCompilationOptions options, MemoryStream pdbStream = null)
+        protected virtual CompiledStreams CreateAndCompileToStream(string templateSource, RazorEngineCompilationOptions options, MemoryStream pdbStream = null)
         {
             templateSource = this.WriteDirectives(templateSource, options);
             string projectPath = @".";
             string fileName = Path.GetRandomFileName()+".cshtml";
-            if (pdbStream != null)
+            if (options.GeneratePdbSteram)
             {
                 projectPath = Path.GetTempPath();
                 Directory.CreateDirectory(projectPath);
@@ -119,13 +117,12 @@ protected virtual MemoryStream CreateAndCompileToStream(string templateSource, R
                     .Concat(options.MetadataReferences)
                     .ToList(),
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-            MemoryStream memoryStream = new MemoryStream();
+            CompiledStreams streams = new CompiledStreams();
             EmitResult emitResult;
-            if (pdbStream != null)
-                emitResult = compilation.Emit(memoryStream, pdbStream);
+            if (options.GeneratePdbSteram)
+                emitResult = compilation.Emit(streams.assembly, streams.pdb);
             else
-                emitResult = compilation.Emit(memoryStream);
+                emitResult = compilation.Emit(streams.assembly);
 
             if (!emitResult.Success)
             {
@@ -138,10 +135,10 @@ protected virtual MemoryStream CreateAndCompileToStream(string templateSource, R
                 throw exception;
             }
 
-            memoryStream.Position = 0;
-            if (pdbStream != null) 
-                pdbStream.Position = 0;
-            return memoryStream;
+            streams.assembly.Position = 0;
+            if(options.GeneratePdbSteram)
+                streams.pdb.Position = 0;
+            return streams;
         }
 
         protected virtual string WriteDirectives(string content, RazorEngineCompilationOptions options)
@@ -158,5 +155,16 @@ protected virtual string WriteDirectives(string content, RazorEngineCompilationO
 
             return stringBuilder.ToString();
         }
+
+        private class CompiledStreams
+        {
+            public CompiledStreams()
+            {
+                assembly = new MemoryStream();
+                pdb = new MemoryStream();
+            }
+            public MemoryStream assembly {get;set;}
+            public MemoryStream pdb {get;set;}
+        }
     }
 }