Skip to content

[build] android-platform-support repo consolidation #11529

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

Draft
jonathanpeppers wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[build] android-platform-support repo consolidation #11529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51f61b1
[build] android-platform-support repo consolidation
jonathanpeppers May 28, 2026
14bb76e
[build] remove prepare-external-git-dependencies
jonathanpeppers May 28, 2026
5eb6281
[build] add PoliCheck exclusions for inlined installer content
jonathanpeppers May 28, 2026
3d5286f
[build] exclude Localize/loc from PoliCheck scan
jonathanpeppers May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .external
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .gdn/policheck/PoliCheck.Exclusions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Each of these exclusions is a folder name - if \[name]\ exists in the file path, it will be skipped -->
<Exclusion Type="FolderPathFull">LICENSE-DATA|LOCALIZE</Exclusion>
<!-- Each of these exclusions is a folder name - if any folder or file starts with "\[name]", it will be skipped -->
<Exclusion Type="FolderPathStart">src\Mono.Android\Profiles|src\Mono.Android\PublicAPI</Exclusion>
<Exclusion Type="FolderPathStart">Localize\loc|src\Mono.Android\Profiles|src\Mono.Android\PublicAPI|src\Xamarin.Installer.AndroidSDK\Feeds|src\Xamarin.Installer.AndroidSDK\Resources|src\Xamarin.Installer.AndroidSDK\Xamarin.Installer.AndroidSDK\Kajabity.Tools.Java</Exclusion>
<!-- Each of these file types will be completely skipped for the entire scan -->
<!--<Exclusion Type="FileType">.ABC|.XYZ</Exclusion>-->
<!-- The specified file names will be skipped during the scan regardless which folder they are in -->
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ apk-sizes-*.txt
*.binlog
*.ProjectImports.zip
*~
external/android-platform-support/
external/monodroid/
external/android-platform-support/
external/mono/
tests/api-compatibility/reference/*/*.dll
tests/api-compatibility/reference/*/*.cs
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@
path = external/xxHash
url = https://github.com/Cyan4973/xxHash.git
branch = release
[submodule "external/termux-elf-cleaner"]
path = external/termux-elf-cleaner
url = https://github.com/termux/termux-elf-cleaner
12 changes: 12 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@
<ELFSharpVersion>2.17.3</ELFSharpVersion>
<HumanizerVersion>2.14.1</HumanizerVersion>
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.9.3</MdocPackageVersion>
<!-- Used by the installer-side projects under src/Xamarin.Installer.*, src/Mono.AndroidTools, src/Xamarin.AndroidTools -->
<GitInfoVersion>2.3.0</GitInfoVersion>
<IniParserNetstandardVersion>2.5.2</IniParserNetstandardVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MonoUnixVersion>7.1.0-final.1.21458.1</MonoUnixVersion>
<PollyVersion>7.2.4</PollyVersion>
<ProtobufNetVersion>3.2.26</ProtobufNetVersion>
<ProtobufNetCoreVersion>3.2.26</ProtobufNetCoreVersion>
<SharpZipLibVersion>1.3.3</SharpZipLibVersion>
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -75,6 +85,8 @@
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.Build.Tests.csproj' ">true</_AllowProjectWarnings>
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.JcwGen-Tests.csproj' ">true</_AllowProjectWarnings>
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.NUnitLite.NET.csproj' ">true</_AllowProjectWarnings>
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Installer.AndroidSDK.csproj' ">true</_AllowProjectWarnings>
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Installer.Common.csproj' ">true</_AllowProjectWarnings>
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.ProjectTools.csproj' ">true</_AllowProjectWarnings>
<TreatWarningsAsErrors Condition=" ('$(RunningOnCI)' == 'true' OR '$(_AndroidTreatWarningsAsErrors)' == 'true') AND '$(_AllowProjectWarnings)' != 'true' ">true</TreatWarningsAsErrors>
</PropertyGroup>
Expand Down
14 changes: 1 addition & 13 deletions Documentation/building/unix/instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ can also be used by setting the `$(MSBUILD)` make variable to `xbuild`.

4. (Optional) [Configure the build](../configuration.md).

5. (For Microsoft team members only) (Optional) Prepare external
proprietary git dependencies

make prepare-external-git-dependencies

