Skip to content

[tools] Support current and legacy assembly stores #12104

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
jonathanpeppers merged 6 commits into from
Jul 20, 2026
Merged

[tools] Support current and legacy assembly stores #12104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2091094
[tools] Support dlopen assembly stores
simonrozsival Jul 14, 2026
70da5d7
[tools] Preserve assembly store compatibility
simonrozsival Jul 14, 2026
1666f8d
[tools] Address assembly tool review
simonrozsival Jul 14, 2026
3bd1dc8
Merge origin/main into dev/simonrozsival/update-assembly-store-tools
Copilot Jul 15, 2026
60aa11d
Merge origin/main into assembly store tools
jonathanpeppers Jul 20, 2026
e0a5166
[tools] Address assembly store review feedback
jonathanpeppers Jul 20, 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
2 changes: 2 additions & 0 deletions .github/skills/tests/references/test-catalog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ These tests can be run immediately with `dotnet test` on the `.csproj`, even if

| Test Area | Project | Command |
|-----------|---------|---------|
| **assembly store reader** | `tools/assembly-store-reader-mk2/AssemblyStore.Tests/` | `dotnet test tools/assembly-store-reader-mk2/AssemblyStore.Tests/AssemblyStore.Tests.csproj -v minimal` |
| **trimmable type map** (unit) | `tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/` | `dotnet test tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests.csproj -v minimal` |
| **aidl** | `tests/Xamarin.Android.Tools.Aidl-Tests/` | `dotnet test tests/Xamarin.Android.Tools.Aidl-Tests/Xamarin.Android.Tools.Aidl-Tests.csproj -v minimal` |
| **source writer** | `external/Java.Interop/tests/Xamarin.SourceWriter-Tests/` | `dotnet test external/Java.Interop/tests/Xamarin.SourceWriter-Tests/Xamarin.SourceWriter-Tests.csproj -v minimal` |
Expand Down Expand Up @@ -205,5 +206,6 @@ Run these tests with `dotnet test` from each test project directory listed above
| Test Area | Tier | Assembly / Project | Notes |
|-----------|------|--------------------|-------|
| **aidl** | **Standalone** | `tests/Xamarin.Android.Tools.Aidl-Tests/` | AIDL compiler tests — `dotnet test` on `.csproj` |
| **assembly store reader** | **Standalone** | `tools/assembly-store-reader-mk2/AssemblyStore.Tests/` | Legacy/current store layouts and LZ4/Zstd decompression |
| **api compatibility** | N/A | `tests/api-compatibility/` | Not a test runner — reference data for API surface checks |
| **android sdk tools** | **Standalone** | `external/xamarin-android-tools/tests/` | Android SDK helper tooling tests — `dotnet test` on `.csproj` |
30 changes: 30 additions & 0 deletions Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xamarin-android-tools", "xa
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{65925F91-7BB8-AC56-CADB-FB3DD28A5B5B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyStore.Tests", "tools\assembly-store-reader-mk2\AssemblyStore.Tests\AssemblyStore.Tests.csproj", "{34FEC4BE-168E-460A-B049-94AA4627CE83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyStore", "tools\assembly-store-reader-mk2\AssemblyStore\AssemblyStore.csproj", "{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -997,6 +1001,30 @@ Global
{4E5C5846-CBFD-4695-B1F0-D48DEC0AF50B}.Release|x64.Build.0 = Release|Any CPU
{4E5C5846-CBFD-4695-B1F0-D48DEC0AF50B}.Release|x86.ActiveCfg = Release|Any CPU
{4E5C5846-CBFD-4695-B1F0-D48DEC0AF50B}.Release|x86.Build.0 = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|x64.ActiveCfg = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|x64.Build.0 = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|x86.ActiveCfg = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Debug|x86.Build.0 = Debug|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|Any CPU.Build.0 = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|x64.ActiveCfg = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|x64.Build.0 = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|x86.ActiveCfg = Release|Any CPU
{34FEC4BE-168E-460A-B049-94AA4627CE83}.Release|x86.Build.0 = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|x64.ActiveCfg = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|x64.Build.0 = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|x86.ActiveCfg = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Debug|x86.Build.0 = Debug|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|Any CPU.Build.0 = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|x64.ActiveCfg = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|x64.Build.0 = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|x86.ActiveCfg = Release|Any CPU
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1071,6 +1099,8 @@ Global
{4E5C5846-CBFD-4695-B1F0-D48DEC0AF50B} = {FFCF518F-2A4A-40A2-9174-2EE13B76C723}
{BB3C8E1B-31A2-1C4E-0B3F-36B3F475D6AA} = {05C3B1D6-A4CE-4534-A9E4-E9117591ADF7}
{65925F91-7BB8-AC56-CADB-FB3DD28A5B5B} = {BB3C8E1B-31A2-1C4E-0B3F-36B3F475D6AA}
{34FEC4BE-168E-460A-B049-94AA4627CE83} = {864062D3-A415-4A6F-9324-5820237BA058}
{19DA4CD1-21A7-49FE-9431-4A8DF69A186B} = {864062D3-A415-4A6F-9324-5820237BA058}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6}
Expand Down
15 changes: 15 additions & 0 deletions build-tools/automation/yaml-templates/build-windows-steps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,21 @@ steps:
testResultsFiles: "$(Agent.TempDirectory)/trimmable-typemap-tests/*.trx"
testRunTitle: Microsoft.Android.Sdk.TrimmableTypeMap.Tests

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
parameters:
command: test
project: tools/assembly-store-reader-mk2/AssemblyStore.Tests/AssemblyStore.Tests.csproj
arguments: -c $(XA.Build.Configuration) --logger trx --results-directory $(Agent.TempDirectory)/assembly-store-tests
displayName: Test AssemblyStore.Tests $(XA.Build.Configuration)

- task: PublishTestResults@2
displayName: publish AssemblyStore.Tests results
condition: always()
inputs:
testResultsFormat: VSTest
testResultsFiles: "$(Agent.TempDirectory)/assembly-store-tests/*.trx"
testRunTitle: AssemblyStore.Tests

- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
parameters:
command: test
Expand Down
1 change: 1 addition & 0 deletions ....Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<Compile Remove="Resources\ApacheHttpClient.cs" />
<Compile Remove="Expected\**" />
<Compile Include="..\..\..\..\tools\assembly-store-reader-mk2\AssemblyStore\*.cs" />
<Compile Include="..\..\..\..\tools\assembly-store-reader-mk2\AssemblyStore\V1\*.cs" />
<Content Include="Expected\GenerateDesignerFileExpected.cs">
<Link>..\Expected\GenerateDesignerFileExpected.cs</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
1 change: 1 addition & 0 deletions tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<ItemGroup>
<Compile Remove="Resources\**\*.cs" />
<Compile Include="..\..\tools\assembly-store-reader-mk2\AssemblyStore\*.cs" />
<Compile Include="..\..\tools\assembly-store-reader-mk2\AssemblyStore\V1\*.cs" />
<EmbeddedResource Include="Resources\LinkDescTest\*.*" />
</ItemGroup>
<ItemGroup>
Expand Down
19 changes: 19 additions & 0 deletions tools/assembly-store-reader-mk2/AssemblyStore.Tests/AssemblyStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\Configuration.props" />
<Import Project="..\..\..\build-tools\scripts\NUnitReferences.projitems" />

<PropertyGroup>
<TargetFrameworks>$(DotNetStableTargetFramework);$(DotNetTargetFramework)</TargetFrameworks>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<RootNamespace>Xamarin.Android.AssemblyStore.Tests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="K4os.Compression.LZ4" Version="$(LZ4PackageVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AssemblyStore\AssemblyStore.csproj" />
</ItemGroup>
</Project>
Loading
Loading