Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Localize/update-locproject.ps1
Original file line number Diff line number Diff line change
@@ -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 {
$null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json
$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"
Expand All @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion build-tools/create-packs/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,11 @@
<ItemGroup>
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE.TXT" />
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" />
<_WLExtractedLocalizationFiles Include="$(_SdkManifestsFolder)temp\data\localize\*" />
</ItemGroup>
<Move SourceFiles="@(_WLExtractedFiles)" DestinationFolder="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\" />
<MakeDir Directories="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\localize\" />
<Move SourceFiles="@(_WLExtractedLocalizationFiles)" DestinationFolder="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\localize\" />
<RemoveDir Directories="$(_SdkManifestsFolder)temp\" />
<!--
Reset timestamps to "now" on the local agent. The zip entries inside
Expand All @@ -117,7 +120,7 @@
subsequent builds, breaking "target should be skipped" assertions.
-->
<ItemGroup>
<_WLExtractedDestFiles Include="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\*" />
<_WLExtractedDestFiles Include="$(_SdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\**\*" />
</ItemGroup>
<Touch Files="@(_WLExtractedDestFiles)" />

Expand Down
12 changes: 11 additions & 1 deletion build-tools/create-packs/Microsoft.NET.Sdk.Android.proj
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ about the various Microsoft.Android workloads.
<PropertyGroup>
<WorkloadDependenciesPath Condition="'$(WorkloadDependenciesPath)' == ''">$(OutputPath)workload-manifest\WorkloadDependencies.json</WorkloadDependenciesPath>
<WorkloadManifestJsonPath Condition="'$(WorkloadManifestJsonPath)' == ''">$(OutputPath)workload-manifest\WorkloadManifest.json</WorkloadManifestJsonPath>
<_AndroidWorkloadManifestLocalizationPath>$([System.IO.Path]::GetDirectoryName('$(WorkloadManifestJsonPath)'))\localize</_AndroidWorkloadManifestLocalizationPath>
<WorkloadManifestTargetsPath Condition="'$(WorkloadManifestTargetsPath)' == ''">$(OutputPath)workload-manifest\WorkloadManifest.targets</WorkloadManifestTargetsPath>
<WorkloadVersion Condition="'$(WorkloadVersion)' == ''">$(AndroidPackVersionLong)</WorkloadVersion>
</PropertyGroup>

<MakeDir Directories="$(OutputPath)workload-manifest" />
<MakeDir Directories="$(OutputPath)workload-manifest;$(_AndroidWorkloadManifestLocalizationPath)" />
<ReplaceFileContents
SourceFile="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\WorkloadManifest.in.json"
DestinationFile="$(WorkloadManifestJsonPath)"
Expand All @@ -43,6 +44,14 @@ about the various Microsoft.Android workloads.
DestinationFile="$(WorkloadManifestTargetsPath)"
Replacements="@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
</ReplaceFileContents>
<ItemGroup>
<_AndroidWorkloadManifestLocalizationFiles Include="$(XamarinAndroidSourcePath)src\Xamarin.Android.Build.Tasks\Microsoft.NET.Sdk.Android\localize\WorkloadManifest.*.json" />
</ItemGroup>
<Copy
SourceFiles="@(_AndroidWorkloadManifestLocalizationFiles)"
DestinationFolder="$(_AndroidWorkloadManifestLocalizationPath)"
SkipUnchangedFiles="true"
/>

<ItemGroup>
<_AndroidPreviewPlatformId
Expand Down Expand Up @@ -72,6 +81,7 @@ about the various Microsoft.Android workloads.

<ItemGroup>
<_PackageFiles Include="$(WorkloadManifestJsonPath)" PackagePath="data" />
<_PackageFiles Include="$(_AndroidWorkloadManifestLocalizationPath)\WorkloadManifest.*.json" PackagePath="data\localize" />
<_PackageFiles Include="$(WorkloadManifestTargetsPath)" PackagePath="data" />
<_PackageFiles Include="$(WorkloadDependenciesPath)" PackagePath="data" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"workloads/android/description": ".NET SDK Workload for building Android applications."
}
Original file line number Diff line number Diff line change
Expand Up @@ -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, "temp", 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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, string> EnvironmentVariables { get; } = new Dictionary<string, string> ();

readonly string projectOrSolution;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down