Skip to content

Enable nullable reference types in GenerateNativeAotEnvironmentAssemblerSources.cs #11546

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
simonrozsival merged 3 commits into from
Jun 1, 2026
+8 −2
Merged

Enable nullable reference types in GenerateNativeAotEnvironmentAssemblerSources.cs #11546

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea32442
Initial plan
Copilot May 31, 2026
8950cb8
Plan: Enable nullable and fix null-dereference in GenerateNativeAotEn…
Copilot May 31, 2026
c16b5ba
Enable nullable and fix null-dereference in GenerateNativeAotEnvironm…
Copilot May 31, 2026
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
10 changes: 8 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeAotEnvironmentAssemblerSources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#nullable enable

using Microsoft.Android.Build.Tasks;
using Microsoft.Build.Framework;
using Xamarin.Android.Tools;
Expand Down Expand Up @@ -29,6 +31,10 @@ public override bool RunTask ()

// There can be only one, since we run in the inner build
ITaskItem? outputFile = GenerateNativeAotLibraryLoadAssemblerSources.FindOutputFile (OutputSources, abi: abi, rid: RID);
if (outputFile == null) {
Log.LogError ($"Could not find output file for ABI '{abi}' and RID '{RID}'");
return false;
}
Log.LogDebugMessage ($"Environment variables file to generate: {outputFile.ItemSpec}");

string environmentLlFilePath = outputFile.ItemSpec;
Expand All @@ -37,9 +43,9 @@ public override bool RunTask ()
using var environmentWriter = MemoryStreamPool.Shared.CreateStreamWriter ();
bool fileFullyWritten = false;
try {
generator.Generate (environmentModule, targetArch, environmentWriter, environmentLlFilePath!);
generator.Generate (environmentModule, targetArch, environmentWriter, environmentLlFilePath);
environmentWriter.Flush ();
Files.CopyIfStreamChanged (environmentWriter.BaseStream, environmentLlFilePath!);
Files.CopyIfStreamChanged (environmentWriter.BaseStream, environmentLlFilePath);
fileFullyWritten = true;
} finally {
// Log partial contents for debugging if generation failed
Expand Down
Loading