Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions Apollo.Compilation.Worker/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Buffers.Text;
using System.Buffers.Text;
using System.Collections.Concurrent;
using System.Reflection;
using System.Runtime.Loader;
Expand Down Expand Up @@ -64,9 +64,41 @@ await resolver.GetMetadataReferenceAsync("System.Console.wasm"),
await resolver.GetMetadataReferenceAsync("xunit.assert.wasm"),
await resolver.GetMetadataReferenceAsync("xunit.core.wasm")
};


var isRazorProject = solution.Type == ProjectType.RazorClassLibrary ||
solution.Items.Any(i => i.Path.EndsWith(".razor", StringComparison.OrdinalIgnoreCase));

if (isRazorProject)
{
try
{
references.Add(await resolver.GetMetadataReferenceAsync("System.Threading.Tasks.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("System.Collections.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("System.Linq.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("System.ObjectModel.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("System.ComponentModel.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("System.ComponentModel.Primitives.wasm"));
LogMessageWriter.Log("Added system references for Razor project", LogSeverity.Debug);
}
catch (Exception ex)
{
LogMessageWriter.Log($"Warning: Could not load system references: {ex.Message}", LogSeverity.Warning);
}

try
{
references.Add(await resolver.GetMetadataReferenceAsync("Microsoft.AspNetCore.Components.wasm"));
references.Add(await resolver.GetMetadataReferenceAsync("Microsoft.AspNetCore.Components.Web.wasm"));
LogMessageWriter.Log("Added Blazor component references for Razor project", LogSeverity.Debug);
}
catch (Exception ex)
{
LogMessageWriter.Log($"Warning: Could not load Blazor references: {ex.Message}", LogSeverity.Warning);
}
}

nugetAssemblyCache = solution.NuGetReferences ?? [];

foreach (var nugetRef in nugetAssemblyCache)
{
if (nugetRef.AssemblyData?.Length > 0)
Expand All @@ -76,8 +108,10 @@ await resolver.GetMetadataReferenceAsync("xunit.core.wasm")
LogMessageWriter.Log($"Added NuGet reference: {nugetRef.AssemblyName}", LogSeverity.Debug);
}
}

var result = new CompilationService().Compile(solution, references);

var result = isRazorProject
? new RazorCompilationService().Compile(solution, references)
: new CompilationService().Compile(solution, references);

asmCache = result.Assembly;

Expand Down
4 changes: 3 additions & 1 deletion Apollo.Compilation/Apollo.Compilation.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
Expand All @@ -13,6 +13,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
<PackageReference Include="Microsoft.CodeAnalysis.Razor" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="System.Console" />
Expand Down
Loading
Loading