This will clone or update a monodroid checkout in `external` and
ensure that subsequent `prepare` and `make` invocations will build
proprietary components.

6. Prepare the project:
5. Prepare the project:

make prepare
# -or-
Expand Down Expand Up @@ -108,9 +99,6 @@ Alternatively, .NET for Android workload packs can be built with:

Several `.nupkg` files will be output in `./bin/Build$(Configuration)/nuget-unsigned`.

Commercial installers will be created by this command if the
`make prepare-external-git-dependencies` command was ran before building.


# Running Unit Tests

Expand Down
15 changes: 1 addition & 14 deletions Documentation/building/windows/instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,7 @@ be available within the Command-Line environment.

dotnet-local.cmd build Xamarin.Android.sln

7. (For Microsoft team members only - Optional) In a [Developer Command
Prompt][developer-prompt], build external proprietary git
dependencies:

dotnet-local.cmd build Xamarin.Android.sln -t:BuildExternal

This will clone and build external proprietary components such as
the `android-platform-support` repository in Azure DevOps.

8. Configure local `android` workload:
7. Configure local `android` workload:

dotnet-local.cmd build build-tools/create-packs/Microsoft.Android.Sdk.proj -t:ConfigureLocalWorkload

Expand Down Expand Up @@ -114,10 +105,6 @@ Once `dotnet msbuild Xamarin.Android.sln -t:Prepare` is complete,

Several `.nupkg` files will be output in `.\bin\Build$(Configuration)\nuget-unsigned`.

Commercial packages will be created by this command if the
`dotnet-local.cmd build Xamarin.Android.sln -t:BuildExternal`
command was ran before building.

## Building Unit Tests

Once `dotnet-local.cmd build Xamarin.Android.sln` has completed, the unit tests may
Expand Down
5 changes: 0 additions & 5 deletions Documentation/guides/vscode-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Select **Build All .NET for Android**. You will then be presented with a
list of options:

* `Prepare` - Installs the required Dependencies.
* `PrepareExternal` - Installs the required Commercial Dependencies (Xamarin Team Members Only)
* `Build` - Build .NET for Android.
* `Pack` - Create the NuGet Packages.
* `Everything` - Calls Prepare, Build and Pack.
Expand All @@ -25,10 +24,6 @@ The normal order is `Prepare`, `Build` then `Pack`. This will result in
a usable copy of .NET for Android. You can now use it to build apps
and run the unit tests.

Note: `PrepareExternal` is for internal Xamarin Team members only, this sets up
the commercial parts of the repository. Trying to use this command when you
do not have access to the required repositories will result in a failure.

## Running/Debugging Unit Tests

