[Xamarin.Android.Build.Tasks] fix cases of missing @(Reference)#7947
Merged
jonathanpeppers merged 1 commit intodotnet:mainfrom Apr 12, 2023
Merged
Conversation
Context: https://github.com/dotnet/msbuild/blob/c75672a6e7387bc5c1f99c166e9277351144b14c/src/Tasks/Microsoft.Common.CurrentVersion.targets#L2327 Fixes: dotnet/maui#10154 This partially reverts c1efcb5. Previously, we removed this change because it broke .NET MAUI's build with: Unable to open file 'obj\Release\net8.0-android\android-x64\aot\x86_64\Microsoft.Maui.Controls.resources\temp.s': Permission denied The problem being that the .NET SDK was placing satellite assemblies in the `@(ResolvedFileToPublish)` item group. Let's apply our change from before, but also set `$(ResolveAssemblyReferencesFindRelatedSatellites)` to `false` for our "inner build" per `$(RuntimeIdentifier)`. This solves the original issue for dotnet/maui#10154 without changing behavior of satellite assemblies. I added `.resx` files in our new test, and assert that satellite assemblies make to apps for good measure.
jonathanpeppers
force-pushed
the
fix-maui-10154-again
branch
from
fca1694 to
28c38dc
Compare
dellis1972
approved these changes
Apr 11, 2023
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Apr 12, 2023
* main: [Xamarin.Android.Build.Tasks] fix cases of missing `@(Reference)` (dotnet#7947) Bumping to the correct monodroid commit Trying to bump monodroid to run debugger-tests Pass timeout to runtime
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Apr 14, 2023
* main: Bump to xamarin/Java.Interop/main@554d819 (dotnet#7951) [Microsoft.Android.Sdk.ILLink] fix crash when TZ changes (dotnet#7956) [tests] Port 'Xamarin.Android.JcwGen-Tests.JcwGen-Tests' to .NET (dotnet#7949) [Xamarin.Android.Build.Tasks] remove `pdb2mdb` (dotnet#7950) [ci] Add some extra params to configure the test templates (dotnet#7955) Convert `/tools` and `/build-tools` projects from `net472` to `$(DotNetStableTargetFramework)` (dotnet#7943) [Xamarin.Android.Build.Tasks] fix cases of missing `@(Reference)` (dotnet#7947) Bump com.android.tools:r8 from 4.0.52 to 8.0.40 (dotnet#7934) Bump to xamarin/Java.Interop/main@a172402 (dotnet#7944) [Xamarin.Android] Remove OpenTK, sqlite-xamarin, System.EnterpriseServices. (dotnet#7940) [ci] Stop building classic test suites. (dotnet#7938) Bumping to the correct monodroid commit Trying to bump monodroid to run debugger-tests Pass timeout to runtime
Member
Author
|
Yay, this time around it didn't break the MAUI build! dotnet/maui#14443 |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Context: https://github.com/dotnet/msbuild/blob/c75672a6e7387bc5c1f99c166e9277351144b14c/src/Tasks/Microsoft.Common.CurrentVersion.targets#L2327
Fixes: dotnet/maui#10154
This partially reverts c1efcb5.
Previously, we removed this change because it broke .NET MAUI's build
with:
The problem being that the .NET SDK was placing satellite assemblies
in the
@(ResolvedFileToPublish)item group.Let's apply our change from before, but also set
$(ResolveAssemblyReferencesFindRelatedSatellites)tofalseforour "inner build" per
$(RuntimeIdentifier).This solves the original issue for dotnet/maui#10154 without changing
behavior of satellite assemblies.
I added
.resxfiles in our new test, and assert that satelliteassemblies are inside the resulting
.apkfor good measure.