From a5912a64cfca32f63f9be645e94d87ae3ead602c Mon Sep 17 00:00:00 2001
From: Manuel Grundner <m.grundner@delegate.at>
Date: Mon, 21 Oct 2019 16:53:43 +0200
Subject: [PATCH] Replace RazorEngine with RazorEngine.NetCore (#351)

* feat: use RazorEngine.NetCore instead of RazorEngine
* fix: use RazorEngine.Core.Pretzel
---
 src/Pretzel.Logic/Pretzel.Logic.csproj        |  5 +-
 .../Templating/Razor/RazorSiteEngine.cs       | 56 ++++++++++---------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/Pretzel.Logic/Pretzel.Logic.csproj b/src/Pretzel.Logic/Pretzel.Logic.csproj
index 6c8648c7c..a54cec8fa 100644
--- a/src/Pretzel.Logic/Pretzel.Logic.csproj
+++ b/src/Pretzel.Logic/Pretzel.Logic.csproj
@@ -37,10 +37,9 @@
     <PackageReference Include="dotless.Core" Version="1.6.7" />
     <PackageReference Include="DotLiquid" Version="2.0.314" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
-    <PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.7" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
     <PackageReference Include="NUglify" Version="1.5.13" />
-    <PackageReference Include="RazorEngine" Version="3.10.0" />
+    <PackageReference Include="RazorEngine.NetCore.Pretzel" Version="2.2.6" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="7.16.0.8981">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/Pretzel.Logic/Templating/Razor/RazorSiteEngine.cs b/src/Pretzel.Logic/Templating/Razor/RazorSiteEngine.cs
index 738f17012..1d0979d78 100644
--- a/src/Pretzel.Logic/Templating/Razor/RazorSiteEngine.cs
+++ b/src/Pretzel.Logic/Templating/Razor/RazorSiteEngine.cs
@@ -10,6 +10,7 @@
 using Pretzel.Logic.Extensibility;
 using System.Collections.Generic;
 using System.Composition;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 
 namespace Pretzel.Logic.Templating.Razor
 {
@@ -27,41 +28,41 @@ public override void Initialize()
         {
         }
 
-	    private class TagComparer : IEqualityComparer<ITag>
-	    {
-		    public bool Equals(ITag x, ITag y)
-		    {
-			    if (x == null || y == null)
-			    {
-				    return false;
-			    }
-
-			    return x.Name == y.Name;
-		    }
-
-		    public int GetHashCode(ITag obj)
-		    {
-			    return obj.Name.GetHashCode();
-		    }
-	    }
-
-	    protected override void PreProcess()
+        private class TagComparer : IEqualityComparer<ITag>
+        {
+            public bool Equals(ITag x, ITag y)
+            {
+                if (x == null || y == null)
+                {
+                    return false;
+                }
+
+                return x.Name == y.Name;
+            }
+
+            public int GetHashCode(ITag obj)
+            {
+                return obj.Name.GetHashCode();
+            }
+        }
+
+        protected override void PreProcess()
         {
             includesPath = Path.Combine(Context.SourceFolder, "_includes");
 
             if (Tags != null)
             {
-	            var toAdd = Tags.Except(_allTags, new TagComparer()).ToList();
-	            _allTags.AddRange(toAdd);
+                var toAdd = Tags.Except(_allTags, new TagComparer()).ToList();
+                _allTags.AddRange(toAdd);
             }
 
             if (TagFactories != null)
             {
-	            var toAdd = TagFactories.Select(factory =>
-	            {
-		            factory.Initialize(Context);
-		            return factory.CreateTag();
-	            }).Except(_allTags, new TagComparer()).ToList();
+                var toAdd = TagFactories.Select(factory =>
+                {
+                    factory.Initialize(Context);
+                    return factory.CreateTag();
+                }).Except(_allTags, new TagComparer()).ToList();
 
                 _allTags.AddRange(toAdd);
             }
@@ -79,7 +80,8 @@ protected override string RenderTemplate(string content, PageContext pageData)
                 TemplateManager = new IncludesResolver(FileSystem, includesPath),
                 BaseTemplateType = typeof(ExtensibleTemplate<>),
                 DisableTempFileLocking = true,
-                CachingProvider = new DefaultCachingProvider(t => { })
+                CachingProvider = new DefaultCachingProvider(t => { }),
+                ConfigureCompilerBuilder = builder => ModelDirective.Register(builder)
             };
             serviceConfiguration.Activator = new ExtensibleActivator(serviceConfiguration.Activator, Filters, _allTags);