Skip to content

Commit

Permalink
Merge branch 'main' into maybe-fix-zip
Browse files Browse the repository at this point in the history
* main:
  LEGO: Merge pull request 7825
  Bump to xamarin/Java.Interop/main@bbaeda6f (dotnet#7799)
  Bump NDK to r25c (dotnet#7808)
  [Xamarin.Android.Build.Tests] Improve logcat logging in failed tests (dotnet#7816)
  [Mono.Android] Update api-compat reference file for current API-33 (dotnet#7822)
  Localized file check-in by OneLocBuild Task (dotnet#7820)
  • Loading branch information
grendello committed Feb 24, 2023
2 parents 02b022b + a65c8d8 commit 1073a92
Show file tree
Hide file tree
Showing 36 changed files with 234 additions and 3,089 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[To je pravděpodobně způsobeno tím, že projekt překračuje omezení maximální délky cesty systému Windows. Podrobnosti najdete v https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Esto probablemente se debe a que el proyecto supera la limitación de longitud máxima de la ruta de acceso de Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obtener más información.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Cela est probablement dû au fait que le projet dépasse la limite de longueur maximale du chemin d’accès Windows. Pour plus d’informations, consultez https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[これは、プロジェクトが Windows のパスの最大の長さの制限を超えたことが原因の可能性があります。詳細については、https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 を参照してください。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[프로젝트가 Windows 최대 경로 길이 제한을 초과하여 이러한 상황이 발생했을 수 있습니다. 자세한 내용은 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264를 참조하세요.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Isso provavelmente ocorreu porque o projeto excedeu a limitação de comprimento máximo do caminho do Windows. Consulte https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 para obter detalhes.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Возможно, для этого проекта превышена максимальная длина пути в Windows. См. https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Bunun nedeni, projenin Windows yol uzunluğu üst sınırını aşması olabilir. Ayrıntılar için bkz. https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[这可能是由超出 Windows 最大路径长度限制的项目引起的。有关详细信息,请参阅 https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";APT2264" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[這可能是因為專案超過 Windows 最大路徑長度限制所造成。如需詳細資料,請參閱https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA0000_API_for_TargetFrameworkVersion" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not determine API level for $(TargetFrameworkVersion) of '{0}'.]]></Val>
Expand Down
9 changes: 8 additions & 1 deletion build-tools/scripts/Jar.targets
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,16 @@
<_DestDir>$(IntermediateOutputPath)__CreateTestJarFile-bin</_DestDir>
<_AndroidJar>-bootclasspath "$(AndroidSdkDirectory)\platforms\android-$(_AndroidApiLevelName)\android.jar"</_AndroidJar>
<_CP>-cp "$(_JavaInteropJarPath)"</_CP>
<_JavacFilesResponse>$(IntermediateOutputPath)__javac_response.txt</_JavacFilesResponse>
</PropertyGroup>
<WriteLinesToFile
File="$(_JavacFilesResponse)"
Lines="@(_JavacSource)"
Overwrite="True"
/>
<MakeDir Directories="$(_DestDir)" />
<Exec Command="$(_Javac) $(_Targets) -d &quot;$(_DestDir)&quot; $(_AndroidJar) $(_CP) @(_JavacSource->'&quot;%(Identity)&quot;', ' ')" />
<Exec Command="$(_Javac) $(_Targets) -d &quot;$(_DestDir)&quot; $(_AndroidJar) $(_CP) &quot;@$(_JavacFilesResponse)&quot;" />
<Delete Files="$(_JavacFilesResponse)" />
<Exec
Command="$(_Jar) cf &quot;classes.jar&quot; ."
WorkingDirectory="$(_DestDir)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace Xamarin.Android.Prepare
{
class BuildAndroidPlatforms
{
public const string AndroidNdkVersion = "25b";
public const string AndroidNdkPkgRevision = "25.1.8937393";
public const string AndroidNdkVersion = "25c";
public const string AndroidNdkPkgRevision = "25.2.9519653";
public const int NdkMinimumAPI = 21;
public const int NdkMinimumAPILegacy32 = 19;

Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
7 changes: 5 additions & 2 deletions src/Mono.Android/Android.Runtime/AndroidRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,12 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
desugarType.Append ("Desugar").Append (name);
}

var typeWithPrefix = desugarType.ToString ();
var typeWithSuffix = $"{jniSimpleReference}$-CC";

return new[]{
desugarType.ToString (),
$"{jniSimpleReference}$-CC"
GetReplacementTypeCore (typeWithPrefix) ?? typeWithPrefix,
GetReplacementTypeCore (typeWithSuffix) ?? typeWithSuffix,
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/Mono.Android/Mono.Android.targets
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
</ItemGroup>
<Target
Name="_CheckApiCompatibility"
Condition=" '$(DisableApiCompatibilityCheck)' != 'True' "
Condition=" '$(DisableApiCompatibilityCheck)' != 'True' And '$(TargetFramework)' != 'monoandroid10'"
AfterTargets="CopyFilesToOutputDirectory"

Inputs="$(TargetPath);@(ApiCompatibilityFiles)"
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Změňte hodnotu na název typu kvalifikovaného sestavení, který dědí z: {1
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>Sestavení se nepovedlo zkompilovat AOT: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von „{1}
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>AOT für Assembly nicht möglich: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Cambie el valor a un nombre de tipo de ensamblado que herede de "{1}" o quite la
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>No se pudo aplicar AOT al ensamblado: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Veuillez remplacer la valeur par un nom de type qualifié par l’assembly qui h
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>Impossible d'effectuer une compilation AOT de l'assembly : {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Modificare il valore in un nome di tipo con qualifica assembly che eredita da '{
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>Non è stato possibile eseguire la compilazione AOT dell'assembly: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>アセンブリを AOT できませんでした: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>어셈블리를 AOT할 수 없음: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Zmień wartość na nazwę typu kwalifikowalnego zestawu, która dziedziczy po
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>Nie można utworzyć widoku AOT zestawu: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,10 @@ Altere o valor para um nome de tipo qualificado por assembly que herda de "{1}"
<comment>The following are literal names and should not be translated: Java.Interop.DoNotPackageAttribute
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This is probably caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
<value>Não foi possível fazer AOT no assembly: {0}</value>
<comment>The abbreviation "AOT" should not be translated.</comment>
Expand Down
Loading

0 comments on commit 1073a92

Please sign in to comment.