Fix for setting a custom namespace

Yazwh0 · Yazwh0 · commit 3292b183dfb5 · 2021-10-30T12:20:52.000+01:00
If the namespace is changed in the options, the Load fails as its hardcoded to 'TemplateNamespace'.

This passes the namespace through. I've used overrides so it can be called externally.
diff --git a/RazorEngineCore.Tests/TestTemplateNamespace.cs b/RazorEngineCore.Tests/TestTemplateNamespace.cs
@@ -0,0 +1,38 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using RazorEngineCore.Tests.Models;
+
+namespace RazorEngineCore.Tests
+{
+    [TestClass]
+    public class TestTemplateNamespace
+    {
+        [TestMethod]
+        public void TestSettingTemplateNamespace()
+        {
+            RazorEngine razorEngine = new RazorEngine();
+
+            IRazorEngineCompiledTemplate initialTemplate = razorEngine.Compile("@{ var message = \"OK\"; }@message",
+                builder => { builder.Options.TemplateNamespace = "Test.Namespace"; });
+
+            var result = initialTemplate.Run();
+
+            Assert.AreEqual("OK", result);
+        }
+
+        [TestMethod]
+        public void TestSettingTemplateNamespaceT()
+        {
+            RazorEngine razorEngine = new RazorEngine();
+
+            var initialTemplate = razorEngine.Compile<TestTemplate2>("@{ var message = \"OK\"; }@message",
+                builder => { builder.Options.TemplateNamespace = "Test.Namespace"; });
+
+            var result = initialTemplate.Run(a => { });
+
+            Assert.AreEqual("OK", result);
+        }
+    }
+}
diff --git a/RazorEngineCore/RazorEngine.cs b/RazorEngineCore/RazorEngine.cs
@@ -25,7 +25,7 @@ public IRazorEngineCompiledTemplate<T> Compile<T>(string content, Action<IRazorE
 
             MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
            
-            return new RazorEngineCompiledTemplate<T>(memoryStream);
+            return new RazorEngineCompiledTemplate<T>(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);
         }
 
         public Task<IRazorEngineCompiledTemplate<T>> CompileAsync<T>(string content, Action<IRazorEngineCompilationOptionsBuilder> builderAction = null) where T : IRazorEngineTemplate
@@ -42,7 +42,7 @@ public IRazorEngineCompiledTemplate Compile(string content, Action<IRazorEngineC
 
             MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);
 
-            return new RazorEngineCompiledTemplate(memoryStream);
+            return new RazorEngineCompiledTemplate(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);
         }
 
         public Task<IRazorEngineCompiledTemplate> CompileAsync(string content, Action<IRazorEngineCompilationOptionsBuilder> builderAction = null)
diff --git a/RazorEngineCore/RazorEngineCompiledTemplate.cs b/RazorEngineCore/RazorEngineCompiledTemplate.cs
@@ -6,24 +6,24 @@
 namespace RazorEngineCore
 {
     public class RazorEngineCompiledTemplate : IRazorEngineCompiledTemplate
-    {
+    {        
         private readonly MemoryStream assemblyByteCode;
         private readonly Type templateType;
 
-        internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode)
+        internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode, string templateNamespace)
         {
             this.assemblyByteCode = assemblyByteCode;
 
             Assembly assembly = Assembly.Load(assemblyByteCode.ToArray());
-            this.templateType = assembly.GetType("TemplateNamespace.Template");
+            this.templateType = assembly.GetType($"{templateNamespace}.Template");
         }
 
-        public static IRazorEngineCompiledTemplate LoadFromFile(string fileName)
+        public static IRazorEngineCompiledTemplate LoadFromFile(string fileName, string templateNamespace = "TemplateNamespace")
         {
-            return LoadFromFileAsync(fileName: fileName).GetAwaiter().GetResult();
+            return LoadFromFileAsync(fileName: fileName, templateNamespace: templateNamespace).GetAwaiter().GetResult();
         }
 
-        public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string fileName)
+        public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string fileName, string templateNamespace = "TemplateNamespace")
         {
             MemoryStream memoryStream = new MemoryStream();
             
@@ -38,21 +38,21 @@ public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string
                 await fileStream.CopyToAsync(memoryStream);
             }
             
-            return new RazorEngineCompiledTemplate(memoryStream);
+            return new RazorEngineCompiledTemplate(memoryStream, templateNamespace);
         }
         
         public static IRazorEngineCompiledTemplate LoadFromStream(Stream stream)
         {
             return LoadFromStreamAsync(stream).GetAwaiter().GetResult();
         }
         
-        public static async Task<IRazorEngineCompiledTemplate> LoadFromStreamAsync(Stream stream)
+        public static async Task<IRazorEngineCompiledTemplate> LoadFromStreamAsync(Stream stream, string templateNamespace = "TemplateNamespace")
         {
             MemoryStream memoryStream = new MemoryStream();
             await stream.CopyToAsync(memoryStream);
             memoryStream.Position = 0;
             
-            return new RazorEngineCompiledTemplate(memoryStream);
+            return new RazorEngineCompiledTemplate(memoryStream, templateNamespace);
         }
 
         public void SaveToStream(Stream stream)
