Merge branch 'master' into microsoft-di-and-roslyn-compiler

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: |
+       cd src
+       dotnet restore spark-ci.slnf
+    - name: Build
+      run: |
+        cd src
+        dotnet build --no-restore spark-ci.slnf
+    - name: Test
+      run: |
+        cd src
+        dotnet test --no-build --verbosity normal spark-ci.slnf

README.md

@@ -29,6 +29,8 @@ else
 
 It's as easy as `PM> Install-Package Spark` from [nuget](http://nuget.org/packages/Spark) for the core
 
+![Continuous Integration Status](https://github.com/SparkViewEngine/spark/actions/workflows/ci.yml/badge.svg)
+
 ### Need Help
 
  * [Google Group](https://groups.google.com/forum/?fromgroups=#!forum/spark-dev)

src/Spark.Web.Tests/Compiler/CSharpViewCompilerTester.cs

@@ -169,7 +169,7 @@ public void ProvideFullException()
                         {
                             new SendExpressionChunk { Code = "NoSuchVariable" }
                         }),
-                Throws.TypeOf<CodeDomCompilerException>().Or.TypeOf<RoslynCompilerException>());
+                Throws.TypeOf<CompilerException>());
         }
 
         [Test]

src/Spark.sln

@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle MonoRail", "Castle M
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B23DD51D-925A-4488-ABE8-F2A9D69E5976}"
 	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
 		Directory.Build.props = Directory.Build.props
 		Settings.StyleCop = Settings.StyleCop
 		..\spark.build = ..\spark.build

src/Spark/Compiler/VisualBasic/VisualBasicViewCompiler.cs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // 
-
 using System;
 using System.Collections.Generic;
 using System.IO;

src/spark-ci.slnf

@@ -0,0 +1,27 @@
+{
+  "solution": {
+    "path": "Spark.sln",
+    "projects": [
+      "Castle.MonoRail.Views.Spark.Tests\\Castle.MonoRail.Views.Spark.Tests.csproj",
+      "Castle.MonoRail.Views.Spark\\Castle.MonoRail.Views.Spark.csproj",
+      "Castle.Monorail.Pdf.Tests\\Castle.MonoRail.Pdf.Tests.csproj",
+      "Castle.Monorail.Pdf\\Castle.MonoRail.Pdf.csproj",
+      "Spark.Python.Tests\\Spark.Python.Tests.csproj",
+      "Spark.Python\\Spark.Python.csproj",
+      "Spark.Ruby.Tests\\Spark.Ruby.Tests.csproj",
+      "Spark.Ruby\\Spark.Ruby.csproj",
+      "Spark.Tests\\Spark.Tests.csproj",
+      "Spark.Web.Mvc.Pdf.Tests\\Spark.Web.Mvc.Pdf.Tests.csproj",
+      "Spark.Web.Mvc.Pdf\\Spark.Web.Mvc.Pdf.csproj",
+      "Spark.Web.Mvc.Python\\Spark.Web.Mvc.Python.csproj",
+      "Spark.Web.Mvc.Ruby.Tests\\Spark.Web.Mvc.Ruby.Tests.csproj",
+      "Spark.Web.Mvc.Ruby\\Spark.Web.Mvc.Ruby.csproj",
+      "Spark.Web.Mvc.Tests\\Spark.Web.Mvc.Tests.csproj",
+      "Spark.Web.Mvc\\Spark.Web.Mvc.csproj",
+      "Spark.Web.Tests\\Spark.Web.Tests.csproj",
+      "Spark.Web\\Spark.Web.csproj",
+      "Spark\\Spark.csproj",
+      "Xpark\\Xpark.csproj"
+    ]
+  }
+}