[nativeaot] fix .resx files in apps
#9905
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `EmbeddedResources_ShouldBeLocalized()` test was failing under a
NativeAOT context:
Embedded string resource did not contain expected value after changing CultureInfo.
String lengths are both 1. Strings differ at index 0.
Expected: "b"
But was: "a"
-----------^
After reviewing a `.binlog`, it appears the `_ComputeIlcCompileInputs`
MSBuild target was not working as expected:
https://github.com/dotnet/runtime/blob/cc803458ab4dabf020b462873be5bf56f1640b1e/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets#L3-L11
`@(IntermediateSatelliteAssembliesWithTargetPath)` was blank!
The problem being the way Android has an "inner" build per RID:
* `@(IntermediateSatelliteAssembliesWithTargetPath)` is set in the
"outer" build.
* `@(IntermediateSatelliteAssembliesWithTargetPath)` is blank in the
"inner" build per RID.
* The "inner" build is where the ILC compiler runs, and so it doesn't
see the current project's `*.resource.dll` file.
To fix this, we can pass `$(_OuterIntermediateSatelliteAssembliesWithTargetPath)`
into the inner build.
I updated an MSBuild test to run normally and in a NativeAOT context.
jonpryor
reviewed
Mar 11, 2025
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
Outdated
Show resolved
Hide resolved
jonpryor
reviewed
Mar 11, 2025
src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs
Outdated
Show resolved
Hide resolved
dellis1972
reviewed
Mar 12, 2025
| IsRelease = value; | ||
| // Only toggle IsRelease=true when value is true | ||
| if (value) | ||
| IsRelease = true; |
There was a problem hiding this comment.
If I want to say unit test a NativeAOT app in debug mode is this going to stop that from working?
There was a problem hiding this comment.
I would maybe still test Release configuration and set $(DebugType) and $(DebugSymbols).
Eventually, I think $(PublishAot)=true in Debug mode will still use Mono (or CoreCLR), so our managed debuggers will work.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
EmbeddedResources_ShouldBeLocalized()test was failing under a NativeAOT context:After reviewing a
.binlog, it appears the_ComputeIlcCompileInputsMSBuild target was not working as expected:https://github.com/dotnet/runtime/blob/cc803458ab4dabf020b462873be5bf56f1640b1e/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets#L3-L11
@(IntermediateSatelliteAssembliesWithTargetPath)was blank!The problem being the way Android has an "inner" build per RID:
@(IntermediateSatelliteAssembliesWithTargetPath)is set in the "outer" build.@(IntermediateSatelliteAssembliesWithTargetPath)is blank in the "inner" build per RID.The "inner" build is where the ILC compiler runs, and so it doesn't see the current project's
*.resource.dllfile.To fix this, we can pass
$(_OuterIntermediateSatelliteAssembliesWithTargetPath)into the inner build.I updated an MSBuild test to run normally and in a NativeAOT context.