Xamarin.Android Legacy uses the
Expand Down
30 changes: 30 additions & 0 deletions Localize/LocProject.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,36 @@
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.Android.Build.Tasks\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.Android.Build.Tasks\\Properties\\"
},
{
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.Installer.Common\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.Installer.Common\\Properties\\",
"LclFile": "Localize\\loc\\{Lang}\\Xamarin.Installer.Common\\Properties\\Resources.resx.lcl"
},
{
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.Installer.AndroidSDK\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.Installer.AndroidSDK\\Properties\\",
"LclFile": "Localize\\loc\\{Lang}\\Xamarin.Installer.AndroidSDK\\Properties\\Resources.resx.lcl"
},
{
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.Installer.Build.Tasks\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.Installer.Build.Tasks\\Properties\\",
"LclFile": "Localize\\loc\\{Lang}\\Xamarin.Installer.Build.Tasks\\Properties\\Resources.resx.lcl"
},
{
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.AndroidTools\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.AndroidTools\\Properties\\",
"LclFile": "Localize\\loc\\{Lang}\\Xamarin.AndroidTools\\Properties\\Resources.resx.lcl"
},
{
"CopyOption": "LangIDOnName",
"SourceFile": ".\\src\\Xamarin.Android.Build.Debugging.Tasks\\Properties\\Resources.resx",
"OutputPath": ".\\src\\Xamarin.Android.Build.Debugging.Tasks\\Properties\\",
"LclFile": "Localize\\loc\\{Lang}\\tools\\msbuild\\Properties\\Resources.resx.lcl"
}
]
}
Expand Down
146 changes: 146 additions & 0 deletions Localize/loc/cs/Xamarin.AndroidTools/Properties/Resources.resx.lcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="C:\A\1\237\s\Xamarin.AndroidTools\Properties\Resources.resx" PsrId="211" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Rccx" />
</OwnedComments>
<Item ItemId=";Resources.resx" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
<Item ItemId=";Strings" ItemType="0" PsrId="211" Leaf="false">
<Disp Icon="Str" Disp="true" LocTbl="false" />
<Item ItemId=";CreateKeyError_AliasContainsInvalidCharacters" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Alias cannot have characters that are not allowed in file names]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Alias nemůže obsahovat znaky, které nejsou v názvech souborů povolené.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_ErrorImportingKey" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was an error importing the key]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při importu klíče došlo k chybě.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_GenericError" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[There was an error creating the key]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při vytváření klíče došlo k chybě.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_KeyStoreNotFound" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The keystore was not found]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Úložiště klíčů se nenašlo.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_MinimumOneYearValidity" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Validity cannot be less than 1 year]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Platnost nemůže být kratší než 1 rok.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_NotInitialized" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[KeyStoreManagement has not been initialized]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[KeyStoreManagement se neinicializoval.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";CreateKeyError_UnsupportedPlatform" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unsupported Platform]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepodporovaná platforma]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";JdwpClientDisconnectError" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unexpected error occurred trying to disconnect Jdwp client.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při pokusu o odpojení klienta Jdwp došlo k neočekávané chybě.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_AndroidSdk_JdkInfo" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[An exception occurred while retrieving the properties of the selected Java SDK installation. Check that the selected Java SDK installation contains a compatible version of Java and that 'java -XshowSettings:properties -version' runs successfully for that installation. Exception: {0}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při načítání vlastností vybrané instalace sady Java SDK došlo k výjimce. Zkontrolujte, že vybraná instalace sady Java SDK obsahuje kompatibilní verzi Javy a že pro danou instalaci je možné úspěšně spustit java -XshowSettings:properties -version. Výjimka: {0}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_AndroidSdk_Refresh_Exception" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[An exception occurred while finding the Android SDK or Java SDK. Exception: {0}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při hledání sady Android SDK nebo Java SDK došlo k výjimce. Výjimka: {0}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_Android_SDK" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The Android SDK directory could not be found. Check that the Android SDK Manager in Visual Studio shows a valid installation. To use a custom SDK path for a command line build, set the 'AndroidSdkDirectory' MSBuild property to the custom path.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepovedlo se najít adresář sady Android SDK. Zkontrolujte, jestli Správce sady Android SDK v sadě Visual Studio zobrazuje platnou instalaci. Pokud chcete použít vlastní cestu sady SDK pro sestavení z příkazového řádku, nastavte vlastnost AndroidSdkDirectory nástroje MSBuild na danou vlastní cestu.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_Java_SDK" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The Java SDK directory could not be found. Ensure that the Android section of the Visual Studio options has a valid Java SDK directory configured. To use a custom SDK path for a command line build, set the 'JavaSdkDirectory' MSBuild property to the custom path.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepovedlo se najít adresář sady Java SDK. Zajistěte, aby byl v možnostech sady Visual Studio v části Android nakonfigurovaný platný adresář sady Java SDK. Pokud chcete použít vlastní cestu sady SDK pro sestavení z příkazového řádku, nastavte vlastnost JavaSdkDirectory nástroje MSBuild na danou vlastní cestu.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_MonoDroidSdk_Refresh_Exception" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[An exception occurred while validating the .NET for Android installation. Using the Visual Studio installer to repair or reinstall the .NET MAUI component might resolve this problem. Exception: {0}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Při ověřování instalace rozhraní .NET pro Android došlo k výjimce. Problém možná půjde vyřešit opravou nebo přeinstalováním součásti .NET MAUI pomocí Instalačního programu pro Visual Studio. Výjimka: {0}]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[An exception occurred while validating the Xamarin.Android SDK installation. Using the Visual Studio installer to repair or reinstall the Xamarin.Android SDK component might resolve this problem. Exception: {0}]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA5300_MonoDroidSdk_XA_Version" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unable to determine the .NET for Android version.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepovedlo se určit verzi rozhraní .NET pro Android.]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Unable to determine Xamarin.Android version.]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>
Loading