diff --git a/RazorEngineCore/RazorEngineCompiledTemplateT.cs b/RazorEngineCore/RazorEngineCompiledTemplateT.cs
@@ -10,20 +10,20 @@ public class RazorEngineCompiledTemplate<T> : IRazorEngineCompiledTemplate<T> wh
         private readonly MemoryStream assemblyByteCode;
         private readonly Type templateType;
 
-        internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode)
+        internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode, string templateNamespace)
         {
             this.assemblyByteCode = assemblyByteCode;
 
             Assembly assembly = Assembly.Load(assemblyByteCode.ToArray());
-            this.templateType = assembly.GetType("TemplateNamespace.Template");
+            this.templateType = assembly.GetType($"{templateNamespace}.Template");
         }
 
-        public static IRazorEngineCompiledTemplate<T> LoadFromFile(string fileName)
+        public static IRazorEngineCompiledTemplate<T> LoadFromFile(string fileName, string templateNamespace = "TemplateNamespace")
         {
-            return LoadFromFileAsync(fileName: fileName).GetAwaiter().GetResult();
+            return LoadFromFileAsync(fileName: fileName, templateNamespace: templateNamespace).GetAwaiter().GetResult();
         }
         
-        public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(string fileName)
+        public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(string fileName, string templateNamespace = "TemplateNamespace")
         {
             MemoryStream memoryStream = new MemoryStream();
             
@@ -38,21 +38,21 @@ public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(stri
                 await fileStream.CopyToAsync(memoryStream);
             }
             
-            return new RazorEngineCompiledTemplate<T>(memoryStream);
+            return new RazorEngineCompiledTemplate<T>(memoryStream, templateNamespace);
         }
 
         public static IRazorEngineCompiledTemplate<T> LoadFromStream(Stream stream)
         {
             return LoadFromStreamAsync(stream).GetAwaiter().GetResult();
         }
         
