Skip to content

Fix unmangling of satellite assembly names #9533

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
merged 3 commits into from
Nov 22, 2024
Merged

Fix unmangling of satellite assembly names #9533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e4d8f0
Fix unmangling of satellite assembly names
grendello Nov 20, 2024
9e8d1c0
Let's see if it fixes the tests
grendello Nov 21, 2024
77d791f
A few more fixlets
grendello Nov 22, 2024
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
Prev Previous commit
A few more fixlets
  • Loading branch information
@grendello
grendello committed Nov 22, 2024
commit 77d791fbfbc3ba14f766efc4154f3024dade0226
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
.ToArray ();
var expectedFiles = new List<string> {
$"{proj.PackageName}-Signed.apk",
"de-DE",
"es",
$"{proj.ProjectName}.dll",
$"{proj.ProjectName}.pdb",
Expand Down
8 changes: 4 additions & 4 deletions tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@ public void BaseZip ()
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Java.Interop.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Mono.Android.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Localization.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib-es-Localization.resources.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib-es{MonoAndroidHelper.SATELLITE_CULTURE_END_MARKER_CHAR}Localization.resources.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_UnnamedProject.dll.so");
} else {
expectedFiles.Add ($"lib/{abi}/lib_Java.Interop.dll.so");
expectedFiles.Add ($"lib/{abi}/lib_Mono.Android.dll.so");
expectedFiles.Add ($"lib/{abi}/lib_Localization.dll.so");
expectedFiles.Add ($"lib/{abi}/lib-es-Localization.resources.dll.so");
expectedFiles.Add ($"lib/{abi}/lib-es{MonoAndroidHelper.SATELLITE_CULTURE_END_MARKER_CHAR}Localization.resources.dll.so");
expectedFiles.Add ($"lib/{abi}/lib_UnnamedProject.dll.so");
}

Expand Down Expand Up @@ -226,13 +226,13 @@ public void AppBundle ()
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Java.Interop.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Mono.Android.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_Localization.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib-es-Localization.resources.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib-es{MonoAndroidHelper.SATELLITE_CULTURE_END_MARKER_CHAR}Localization.resources.dll.so");
expectedFiles.Add ($"{blobEntryPrefix}{abi}/lib_UnnamedProject.dll.so");
} else {
expectedFiles.Add ($"base/lib/{abi}/lib_Java.Interop.dll.so");
expectedFiles.Add ($"base/lib/{abi}/lib_Mono.Android.dll.so");
expectedFiles.Add ($"base/lib/{abi}/lib_Localization.dll.so");
expectedFiles.Add ($"base/lib/{abi}/lib-es-Localization.resources.dll.so");
expectedFiles.Add ($"base/lib/{abi}/lib-es{MonoAndroidHelper.SATELLITE_CULTURE_END_MARKER_CHAR}Localization.resources.dll.so");
expectedFiles.Add ($"base/lib/{abi}/lib_UnnamedProject.dll.so");
}

Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy