Using the Roslyn compiler in more places

SparkViewEngine · Jan 30, 2024 · 16c4250 · 16c4250
1 parent b0349d7
commit 16c4250
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/src/Castle.MonoRail.Views.Spark.Tests/PrecompileInstallerTests.cs b/src/Castle.MonoRail.Views.Spark.Tests/PrecompileInstallerTests.cs
@@ -50,7 +50,11 @@ public void RunPrecompiler()
             Assert.That(File.Exists(targetFile), "File exists");
 
             var result = Assembly.LoadFrom(targetFile);
-            Assert.AreEqual(3, result.GetTypes().Count());
+
+            var views = result.GetTypes().Where(x => x.BaseType == typeof(SparkView))
+                .ToArray();
+
+            Assert.AreEqual(3, views.Length);
         }
 
         public class ParentInstaller : Installer

diff --git a/src/Castle.MonoRail.Views.Spark/SparkViewFactory.cs b/src/Castle.MonoRail.Views.Spark/SparkViewFactory.cs
@@ -68,7 +68,7 @@ public ISparkViewEngine Engine
 
                     var viewFolder = new ViewSourceLoaderWrapper(this);
 
-                    var batchCompiler = new CodeDomBatchCompiler();
+                    var batchCompiler = new RoslynBatchCompiler();
 
                     this._engine =
                         new SparkViewEngine(

diff --git a/src/Spark.Python/Compiler/PythonViewCompiler.cs b/src/Spark.Python/Compiler/PythonViewCompiler.cs
@@ -29,7 +29,7 @@ public override void CompileView(IEnumerable<IList<Chunk>> viewTemplates, IEnume
         {
             GenerateSourceCode(viewTemplates, allResources);
 
-            var compiler = new CodeDomBatchCompiler();
+            var compiler = new RoslynBatchCompiler();
             var assembly = compiler.Compile(Debug, "csharp", null, new[] { SourceCode });
             CompiledType = assembly.GetType(ViewClassFullName);
         }

diff --git a/src/Spark.Ruby/Compiler/RubyViewCompiler.cs b/src/Spark.Ruby/Compiler/RubyViewCompiler.cs
@@ -30,7 +30,7 @@ public override void CompileView(IEnumerable<IList<Chunk>> viewTemplates, IEnume
         {
             GenerateSourceCode(viewTemplates, allResources);
 
-            var compiler = new CodeDomBatchCompiler();
+            var compiler = new RoslynBatchCompiler();
             var assembly = compiler.Compile(Debug, "csharp", null, new[] { SourceCode });
             CompiledType = assembly.GetType(ViewClassFullName);
         }

diff --git a/src/Spark.Web.Tests/Compiler/CSharpViewCompilerTester.cs b/src/Spark.Web.Tests/Compiler/CSharpViewCompilerTester.cs
@@ -167,7 +167,7 @@ public void ProvideFullException()
                         {
                             new SendExpressionChunk { Code = "NoSuchVariable" }
                         }),
-                Throws.TypeOf<CompilerException>());
+                Throws.TypeOf<RoslynCompilerException>());
         }
 
         [Test]

diff --git a/src/Spark/CompiledViewHolder.cs b/src/Spark/CompiledViewHolder.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using Spark;
 
 namespace Spark
 {

diff --git a/src/Spark/Compiler/BatchCompiler.cs b/src/Spark/Compiler/BatchCompiler.cs
@@ -15,7 +15,7 @@ namespace Spark.Compiler;
 
 #if NETFRAMEWORK
 
-[Obsolete("To be replaced with RoslynBatchCompiler (code dom cannot target .net 'core'")]
+[Obsolete("To be replaced with RoslynBatchCompiler (code dom cannot target .net 'core')")]
 public class CodeDomBatchCompiler : IBatchCompiler
 {
     /// <summary>