-        public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Stream stream)
+        public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Stream stream, string templateNamespace = "TemplateNamespace")
         {
             MemoryStream memoryStream = new MemoryStream();
             await stream.CopyToAsync(memoryStream);
             memoryStream.Position = 0;
             
-            return new RazorEngineCompiledTemplate<T>(memoryStream);
+            return new RazorEngineCompiledTemplate<T>(memoryStream, templateNamespace);
         }
 
         public void SaveToStream(Stream stream)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public IRazorEngineCompiledTemplate<T> Compile<T>(string content, Action<IRazorE`
`25`	`25`
`26`	`26`	`MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);`
`27`	`27`
`28`		`- return new RazorEngineCompiledTemplate<T>(memoryStream);`
	`28`	`+ return new RazorEngineCompiledTemplate<T>(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public Task<IRazorEngineCompiledTemplate<T>> CompileAsync<T>(string content, Action<IRazorEngineCompilationOptionsBuilder> builderAction = null) where T : IRazorEngineTemplate`
`@@ -42,7 +42,7 @@ public IRazorEngineCompiledTemplate Compile(string content, Action<IRazorEngineC`
`42`	`42`
`43`	`43`	`MemoryStream memoryStream = this.CreateAndCompileToStream(content, compilationOptionsBuilder.Options);`
`44`	`44`
`45`		`- return new RazorEngineCompiledTemplate(memoryStream);`
	`45`	`+ return new RazorEngineCompiledTemplate(memoryStream, compilationOptionsBuilder.Options.TemplateNamespace);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public Task<IRazorEngineCompiledTemplate> CompileAsync(string content, Action<IRazorEngineCompilationOptionsBuilder> builderAction = null)`
Original file line number	Diff line number	Diff line change
`@@ -6,24 +6,24 @@`
`6`	`6`	`namespace RazorEngineCore`
`7`	`7`	`{`
`8`	`8`	`public class RazorEngineCompiledTemplate : IRazorEngineCompiledTemplate`
`9`		`- {`
	`9`	`+ {`
`10`	`10`	`private readonly MemoryStream assemblyByteCode;`
`11`	`11`	`private readonly Type templateType;`
`12`	`12`
`13`		`- internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode)`
	`13`	`+ internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode, string templateNamespace)`
`14`	`14`	`{`
`15`	`15`	`this.assemblyByteCode = assemblyByteCode;`
`16`	`16`
`17`	`17`	`Assembly assembly = Assembly.Load(assemblyByteCode.ToArray());`
`18`		`- this.templateType = assembly.GetType("TemplateNamespace.Template");`
	`18`	`+ this.templateType = assembly.GetType($"{templateNamespace}.Template");`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static IRazorEngineCompiledTemplate LoadFromFile(string fileName)`
	`21`	`+ public static IRazorEngineCompiledTemplate LoadFromFile(string fileName, string templateNamespace = "TemplateNamespace")`
`22`	`22`	`{`
`23`		`- return LoadFromFileAsync(fileName: fileName).GetAwaiter().GetResult();`
	`23`	`+ return LoadFromFileAsync(fileName: fileName, templateNamespace: templateNamespace).GetAwaiter().GetResult();`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string fileName)`
	`26`	`+ public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string fileName, string templateNamespace = "TemplateNamespace")`
`27`	`27`	`{`
`28`	`28`	`MemoryStream memoryStream = new MemoryStream();`
`29`	`29`
`@@ -38,21 +38,21 @@ public static async Task<IRazorEngineCompiledTemplate> LoadFromFileAsync(string`
`38`	`38`	`await fileStream.CopyToAsync(memoryStream);`
`39`	`39`	`}`
`40`	`40`
`41`		`- return new RazorEngineCompiledTemplate(memoryStream);`
	`41`	`+ return new RazorEngineCompiledTemplate(memoryStream, templateNamespace);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static IRazorEngineCompiledTemplate LoadFromStream(Stream stream)`
`45`	`45`	`{`
`46`	`46`	`return LoadFromStreamAsync(stream).GetAwaiter().GetResult();`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static async Task<IRazorEngineCompiledTemplate> LoadFromStreamAsync(Stream stream)`
	`49`	`+ public static async Task<IRazorEngineCompiledTemplate> LoadFromStreamAsync(Stream stream, string templateNamespace = "TemplateNamespace")`
`50`	`50`	`{`
`51`	`51`	`MemoryStream memoryStream = new MemoryStream();`
`52`	`52`	`await stream.CopyToAsync(memoryStream);`
`53`	`53`	`memoryStream.Position = 0;`
`54`	`54`
`55`		`- return new RazorEngineCompiledTemplate(memoryStream);`
	`55`	`+ return new RazorEngineCompiledTemplate(memoryStream, templateNamespace);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public void SaveToStream(Stream stream)`
Original file line number	Diff line number	Diff line change
`@@ -10,20 +10,20 @@ public class RazorEngineCompiledTemplate<T> : IRazorEngineCompiledTemplate<T> wh`
`10`	`10`	`private readonly MemoryStream assemblyByteCode;`
`11`	`11`	`private readonly Type templateType;`
`12`	`12`
`13`		`- internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode)`
	`13`	`+ internal RazorEngineCompiledTemplate(MemoryStream assemblyByteCode, string templateNamespace)`
`14`	`14`	`{`
`15`	`15`	`this.assemblyByteCode = assemblyByteCode;`
`16`	`16`
`17`	`17`	`Assembly assembly = Assembly.Load(assemblyByteCode.ToArray());`
`18`		`- this.templateType = assembly.GetType("TemplateNamespace.Template");`
	`18`	`+ this.templateType = assembly.GetType($"{templateNamespace}.Template");`
`19`	`19`	`}`
`20`	`20`
`21`		`- public static IRazorEngineCompiledTemplate<T> LoadFromFile(string fileName)`
	`21`	`+ public static IRazorEngineCompiledTemplate<T> LoadFromFile(string fileName, string templateNamespace = "TemplateNamespace")`
`22`	`22`	`{`
`23`		`- return LoadFromFileAsync(fileName: fileName).GetAwaiter().GetResult();`
	`23`	`+ return LoadFromFileAsync(fileName: fileName, templateNamespace: templateNamespace).GetAwaiter().GetResult();`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(string fileName)`
	`26`	`+ public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(string fileName, string templateNamespace = "TemplateNamespace")`
`27`	`27`	`{`
`28`	`28`	`MemoryStream memoryStream = new MemoryStream();`
`29`	`29`
`@@ -38,21 +38,21 @@ public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromFileAsync(stri`
`38`	`38`	`await fileStream.CopyToAsync(memoryStream);`
`39`	`39`	`}`
`40`	`40`
`41`		`- return new RazorEngineCompiledTemplate<T>(memoryStream);`
	`41`	`+ return new RazorEngineCompiledTemplate<T>(memoryStream, templateNamespace);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static IRazorEngineCompiledTemplate<T> LoadFromStream(Stream stream)`
`45`	`45`	`{`
`46`	`46`	`return LoadFromStreamAsync(stream).GetAwaiter().GetResult();`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Stream stream)`
	`49`	`+ public static async Task<IRazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Stream stream, string templateNamespace = "TemplateNamespace")`
`50`	`50`	`{`
`51`	`51`	`MemoryStream memoryStream = new MemoryStream();`
`52`	`52`	`await stream.CopyToAsync(memoryStream);`
`53`	`53`	`memoryStream.Position = 0;`
`54`	`54`
`55`		`- return new RazorEngineCompiledTemplate<T>(memoryStream);`
	`55`	`+ return new RazorEngineCompiledTemplate<T>(memoryStream, templateNamespace);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public void SaveToStream(Stream stream)`