Skip to content

Enable .NET AOT #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trejjam merged 2 commits into from
Nov 18, 2023
Merged

Enable .NET AOT #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85f7480
Set IsAotCompatible
trejjam Nov 18, 2023
87c1b65
Fix ReportRequestConverter
trejjam Nov 18, 2023
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
22 changes: 13 additions & 9 deletions src/ReportingApi/JsonConverters/ReportRequestConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,9 @@ public class ReportRequestConverter : JsonConverter<ReportRequest>

if (readerClone.TokenType is JsonTokenType.String)
{
var bodyType = GetBodyType(readerClone.ValueSpan);

var targetType = typeof(ReportRequest<>).MakeGenericType(bodyType);

return (ReportRequest?) JsonSerializer.Deserialize(
ref reader, targetType, options
return DeserializeConcreteType(
ref reader,
readerClone.ValueSpan
);
}
}
Expand All @@ -66,16 +63,23 @@ public class ReportRequestConverter : JsonConverter<ReportRequest>
throw new JsonException($"Expected '{TypeDiscriminator}' property, nothing found");
}

private Type GetBodyType(ReadOnlySpan<byte> type)
private ReportRequest? DeserializeConcreteType(
ref Utf8JsonReader reader,
ReadOnlySpan<byte> type
)
{
if (type.SequenceEqual("csp-violation"u8))
{
return typeof(CspReport);
return JsonSerializer.Deserialize(
ref reader, ReportingApiJsonSerializerContext.Default.ReportRequestCspReport
);
}

if (type.SequenceEqual("network-error"u8))
{
return typeof(NetworkErrorReport);
return JsonSerializer.Deserialize(
ref reader, ReportingApiJsonSerializerContext.Default.ReportRequestNetworkErrorReport
);
}

var typeString = Encoding.UTF8.GetString(type);
Expand Down
4 changes: 4 additions & 0 deletions src/ReportingApi/ReportingApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<PackageId>ReportingApi</PackageId>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' " Label="Enable AOT">
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>

<Import Project="..\WarningConfiguration.targets" />

<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
Expand Down