Unit test fix - TestCompileAndRun_MetadataReference

GeneratedCode in RazorEngineCompilationException
Version and authors

Author: adoconnection

Pack.ps1

@@ -1,4 +1,4 @@
 dotnet build -c Release
 dotnet test
 dotnet pack -c Release -o artifacts RazorEngineCore\RazorEngineCore.csproj
-dotnet nuget push artifacts\RazorEngineCore.2020.5.2.nupkg --source https://www.nuget.org/api/v2/package -k KEY
+dotnet nuget push artifacts\RazorEngineCore.2020.6.1.nupkg --source https://www.nuget.org/api/v2/package -k KEY

RazorEngineCore.Tests/TestCompileAndRun.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -477,37 +478,48 @@ public static string GetGreeting(string name)
     }
 }
 ";
-            
+            // This needs to be done in the builder to have access to all of the assemblies added through
+            // the various AddAssemblyReference options
+            CSharpCompilation compilation = CSharpCompilation.Create(
+                    "TestAssembly",
+                    new[]
+                    {
+                            CSharpSyntaxTree.ParseText(greetingClass)
+                    },
+                    new List<MetadataReference>()
+                    {
+                            MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
+                            MetadataReference.CreateFromFile(Assembly.Load(new AssemblyName("Microsoft.CSharp")).Location),
+                            MetadataReference.CreateFromFile(Assembly.Load(new AssemblyName("netstandard")).Location),
+                            MetadataReference.CreateFromFile(Assembly.Load(new AssemblyName("System.Runtime")).Location)
+                    },
+                    new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+            );
+
+            MemoryStream memoryStream = new MemoryStream();
+            EmitResult emitResult = compilation.Emit(memoryStream);
+
+            if (!emitResult.Success)
+            {
+                Assert.Fail("Unable to compile test assembly");
+            }
+
+            memoryStream.Position = 0;
+
+            // Add an assembly resolver so the assembly can be found
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, eventArgs) =>
+                    new AssemblyName(eventArgs.Name ?? string.Empty).Name == "TestAssembly"
+                            ? Assembly.Load(memoryStream.ToArray())
+                            : null;
+
             RazorEngine razorEngine = new RazorEngine();
             IRazorEngineCompiledTemplate template = await razorEngine.CompileAsync(@"
 @using TestAssembly
 <p>@Greeting.GetGreeting(""Name"")</p>
 ", builder =>
             {
-                // This needs to be done in the builder to have access to all of the assemblies added through
-                // the various AddAssemblyReference options
-                CSharpCompilation compilation = CSharpCompilation.Create(
-                    "TestAssembly",
-                    new []
-                    {
-                        CSharpSyntaxTree.ParseText(greetingClass)
-                    },
-                    builder.Options.ReferencedAssemblies
-                        .Select(ass => MetadataReference.CreateFromFile(ass.Location)).ToList(),
-                    new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
-                );
-                MemoryStream memoryStream = new MemoryStream();
-                EmitResult emitResult = compilation.Emit(memoryStream);
-                if (!emitResult.Success) return;
-                
-                memoryStream.Position = 0;
                 builder.AddMetadataReference(MetadataReference.CreateFromStream(memoryStream));
-                    
-                // Add an assembly resolver so the assembly can be found
-                AppDomain.CurrentDomain.AssemblyResolve += (sender, eventArgs) =>
-                    new AssemblyName(eventArgs.Name ?? string.Empty).Name == "TestAssembly"
-                        ? Assembly.Load(memoryStream.ToArray())
-                        : null;
+
             });
 
             string expected = @"

RazorEngineCore/RazorEngine.cs

@@ -83,7 +83,8 @@ private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngine
                 },
                 options.ReferencedAssemblies
                     .Select(ass => MetadataReference.CreateFromFile(ass.Location))
-                    .Concat(options.MetadataReferences).ToList(),
+                    .Concat(options.MetadataReferences)
+                    .ToList(),
                 new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
             MemoryStream memoryStream = new MemoryStream();
@@ -96,6 +97,7 @@ private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngine
 
                 RazorEngineCompilationException exception = new RazorEngineCompilationException($"Unable to compile template: {errors?.FirstOrDefault()}");
                 exception.Errors = errors;
+                exception.GeneratedCode = razorCSharpDocument.GeneratedCode;
 
                 throw exception;
             }

RazorEngineCore/RazorEngineCompilationException.cs

@@ -24,5 +24,6 @@ public RazorEngineCompilationException(string message, Exception innerException)
         }
 
         public List<Diagnostic> Errors { get; set; }
+        public string GeneratedCode { get; set; }
     }
 }

RazorEngineCore/RazorEngineCore.csproj

@@ -2,15 +2,18 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2020.5.2</Version>
-    <Authors>Alexander Selishchev, Simon Mourier, William David Cossey</Authors>
+    <Version>2020.6.1</Version>
+    <Authors>Alexander Selishchev, Simon Mourier, William David Cossey, Benjamin Smith</Authors>
     <PackageProjectUrl>https://github.com/adoconnection/RazorEngineCore</PackageProjectUrl>
     <Description>ASP.NET Core 3.1 Razor Template Engine</Description>
-    <AssemblyVersion>2020.5.2.0</AssemblyVersion>
-    <FileVersion>2020.5.2.0</FileVersion>
+    <AssemblyVersion>2020.6.1.0</AssemblyVersion>
+    <FileVersion>2020.6.1.0</FileVersion>
+    <PackageReleaseNotes>– Add support for loading assemblies through MetadataReference
+– Microsoft.AspNetCore.Razor.Language update to 3.1.5
+– expose generated code in RazorEngineCompilationException</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.5" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
   </ItemGroup>
 </Project>