yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V11: InMemory - only add models assembly as runtime view reference if it exists (#13390)

Browse Source 
* Only add models assembly as runtime view reference if it exists

* Add in memory metadata reference properly

compilations are readonly
This commit is contained in:
Mole
2022-11-14 11:37:55 +01:00
committed by Nikolaj
parent e321982f44
commit 233c9df1d6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/CollectibleRuntimeViewCompiler.cs
View File

@@ -396,26 +396,30 @@ internal class CollectibleRuntimeViewCompiler : IViewCompiler
private CSharpCompilation CreateCompilation(string compilationContent, string assemblyName)
{
IReadOnlyList<MetadataReference> refs = _referenceManager.CompilationReferences;
// We'll add the reference to the InMemory assembly directly, this means we don't have to hack around with assembly parts.
if (_loadContextManager.ModelsAssemblyLocation is null)
{
throw new InvalidOperationException("No InMemory assembly available, cannot compile views");
}
PortableExecutableReference inMemoryAutoReference = MetadataReference.CreateFromFile(_loadContextManager.ModelsAssemblyLocation);
var sourceText = SourceText.From(compilationContent, Encoding.UTF8);
SyntaxTree syntaxTree = SyntaxFactory
.ParseSyntaxTree(sourceText, _compilationOptionsProvider.ParseOptions)
.WithFilePath(assemblyName);
return CSharpCompilation
CSharpCompilation compilation = CSharpCompilation
.Create(assemblyName)
.AddSyntaxTrees(syntaxTree)
.AddReferences(refs)
.AddReferences(inMemoryAutoReference)
.WithOptions(_compilationOptionsProvider.CSharpCompilationOptions);
// We'll add the reference to the InMemory assembly directly, this means we don't have to hack around with assembly parts.
// We might be asked to compile views before the InMemory models assembly is created tho (if you replace the no-nodes for instance)
// In this case we'll just skip the InMemory models assembly reference
if (_loadContextManager.ModelsAssemblyLocation is null)
{
_logger.LogInformation("No InMemory models assembly available, skipping reference");
return compilation;
}
PortableExecutableReference inMemoryAutoReference = MetadataReference.CreateFromFile(_loadContextManager.ModelsAssemblyLocation);
compilation = compilation.AddReferences(inMemoryAutoReference);
return compilation;
}
private string GetNormalizedPath(string relativePath)