Bump to xamarin/xamarin-android-tools/main@9c641b3e (#7073)

Context: https://dl-ssl.google.com/android/repository/repository2-3.xml
Context: 22bc14b1a8

Changes: ec346d07cf...9c641b3e08

  * xamarin/xamarin-android-tools@9c641b3 [Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-32 (#169)

Commit xamarin/xamarin-android-tools@9c641b3 bumps
`$(AndroidSdkBuildToolsVersion)` to 32.0.0.  (We looked at bumping
to 33.0.0, but that broke various unit tests; we will investigate
supporting build-tools 33.0.0 later.)

The "problem" is that [build-tools 31.0.0 *removed* `dx`][0], and
thus Classic Xamarin.Android has stuck with build-tools 30.0.0 as the
default version for years.

Commit 22bc14b1 introduced warning XA1023 (an *error* in .NET 5+),
as we saw no reason to support `dx` in .NET 5 when it was already
deprecated.

Warning XA1023 has been emitted in Classic Xamarin.Android since
Visual Studio 16.9 (released 2021-Mar); we feel there has been ample
time to migrate away from `dx` and to the replacement of `d8`.

Turn XA1023 into an *error* for Classic Xamarin.Android builds,
ensuring things are consistent between Classic Xamarin.Android and
.NET 6+.

Commit xamarin/xamarin-android-tools@9c641b3 *also* bumps
`$(AndroidCommandLineToolsVersion)` to 7.0.  Update
`$(CommandLineToolsVersion)` in `Configuration.props` accordingly.

The `cmdline-tools` package v7.0 contains contains [`lint` 7.2][1],
which introduces a new `lint` check called `RedundantLabel`:

> Redundant label on activity in manifest

meaning that the `//actviity/@android:label` value is identical to
the `//application/@android:label` value, and thus isn't needed.

This causes a warning from `BuildTest.CheckLintErrorsAndWarnings()`:

	obj/Debug/android/AndroidManifest.xml(12,44): warning XA0102:
	Redundant label can be removed [RedundantLabel]

For now, update `BuildTest.CheckLintErrorsAndWarnings()` to ignore
`RedundantLabel` warnings.

TODO:

Remove support for `dx` and ProGuard.

[0]: https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html
[1]: http://googlesamples.github.io/android-custom-lint-rules/usage/changes.md.html
This commit is contained in:
Jonathan Pryor 2022-06-16 13:40:01 -04:00 коммит произвёл GitHub
Родитель c59b591d6c
Коммит 018121239b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
26 изменённых файлов: 42 добавлений и 115 удалений

Просмотреть файл

@ -190,8 +190,8 @@
<AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
<AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
<AndroidToolExe Condition=" '$(AndroidToolExe)' == '' ">android</AndroidToolExe>
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">5.0</CommandLineToolsFolder>
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">7583922_latest</CommandLineToolsVersion>
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-1.xml -->
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">8129060</EmulatorVersion>

Просмотреть файл

@ -7,6 +7,10 @@ ms.date: 05/18/2020
## Example messages
```
error XA1023: Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.
```
```
warning XA1023: Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.
```
@ -21,7 +25,8 @@ Google has deprecated the DX DEX Compiler in favor of the [D8 DEX
Compiler][d8]. On [February 1, 2021][dx], DX will no longer be a part
of Android SDK or Android Studio.
The DX DEX Compiler will not supported in .NET 6 or higher.
The DX DEX Compiler will not supported in .NET 6 or higher, nor in
Xamarin.Android 12.4 and higher.
[d8]: https://developer.android.com/studio/command-line/d8
[dx]: https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html

2
external/xamarin-android-tools поставляемый

@ -1 +1 @@
Subproject commit ec346d07cf3ac7fc74d08eae4f19043b51485724
Subproject commit 9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef

Просмотреть файл

@ -434,13 +434,9 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</comment>
</data>
<data name="XA1023" xml:space="preserve">
<value>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</value>
<value>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</value>
<comment>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</comment>
</data>
<data name="XA1023_dotnet" xml:space="preserve">
<value>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</value>
<comment>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</comment>
</data>
<data name="XA1024" xml:space="preserve">
<value>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</value>
<comment>The following are literal names and should not be translated: .NET, Xamarin.Android.

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">Používání kompilátoru DX DEX je zastaralé. Nastavte prosím na stránkách vlastností projektu sady Visual Studio kompilátor DEX na d8, nebo upravte soubor projektu v textovém editoru a nastavte vlastnost MSBuildu AndroidDexTool na d8.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Používání kompilátoru DX DEX je zastaralé. Nastavte prosím na stránkách vlastností projektu sady Visual Studio kompilátor DEX na d8, nebo upravte soubor projektu v textovém editoru a nastavte vlastnost MSBuildu AndroidDexTool na d8.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Používání kompilátoru DX DEX se v projektech Xamarin.Androidu, které cílí na .NET 5 nebo vyšší, nepodporuje. Nastavte prosím na stránkách vlastností projektu sady Visual Studio kompilátor DEX na d8, nebo upravte soubor projektu v textovém editoru a nastavte vlastnost MSBuildu AndroidDexTool na d8.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Ignoruje se konfigurační soubor {0}. Konfigurační soubory .NET se v projektech Xamarin.Androidu, které cílí na .NET 5 nebo vyšší, nepodporují.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">Die Verwendung des DX DEX-Compiler ist veraltet. Legen Sie den DEX-Compiler in den Visual Studio-Projekteigenschaftenseiten auf "d8" fest, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidDexTool" auf "d8" fest.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Die Verwendung des DX DEX-Compiler ist veraltet. Legen Sie den DEX-Compiler in den Visual Studio-Projekteigenschaftenseiten auf "d8" fest, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidDexTool" auf "d8" fest.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Die Verwendung des DX DEX-Compilers wird in Xamarin.Android-Projekten für .NET 5 oder höher nicht unterstützt. Legen Sie den DEX-Compiler in den Visual Studio-Projekteigenschaftenseiten auf "d8" fest, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidDexTool" auf "d8" fest.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Die Konfigurationsdatei "{0}" wird ignoriert. .NET-Konfigurationsdateien werden in Xamarin.Android-Projekten für .NET 5 oder höher nicht unterstützt.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">Ya no se admite el uso de ProGuard con el compilador DX DEX. Establezca el compilador DEX en "d8" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo de proyecto en un editor de texto y establezca la propiedad "AndroidLinkTool" de MSBuild en "d8".</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Ya no se admite el uso de ProGuard con el compilador DX DEX. Establezca el compilador DEX en "d8" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo de proyecto en un editor de texto y establezca la propiedad "AndroidLinkTool" de MSBuild en "d8".</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">No se admite el uso del compilador DX DEX en los proyectos de Xamarin.Android destinados a .NET 5 o versiones posteriores. Establezca el compilador DEX en "d8" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo de proyecto en un editor de texto y establezca la propiedad "AndroidDexTool" de MSBuild en "d8".</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Omitiendo el archivo de configuración "{0}". Los archivos de configuración .NET no se admiten en proyectos Xamarin. Android destinados a .NET 5 o versiones posteriores.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">L'utilisation du compilateur DEX DX est dépréciée. Affectez au compilateur DEX la valeur 'd8' dans les pages de propriétés de projet Visual Studio, ou modifiez le fichier projet dans un éditeur de texte, puis affectez la valeur 'd8' à la propriété MSBuild 'AndroidDexTool'.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">L'utilisation du compilateur DEX DX est dépréciée. Affectez au compilateur DEX la valeur 'd8' dans les pages de propriétés de projet Visual Studio, ou modifiez le fichier projet dans un éditeur de texte, puis affectez la valeur 'd8' à la propriété MSBuild 'AndroidDexTool'.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">L'utilisation du compilateur DEX DX n'est pas prise en charge dans les projets Xamarin.Android qui ciblent .NET 5 ou une version ultérieure. Affectez au compilateur DEX la valeur 'd8' dans les pages de propriétés de projet Visual Studio, ou modifiez le fichier projet dans un éditeur de texte, puis affectez la valeur 'd8' à la propriété MSBuild 'AndroidDexTool'.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Fichier config '{0}' ignoré. Les fichiers config .NET ne sont pas pris en charge dans les projets Xamarin.Android qui ciblent .NET 5 ou une version ultérieure.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">L'uso del compilatore DEX DX è deprecato. Impostare il compilatore DEX su 'd8' nelle pagine delle proprietà del progetto di Visual Studio o modificare il file di progetto in un editor di testo e impostare la proprietà 'AndroidDexTool' di MSBuild su 'd8'.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">L'uso del compilatore DEX DX è deprecato. Impostare il compilatore DEX su 'd8' nelle pagine delle proprietà del progetto di Visual Studio o modificare il file di progetto in un editor di testo e impostare la proprietà 'AndroidDexTool' di MSBuild su 'd8'.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">L'uso del compilatore DEX DX non è supportato in progetti Xamarin.Android destinati a .NET 5 o versione successiva. Impostare il compilatore DEX su 'd8' nelle pagine delle proprietà del progetto di Visual Studio o modificare il file di progetto in un editor di testo e impostare la proprietà 'AndroidDexTool' di MSBuild su 'd8'.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Il file di configurazione '{0}' verrà ignorato. I file di configurazione .NET non sono supportati in progetti Xamarin.Android destinati a .NET 5 o versione successiva.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">DX DEX コンパイラは非推奨になりました。Visual Studio プロジェクトのプロパティ ページで DEX コンパイラを 'd8' に設定するか、テキスト エディターでプロジェクト ファイルを編集して 'AndroidDexTool' MSBuild プロパティを 'd8' に設定してください。</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">DX DEX コンパイラは非推奨になりました。Visual Studio プロジェクトのプロパティ ページで DEX コンパイラを 'd8' に設定するか、テキスト エディターでプロジェクト ファイルを編集して 'AndroidDexTool' MSBuild プロパティを 'd8' に設定してください。</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">.NET 5 以降を対象とする Xamarin.Android プロジェクトでは、DX DEX コンパイラの使用はサポートされていません。Visual Studio プロジェクトのプロパティ ページで DEX コンパイラを 'd8' に設定するか、テキスト エディターでプロジェクト ファイルを編集して 'AndroidDexTool' MSBuild プロパティを 'd8' に設定してください。</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">構成ファイル '{0}' を無視しています。.NET 構成ファイルは、.NET 5 以降を対象とする Xamarin.Android プロジェクトではサポートされていません。</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">DX DEX 컴파일러는 사용되지 않습니다. Visual Studio 프로젝트 속성 페이지에서 DEX 컴파일러를 'd8'로 설정하거나 텍스트 편집기에서 프로젝트 파일을 편집하고 'AndroidDexTool' MSBuild 속성을 'd8'로 설정하세요.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">DX DEX 컴파일러는 사용되지 않습니다. Visual Studio 프로젝트 속성 페이지에서 DEX 컴파일러를 'd8'로 설정하거나 텍스트 편집기에서 프로젝트 파일을 편집하고 'AndroidDexTool' MSBuild 속성을 'd8'로 설정하세요.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">DX DEX 컴파일러는 .NET 5 이상을 대상으로 하는 Xamarin.Android 프로젝트에서 사용할 수 없습니다. Visual Studio 프로젝트 속성 페이지에서 DEX 컴파일러를 'd8'로 설정하거나 텍스트 편집기에서 프로젝트 파일을 편집하고 'AndroidDexTool' MSBuild 속성을 'd8'로 설정하세요.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">구성 파일 '{0}'을(를) 무시합니다. .Net 5 이상을 대상으로 Xamarin.Android 프로젝트에서 .NET 구성 파일은 지원되지 않습니다.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">Używanie kompilatora DX DEX jest przestarzałe. Ustaw kompilator DEX na „d8” na stronach właściwości projektu w programie Visual Studio lub edytuj plik projektu w edytorze tekstów i ustaw właściwość programu MSBuild o nazwie „AndroidDexTool” na wartość „d8”.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Używanie kompilatora DX DEX jest przestarzałe. Ustaw kompilator DEX na „d8” na stronach właściwości projektu w programie Visual Studio lub edytuj plik projektu w edytorze tekstów i ustaw właściwość programu MSBuild o nazwie „AndroidDexTool” na wartość „d8”.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Używanie kompilatora DX DEX nie jest obsługiwane w projektach Xamarin.Android, których elementem docelowym jest platforma .NET 5 lub nowsza. Ustaw kompilator DEX na „d8” na stronach właściwości projektu w programie Visual Studio lub edytuj plik projektu w edytorze tekstów i ustaw właściwość programu MSBuild o nazwie „AndroidDexTool” na wartość „d8”.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Ignorowanie pliku konfiguracji „{0}”. Pliki konfiguracji .NET nie są obsługiwane w projektach Xamarin.Android, których elementem docelowym jest platforma .NET 5 lub nowsza.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">O uso do Compilador DX DEX foi preterido. Defina o compilador DEX para 'd8' nas páginas de propriedades do projeto do Visual Studio ou edite o arquivo de projeto em um editor de texto e defina a propriedade 'AndroidDexTool' do MSBuild como 'd8'.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">O uso do Compilador DX DEX foi preterido. Defina o compilador DEX para 'd8' nas páginas de propriedades do projeto do Visual Studio ou edite o arquivo de projeto em um editor de texto e defina a propriedade 'AndroidDexTool' do MSBuild como 'd8'.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Não há suporte para o uso do Compilador DX DEX nos projetos do Xamarin.Android direcionados ao .NET 5 ou superior. Defina o compilador DEX para 'd8' nas páginas de propriedades do projeto do Visual Studio ou edite o arquivo de projeto em um editor de texto e defina a propriedade 'AndroidDexTool' do MSBuild como 'd8'.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Ignorando o arquivo de configuração '{0}'. Não há suporte para arquivos de configuração do .NET em projetos do Xamarin.Android direcionados ao .NET 5 ou posterior.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">Использование DEX-компилятора DX является нерекомендуемым. Установите компилятор DEX "d8" на страницах свойств проекта в Visual Studio или измените файл проекта в текстовом редакторе, задав значение "d8" для свойства MSBuild "AndroidDexTool".</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Использование DEX-компилятора DX является нерекомендуемым. Установите компилятор DEX "d8" на страницах свойств проекта в Visual Studio или измените файл проекта в текстовом редакторе, задав значение "d8" для свойства MSBuild "AndroidDexTool".</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">Использование DEX-компилятора DX больше не поддерживается в проектах Xamarin.Android для .NET 5 и более поздних версий. Установите компилятор DEX "d8" на страницах свойств проекта в Visual Studio или измените файл проекта в текстовом редакторе, задав значение "d8" для свойства MSBuild "AndroidDexTool".</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">Пропуск файла конфигурации "{0}". Файлы конфигурации .NET не поддерживаются в проектах Xamarin.Android для .NET 5 и более поздних версий.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">DX DEX Derleyicisinin kullanılması kullanımdan kaldırıldı. Lütfen Visual Studio projesi özellik sayfalarında DEX derleyicisini 'd8' olarak ayarlayın veya proje dosyasını bir metin düzenleyicide düzenleyip 'AndroidDexTool' MSBuild özelliğini 'd8' olarak ayarlayın.</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">DX DEX Derleyicisinin kullanılması kullanımdan kaldırıldı. Lütfen Visual Studio projesi özellik sayfalarında DEX derleyicisini 'd8' olarak ayarlayın veya proje dosyasını bir metin düzenleyicide düzenleyip 'AndroidDexTool' MSBuild özelliğini 'd8' olarak ayarlayın.</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">.NET 5 veya üzeri bir sürümü hedefleyen Xamarin.Android projelerinde DX DEX Derleyicisinin kullanılması desteklenmiyor. Lütfen Visual Studio projesi özellik sayfalarında DEX derleyicisini 'd8' olarak ayarlayın veya proje dosyasını bir metin düzenleyicide düzenleyip 'AndroidDexTool' MSBuild özelliğini 'd8' olarak ayarlayın.</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">'{0}' yapılandırma dosyası yoksayılıyor. .NET yapılandırma dosyaları, .NET 5 veya üzeri bir sürümü hedefleyen Xamarin.Android projelerinde desteklenmiyor.</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">已弃用 DX DEX 编译器。请在 Visual Studio 项目属性页中将 DEX 编译器设置为 "d8",或者在文本编辑器中编辑项目文件,并将 "AndroidDexTool" MSBuild 属性设置为 "d8"。</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">已弃用 DX DEX 编译器。请在 Visual Studio 项目属性页中将 DEX 编译器设置为 "d8",或者在文本编辑器中编辑项目文件,并将 "AndroidDexTool" MSBuild 属性设置为 "d8"。</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">在面向 .NET 5 或更高版本的 Xamarin.Android 项目中不支持使用 DX DEX 编译器。请在 Visual Studio 项目属性页中将 DEX 编译器设置为 "d8",或者在文本编辑器中编辑项目文件,并将 "AndroidDexTool" MSBuild 属性设置为 "d8"。</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">将忽略配置文件“{0}”。在面向 .NET 5 或更高版本的 Xamarin.Android 项目中不支持 .NET 配置文件。</target>

Просмотреть файл

@ -475,15 +475,10 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The file name of the library</note>
</trans-unit>
<trans-unit id="XA1023">
<source>Using the DX DEX Compiler is deprecated. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="translated">已淘汰使用 DX DEX 編譯器。請在 [Visual Studio 專案] 屬性頁中將 DEX 編譯器設為 'd8',或在文字編輯器中編輯專案檔,並將 'AndroidDexTool' MSBuild 屬性設為 'd8'。</target>
<source>Using the DX DEX Compiler is not supported. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">已淘汰使用 DX DEX 編譯器。請在 [Visual Studio 專案] 屬性頁中將 DEX 編譯器設為 'd8',或在文字編輯器中編輯專案檔,並將 'AndroidDexTool' MSBuild 屬性設為 'd8'。</target>
<note>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1023_dotnet">
<source>Using the DX DEX Compiler is not supported in Xamarin.Android projects that target .NET 6 or higher. Please set the DEX compiler to 'd8' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidDexTool' MSBuild property to 'd8'.</source>
<target state="needs-review-translation">以 .NET 5 或更新版本為目標的 Xamarin.Android 專案不支援使用 DX DEX 編譯器。請在 [Visual Studio 專案] 屬性頁中將 DEX 編譯器設為 'd8',或在文字編輯器中編輯專案檔,並將 'AndroidDexTool' MSBuild 屬性設為 'd8'。</target>
<note>The following are literal names and should not be translated: DX, DEX, Xamarin.Android, .NET 6, d8, AndroidDexTool.</note>
</trans-unit>
<trans-unit id="XA1024">
<source>Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.</source>
<target state="needs-review-translation">忽略組態檔 '{0}'。以 .NET 5 或更新版本為目標的 Xamarin.Android 專案不支援 .NET 組態檔。</target>

Просмотреть файл

@ -2439,7 +2439,7 @@ namespace UnnamedProject
if (TestEnvironment.IsUsingJdk8)
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
string disabledIssues = "StaticFieldLeak,ObsoleteSdkInt,AllowBackup,ExportedReceiver";
string disabledIssues = "StaticFieldLeak,ObsoleteSdkInt,AllowBackup,ExportedReceiver,RedundantLabel";
var proj = new XamarinAndroidApplicationProject () {
PackageReferences = {

Просмотреть файл

@ -135,7 +135,7 @@ namespace Xamarin.Android.Build.Tests
};
using (var b = CreateApkBuilder ()) {
b.ThrowOnBuildFailure = false;
if (Builder.UseDotNet && dexTool == "dx") {
if (dexTool == "dx") {
Assert.IsFalse (b.Build (proj), "build failed");
StringAssertEx.Contains ("XA1023", b.LastBuildOutput, "Output should contain XA1023 errors");
return;

Просмотреть файл

@ -201,8 +201,8 @@ namespace Xamarin.Android.Build.Tests
protected static void AssertDexToolSupported (string dexTool)
{
if (Builder.UseDotNet && dexTool == "dx") {
Assert.Ignore ("dx is not supported in .NET 5+");
if (dexTool == "dx") {
Assert.Ignore ("dx is not supported");
}
}

Просмотреть файл

@ -512,13 +512,9 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
ResourceName="XA1011"
Condition=" '$(AndroidLinkTool)' == 'proguard' And '$(AndroidDexTool)' == 'd8' "
/>
<AndroidWarning Code="XA1023"
ResourceName="XA1023"
Condition=" '$(AndroidDexTool)' == 'dx' and '$(UsingAndroidNETSdk)' != 'true' "
/>
<AndroidError Code="XA1023"
ResourceName="XA1023_dotnet"
Condition=" '$(AndroidDexTool)' == 'dx' and '$(UsingAndroidNETSdk)' == 'true' "
ResourceName="XA1023"
Condition=" '$(AndroidDexTool)' == 'dx' "
/>
<AndroidWarning Code="XA1026"
ResourceName="XA1026"

Просмотреть файл

@ -22,7 +22,6 @@
<MandroidI18n>All</MandroidI18n>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
<_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
<AndroidIncludeWrapSh Condition=" '$(UseASAN)' != '' Or '$(UseUBSAN)' != '' ">true</AndroidIncludeWrapSh>
<_AndroidCheckedBuild Condition=" '$(UseASAN)' != '' ">asan</_AndroidCheckedBuild>

Просмотреть файл

@ -18,7 +18,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
<MandroidI18n>All</MandroidI18n>
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
<AndroidPackageFormat>aab</AndroidPackageFormat>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>

Просмотреть файл

@ -9,7 +9,6 @@
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(XamarinAndroidSourcePath)product.snk</AssemblyOriginatorKeyFile>
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
<_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>$(XamarinAndroidSourcePath)bin\Test$(Configuration)</OutputPath>

Просмотреть файл

@ -19,7 +19,6 @@
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
<MandroidI18n>All</MandroidI18n>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\product.snk</AssemblyOriginatorKeyFile>
<_SkipJniAddNativeMethodRegistrationAttributeScan>True</_SkipJniAddNativeMethodRegistrationAttributeScan>

Просмотреть файл

@ -16,7 +16,6 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<AndroidUseAapt2 Condition="'$(AndroidUseAapt2)' == ''">True</AndroidUseAapt2>
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
<AndroidSupportedAbis Condition=" '$(Enable64BitBuild)' == '' ">armeabi-v7a;x86</AndroidSupportedAbis>
<AndroidSupportedAbis Condition=" '$(Enable64BitBuild)' != '' ">arm64-v8a;x86</AndroidSupportedAbis>
<AndroidEnablePreloadAssemblies Condition=" '$(AndroidEnablePreloadAssemblies)' == '' ">True</AndroidEnablePreloadAssemblies>