Merge pull request #36 from cake-contrib/feature/gh-33

(GH-33) Make Json.NET available in Razor templates

Author: pascalberger

src/Cake.Issues.Reporting.Generic.Tests/Cake.Issues.Reporting.Generic.Tests.csproj

@@ -52,6 +52,9 @@
     <Reference Include="Cake.Testing, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Cake.Testing.0.28.0\lib\net46\Cake.Testing.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Shouldly, Version=3.0.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
       <HintPath>..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll</HintPath>
     </Reference>

src/Cake.Issues.Reporting.Generic.Tests/GenericIssueReportFixture.cs

@@ -8,19 +8,27 @@
     internal class GenericIssueReportFixture
     {
         public GenericIssueReportFixture(GenericIssueReportTemplate template)
+            : this()
         {
             this.Log = new FakeLog { Verbosity = Verbosity.Normal };
             this.GenericIssueReportFormatSettings =
                 GenericIssueReportFormatSettings.FromEmbeddedTemplate(template);
         }
 
         public GenericIssueReportFixture(string templateContent)
+            : this()
         {
             this.Log = new FakeLog { Verbosity = Verbosity.Normal };
             this.GenericIssueReportFormatSettings =
                 GenericIssueReportFormatSettings.FromContent(templateContent);
         }
 
+        private GenericIssueReportFixture()
+        {
+            // Make sure Json.NET assembly is loaded as it is the case while running from Cake.
+            var temp = typeof(Newtonsoft.Json.JsonSerializer);
+        }
+
         public FakeLog Log { get; set; }
 
         public GenericIssueReportFormatSettings GenericIssueReportFormatSettings { get; set; }

src/Cake.Issues.Reporting.Generic.Tests/packages.config

@@ -5,6 +5,7 @@
   <package id="Cake.Issues.Reporting" version="0.3.0" targetFramework="net461" />
   <package id="Cake.Issues.Testing" version="0.3.0" targetFramework="net461" />
   <package id="Cake.Testing" version="0.28.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="Shouldly" version="3.0.0" targetFramework="net46" />
   <package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net46" developmentDependency="true" />
   <package id="xunit" version="2.3.1" targetFramework="net46" />

src/Cake.Issues.Reporting.Generic/RazorEngineReferenceResolver.cs

@@ -1,5 +1,6 @@
 namespace Cake.Issues.Reporting.Generic
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
@@ -27,14 +28,25 @@ public IEnumerable<CompilerReference> GetReferences(
             yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "System.dll"));
             yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "System.Core.dll"));
             yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "netstandard.dll"));
+            yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "Newtonsoft.Json.dll"));
             yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "Cake.Core.dll"));
             yield return CompilerReference.From(this.FindLoaded(loadedAssemblies, "Cake.Issues.dll"));
             yield return CompilerReference.From(typeof(RazorEngine.Engine).Assembly);
         }
 
         private string FindLoaded(IEnumerable<string> refs, string find)
         {
-            return refs.First(r => r.EndsWith(Path.DirectorySeparatorChar + find));
+            var result = refs.FirstOrDefault(r => r.EndsWith(Path.DirectorySeparatorChar + find));
+
+            if (result == null)
+            {
+                throw new InvalidOperationException(
+                    string.Format(
+                        "Could not find loaded assembly {0}.",
+                        find));
+            }
+
+            return result;
         }
     }
 }