Merge branch 'master' of https://github.com/adoconnection/RazorEngineCore

Author: adoconnection

README.md

@@ -1,5 +1,5 @@
 # RazorEngineCore
-NETCore 3.1.4 Razor Template Engine. No legacy code.
+NETCore 3.1.5 Razor Template Engine. No legacy code.
 * .NET Standard 2.0
 
 [![NuGet](https://img.shields.io/nuget/dt/RazorEngineCore.svg?style=flat-square)](https://www.nuget.org/packages/RazorEngineCore)
@@ -24,6 +24,7 @@ Install-Package RazorEngineCore
 * [@Raw](https://github.com/adoconnection/RazorEngineCore/wiki/@Raw)
 * [@Inject and referencing other assemblies](https://github.com/adoconnection/RazorEngineCore/wiki/@Inject-and-referencing-other-assemblies)
 * [Switch from RazorEngine cshtml templates](https://github.com/adoconnection/RazorEngineCore/wiki/Switch-from-RazorEngine-cshtml-templates)
+* [Azure Functions FileNotFoundException workaround](https://github.com/adoconnection/RazorEngineCore/wiki/Azure-Functions-FileNotFoundException-workaround)
 
 ## Extensions
 * [wdcossey/RazorEngineCore.Extensions](https://github.com/wdcossey/RazorEngineCore.Extensions)
@@ -32,8 +33,8 @@ Install-Package RazorEngineCore
 
 #### Basic usage
 ```cs
-RazorEngine razorEngine = new RazorEngine();
-RazorEngineCompiledTemplate template = razorEngine.Compile("Hello @Model.Name");
+IRazorEngine razorEngine = new RazorEngine();
+IRazorEngineCompiledTemplate template = razorEngine.Compile("Hello @Model.Name");
 
 string result = template.Run(new
 {
@@ -45,10 +46,11 @@ Console.WriteLine(result);
 
 #### Strongly typed model
 ```cs
+IRazorEngine razorEngine = new RazorEngine();
 string templateText = "Hello @Model.Name";
 
 // yeah, heavy definition
-RazorEngineCompiledTemplate<RazorEngineTemplateBase<TestModel>> template = razorEngine.Compile<RazorEngineTemplateBase<TestModel>>(templateText);
+IRazorEngineCompiledTemplate<RazorEngineTemplateBase<TestModel>> template = razorEngine.Compile<RazorEngineTemplateBase<TestModel>>(templateText);
 
 string result = template.Run(instance =>
 {
@@ -65,8 +67,8 @@ Console.WriteLine(result);
 #### Save / Load compiled templates
 Most expensive task is to compile template, you should not compile template every time you need to run it
 ```cs
-RazorEngine razorEngine = new RazorEngine();
-RazorEngineCompiledTemplate template = razorEngine.Compile("Hello @Model.Name");
+IRazorEngine razorEngine = new RazorEngine();
+IRazorEngineCompiledTemplate template = razorEngine.Compile("Hello @Model.Name");
 
 // save to file
 template.SaveToFile("myTemplate.dll");
@@ -77,13 +79,13 @@ template.SaveToStream(memoryStream);
 ```
 
 ```cs
-RazorEngineCompiledTemplate template1 = RazorEngineCompiledTemplate.LoadFromFile("myTemplate.dll");
-RazorEngineCompiledTemplate template2 = RazorEngineCompiledTemplate.LoadFromStream(myStream);
+IRazorEngineCompiledTemplate template1 = RazorEngineCompiledTemplate.LoadFromFile("myTemplate.dll");
+IRazorEngineCompiledTemplate template2 = RazorEngineCompiledTemplate.LoadFromStream(myStream);
 ```
 
 ```cs
-RazorEngineCompiledTemplate<MyBase> template1 = RazorEngineCompiledTemplate<MyBase>.LoadFromFile<MyBase>("myTemplate.dll");
-RazorEngineCompiledTemplate<MyBase> template2 = RazorEngineCompiledTemplate<MyBase>.LoadFromStream<MyBase>(myStream);
+IRazorEngineCompiledTemplate<MyBase> template1 = RazorEngineCompiledTemplate<MyBase>.LoadFromFile<MyBase>("myTemplate.dll");
+IRazorEngineCompiledTemplate<MyBase> template2 = RazorEngineCompiledTemplate<MyBase>.LoadFromStream<MyBase>(myStream);
 ```
 
 #### Caching
@@ -92,15 +94,15 @@ RazorEngineCore is not responsible for caching. Each team and project has their
 If you dont have one, use following static ConcurrentDictionary example as a simplest thread safe solution.
 
 ```cs
-private static ConcurrentDictionary<string, RazorEngineCompiledTemplate> TemplateCache = new ConcurrentDictionary<string, RazorEngineCompiledTemplate>();
+private static ConcurrentDictionary<int, IRazorEngineCompiledTemplate> TemplateCache = new ConcurrentDictionary<int, IRazorEngineCompiledTemplate>();
 ```
 
 ```cs
 private string RenderTemplate(string template, object model)
 {
     int hashCode = template.GetHashCode();
 
-    RazorEngineCompiledTemplate compiledTemplate = TemplateCache.GetOrAdd(hashCode, i =>
+    IRazorEngineCompiledTemplate compiledTemplate = TemplateCache.GetOrAdd(hashCode, i =>
     {
         RazorEngine razorEngine = new RazorEngine();
         return razorEngine.Compile(Content);
@@ -141,8 +143,8 @@ output:
 ```cs
 string content = @"Hello @A, @B, @Decorator(123)";
 
-RazorEngine razorEngine = new RazorEngine();
-RazorEngineCompiledTemplate<CustomModel> template = razorEngine.Compile<CustomModel>(content);
+IRazorEngine razorEngine = new RazorEngine();
+IRazorEngineCompiledTemplate<CustomModel> template = razorEngine.Compile<CustomModel>(content);
 
 string result = template.Run(instance =>
 {
@@ -170,8 +172,8 @@ Keep your templates as simple as possible, if you need to inject "unusual" assem
 Writing `@using System.IO` in template will not reference System.IO assembly, use builder to manually reference it.
 
 ```cs
-RazorEngine razorEngine = new RazorEngine();
-RazorEngineCompiledTemplate compiledTemplate = razorEngine.Compile(templateText, builder =>
+IRazorEngine razorEngine = new RazorEngine();
+IRazorEngineCompiledTemplate compiledTemplate = razorEngine.Compile(templateText, builder =>
 {
     builder.AddAssemblyReferenceByName("System.Security"); // by name
     builder.AddAssemblyReference(typeof(System.IO.File)); // by type

RazorEngineCore/RazorEngineCompilationOptions.cs

@@ -1,24 +1,41 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Microsoft.CodeAnalysis;
 
 namespace RazorEngineCore
 {
     public class RazorEngineCompilationOptions
     {
-        public HashSet<Assembly> ReferencedAssemblies { get; set; } = new HashSet<Assembly>()
-        {
-            typeof(object).Assembly,
-            Assembly.Load(new AssemblyName("Microsoft.CSharp")),
-            typeof(RazorEngineTemplateBase).Assembly,
-            Assembly.Load(new AssemblyName("netstandard")),
-            Assembly.Load(new AssemblyName("System.Runtime")),
-            Assembly.Load(new AssemblyName("System.Linq")),
-            Assembly.Load(new AssemblyName("System.Linq.Expressions"))
-        };
+        private HashSet<Assembly> _referencedAssemblies;
+        public HashSet<Assembly> ReferencedAssemblies {
+            get
+            {
+                if (this._referencedAssemblies != null)
+                    return this._referencedAssemblies;
+
+                this._referencedAssemblies = new HashSet<Assembly>()
+                {
+                    typeof(object).Assembly,
+                    Assembly.Load(new AssemblyName("Microsoft.CSharp")),
+                    typeof(RazorEngineTemplateBase).Assembly,
+                    Assembly.Load(new AssemblyName("System.Runtime")),
+                    Assembly.Load(new AssemblyName("System.Linq")),
+                    Assembly.Load(new AssemblyName("System.Linq.Expressions"))
+                };
+
+                // Loading netstandard explicitly causes runtime error on Linux/OSX
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    this._referencedAssemblies.Add(Assembly.Load(new AssemblyName("netstandard")));
+                }
+
+                return this._referencedAssemblies;
+            }
+        } 
 
         public HashSet<MetadataReference> MetadataReferences { get; set; } = new HashSet<MetadataReference>();
-        
+
         public string TemplateNamespace { get; set; } = "TemplateNamespace";
         public string Inherits { get; set; } = "RazorEngineCore.RazorEngineTemplateBase";