From a219b5928f757e2dfe42a7974e5c4c40cb8d38a8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 9 Sep 2026 08:27:10 -0500 Subject: [PATCH 1/3] Localize the Android workload description Add the English workload localization catalog, wire OneLoc handoff generation, package and extract localized catalogs, and cover the English dotnet workload search output. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- Localize/update-locproject.ps1 | 8 +++--- .../create-packs/Directory.Build.targets | 5 +++- .../Microsoft.NET.Sdk.Android.proj | 12 +++++++- .../localize/WorkloadManifest.en.json | 3 ++ .../Xamarin.Android.Build.Tests/XASdkTests.cs | 28 +++++++++++++++++++ .../Xamarin.ProjectTools/Common/DotNetCLI.cs | 9 ++++++ 6 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/localize/WorkloadManifest.en.json diff --git a/Localize/update-locproject.ps1 b/Localize/update-locproject.ps1 index 80b177f12e5..0195528d873 100644 --- a/Localize/update-locproject.ps1 +++ b/Localize/update-locproject.ps1 @@ -1,13 +1,13 @@ param ($SourcesDirectory, $LocProjectPath) $jsonFiles = @() -$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern -$jsonTemplateFiles | ForEach-Object { +$jsonLocalizationFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" -Filter "*.en.json" | Where-Object { $_.Directory.Name -eq "localize" } +$jsonLocalizationFiles | ForEach-Object { $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - Write-Host "Template loc file generated: $destinationFile" + Write-Host "JSON localization file generated: $destinationFile" } Push-Location "$SourcesDirectory" @@ -25,4 +25,4 @@ Pop-Location $locProjectJson = ConvertTo-Json $projectObject -Depth 5 Set-Content $LocProjectPath $locProjectJson -Write-Host "LocProject.json was updated to contain template localizations:`n`n$locProjectJson`n`n" +Write-Host "LocProject.json was updated to contain JSON localizations:`n`n$locProjectJson`n`n" diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index f7f03c0076a..020cf7521cd 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -104,8 +104,11 @@ <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE.TXT" /> <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" /> + <_WLExtractedLocalizationFiles Include="$(_SdkManifestsFolder)temp\data\localize\*" /> + + - <_WLExtractedDestFiles Include="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\*" /> + <_WLExtractedDestFiles Include="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\**\*" /> diff --git a/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj b/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj index 15e88628688..dd08a218c04 100644 --- a/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj +++ b/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj @@ -28,11 +28,12 @@ about the various Microsoft.Android workloads. $(OutputPath)workload-manifest\WorkloadDependencies.json $(OutputPath)workload-manifest\WorkloadManifest.json + <_AndroidWorkloadManifestLocalizationPath>$([System.IO.Path]::GetDirectoryName('$(WorkloadManifestJsonPath)'))\localize $(OutputPath)workload-manifest\WorkloadManifest.targets $(AndroidPackVersionLong) - + + + <_AndroidWorkloadManifestLocalizationFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\localize\WorkloadManifest.*.json" /> + + <_AndroidPreviewPlatformId @@ -72,6 +81,7 @@ about the various Microsoft.Android workloads. <_PackageFiles Include="$(WorkloadManifestJsonPath)" PackagePath="data" /> + <_PackageFiles Include="$(_AndroidWorkloadManifestLocalizationPath)\WorkloadManifest.*.json" PackagePath="data\localize" /> <_PackageFiles Include="$(WorkloadManifestTargetsPath)" PackagePath="data" /> <_PackageFiles Include="$(WorkloadDependenciesPath)" PackagePath="data" /> diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/localize/WorkloadManifest.en.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/localize/WorkloadManifest.en.json new file mode 100644 index 00000000000..bccc3214f6b --- /dev/null +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/localize/WorkloadManifest.en.json @@ -0,0 +1,3 @@ +{ + "workloads/android/description": ".NET SDK Workload for building Android applications." +} diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index 1360b59499c..6821ac37fa6 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -22,6 +22,34 @@ namespace Xamarin.Android.Build.Tests [NonParallelizable] // On MacOS, parallel /restore causes issues public class XASdkTests : BaseTest { + [Test] + public void DotNetWorkloadSearchUsesEnglishDescription () + { + const string description = ".NET SDK Workload for building Android applications."; + var testPath = Path.Combine (Root, TestName); + Directory.CreateDirectory (testPath); + TestOutputDirectories [TestContext.CurrentContext.Test.ID] = testPath; + + var manifestRoot = TestEnvironment.UseLocalBuildOutput ? + TestEnvironment.WorkloadManifestOverridePath : + Path.Combine (TestEnvironment.DotNetPreviewDirectory, "sdk-manifests"); + Assert.IsTrue (Directory.Exists (manifestRoot), $"The workload manifest root '{manifestRoot}' should exist."); + var androidManifestDirectory = $"{Path.DirectorySeparatorChar}microsoft.net.sdk.android{Path.DirectorySeparatorChar}"; + var englishCatalog = Directory.EnumerateFiles (manifestRoot, "WorkloadManifest.en.json", SearchOption.AllDirectories) + .FirstOrDefault (path => path.IndexOf (androidManifestDirectory, StringComparison.OrdinalIgnoreCase) >= 0); + Assert.IsNotNull (englishCatalog, $"An English Android workload localization catalog should be installed under '{manifestRoot}'."); + StringAssert.Contains (description, File.ReadAllText (englishCatalog)); + + var dotnet = new DotNetCLI (Path.Combine (testPath, "unused.csproj")); + dotnet.EnvironmentVariables ["DOTNET_CLI_UI_LANGUAGE"] = "en"; + + Assert.IsTrue (dotnet.WorkloadSearch ("android"), "`dotnet workload search android` should succeed"); + StringAssert.Contains ( + description, + File.ReadAllText (dotnet.ProcessLogFile), + "`dotnet workload search android` should use the English workload description"); + } + [Test] public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", "androidwear")] string template) { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs index 35b031f55aa..455e7310358 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs @@ -20,6 +20,7 @@ public class DotNetCLI public string AndroidNdkPath { get; set; } = AndroidSdkResolver.GetAndroidNdkPath (); public string JavaSdkPath { get; set; } = AndroidSdkResolver.GetJavaSdkPath (); public string ProjectDirectory { get; set; } + public IDictionary EnvironmentVariables { get; } = new Dictionary (); readonly string projectOrSolution; @@ -63,6 +64,9 @@ protected Process ExecuteProcess (string [] args, string workingDirectory = null if (Directory.Exists (JavaSdkPath)) { p.StartInfo.SetEnvironmentVariable ("JavaSdkDirectory", JavaSdkPath.TrimEnd ('\\')); } + foreach (var variable in EnvironmentVariables) { + p.StartInfo.SetEnvironmentVariable (variable.Key, variable.Value); + } p.Start (); return p; @@ -185,6 +189,11 @@ public bool Pack (string target = null, string runtimeIdentifier = null, string return Execute (arguments.ToArray ()); } + public bool WorkloadSearch (string searchString) + { + return Execute ("workload", "search", searchString); + } + public bool Publish (string target = null, string runtimeIdentifier = null, string [] parameters = null, string [] msbuildArguments = null) { var arguments = GetDefaultCommandLineArgs ("publish", target, runtimeIdentifier, parameters, msbuildArguments); From cb3346e64f1a8a58c6bb0a6e20cb81e06e8ab5d1 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 9 Sep 2026 09:02:52 -0500 Subject: [PATCH 2/3] Fix regex match for JSON localization files Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- Localize/update-locproject.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Localize/update-locproject.ps1 b/Localize/update-locproject.ps1 index 0195528d873..b09818fc437 100644 --- a/Localize/update-locproject.ps1 +++ b/Localize/update-locproject.ps1 @@ -3,7 +3,7 @@ param ($SourcesDirectory, $LocProjectPath) $jsonFiles = @() $jsonLocalizationFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" -Filter "*.en.json" | Where-Object { $_.Directory.Name -eq "localize" } $jsonLocalizationFiles | ForEach-Object { - $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json + $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json' $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru From ae83c67ad23843c82faab9927434b5b3fc01e4cd Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 9 Sep 2026 12:18:15 -0500 Subject: [PATCH 3/3] Fix workload search test cleanup path Place the test output beneath the shared temp directory so BaseTest.CleanupTest can find its cleanup root without walking past the filesystem root. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../Tests/Xamarin.Android.Build.Tests/XASdkTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index 6821ac37fa6..7e77994070d 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -26,7 +26,7 @@ public class XASdkTests : BaseTest public void DotNetWorkloadSearchUsesEnglishDescription () { const string description = ".NET SDK Workload for building Android applications."; - var testPath = Path.Combine (Root, TestName); + var testPath = Path.Combine (Root, "temp", TestName); Directory.CreateDirectory (testPath); TestOutputDirectories [TestContext.CurrentContext.Test.ID] = testPath;