diff --git a/Directory.Build.props b/Directory.Build.props index 85c24b55c85..a2dd1312cb9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -44,7 +44,7 @@ 3.1.1 1.0.0 0.11.4 - 13.0.1 + 13.0.3 5.4.0 1.1.11 6.12.0.148 diff --git a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 43d40aa37eb..07183fea021 100644 --- a/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - {1} chybí požadovaná metadata {2}]]> + {1} chybí požadovaný atribut {2}.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + spustilo obnovení NuGet.]]> diff --git a/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 0b6be50bb81..092a4d3f9c6 100644 --- a/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/de/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - "-Element "{1}" fehlen die erforderlichen Metadaten "{2}"]]> + “-Element „{1}“ fehlt das erforderliche Attribut „{2}“.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + ausgeführt wurde.]]> diff --git a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 53997d48643..e6a045c4278 100644 --- a/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - " el elemento "{1}" en los metadatos necesarios "{2}"]]> + + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + .]]> diff --git a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index d47387f7731..cc742b166a4 100644 --- a/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' '{1}' ne contient pas les métadonnées requises '{2}']]> +  » l’élément « {1} » n’a pas l’attribut requis « {2} ».]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + .]]> diff --git a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 5f304f66a4b..0e02820190e 100644 --- a/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/it/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' '{1}' mancano i metadati obbligatori '{2}']]> + ' L’elemento '{1}' non dispone dell'attributo '{2}' richiesto.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + .]]> diff --git a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 58ca38745bf..f677e676b17 100644 --- a/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ja/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' 項目 '{1}' に必要なメタデータ '{2}' がありません]]> + ' アイテム '{1}' には、必要な属性 '{2}' がありません。]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + が追加されてから NuGet の復元が実行されていることを確認します。]]> diff --git a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 980a46dc037..0bc7e43e6c8 100644 --- a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' 항목 '{1}'에 필수 메타데이터 '{2}'이(가) 없습니다.]]> + ' 항목 '{1}'에 필수 특성 '{2}'이(가) 없습니다.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + 이 추가된 이후 NuGet 복원이 실행되었는지 확인합니다.]]> diff --git a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 0e30a224437..48edd4152aa 100644 --- a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ” „{1}” brakuje wymaganych metadanych „{2}”]]> + ” „{1}” brakuje wymaganego atrybutu „{2}”.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + .]]> diff --git a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index e824d4bb83a..bf30bb31f1b 100644 --- a/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - '' item ''{1}'' não tem os metadados necessários ''{2}'']]> + " "{1}" não tem o atributo necessário "{2}".]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + foi adicionado.]]> diff --git a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 2be4b4745cf..d8e84148f3c 100644 --- a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - " "{1}" отсутствуют обязательные метаданные "{2}"]]> + " "{1}" не содержит необходимого атрибута "{2}".]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + .]]> diff --git a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 5d3f24be10b..3b58969d7e7 100644 --- a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' '{1}' öğesinde gerekli '{2}' meta verileri eksik]]> + ', '{1} öğesinde gereken '{2}' özniteliği eksik.]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + eklendikten sonra NuGet Geri Yükleme'nin çalıştırıldığından emin olun.]]> diff --git a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 530821af33c..d645ffe27b8 100644 --- a/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hans/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ”项“{1}”缺少所需的元数据“{2}”]]> + ”项“{1}”缺少必需的特性“{2}”。]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + 后 NuGet 还原已运行。]]> diff --git a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index c1b10dc9ade..aa1adac5008 100644 --- a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -1190,10 +1190,13 @@ - ' item '{1}' is missing required metadata '{2}']]> + ' item '{1}' is missing required attribute '{2}'.]]> - ' 項目 '{1}' 遺漏必要中繼資料 '{2}']]> + ' 項目 '{1}' 缺少必要屬性 '{2}'。]]> + + ' item '{1}' is missing required metadata '{2}']]> + @@ -1217,27 +1220,93 @@ - + - + + + + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + was added.]]> + + 後，已執行 NuGet 還原。]]> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2945aa2ef96..72b69e51698 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - b40c44502deca1e7f51674b97b2d6ca2d5e0abac + dc43d363d284c26cb1b463683d6ebb2c88ab0b58 - + https://github.com/dotnet/runtime - 596a1f7b6429fc06cf71465238cb349cab4edc35 + 17f8138a726b8af269bffc59e9baa12dcb7abca5 - + https://github.com/dotnet/runtime - 596a1f7b6429fc06cf71465238cb349cab4edc35 + 17f8138a726b8af269bffc59e9baa12dcb7abca5 - + https://github.com/dotnet/emsdk - a5f4de78fca42544771977f8e8e04c4aa83e1d02 + 5dd0620274178dd73cac5049e5187c00e07ecf0c - + https://github.com/dotnet/cecil - ba53c75483aa4980a332fa48e61076f80adfec40 + 9c8ea966df62f764523b51772763e74e71040a92 diff --git a/eng/Versions.props b/eng/Versions.props index 7c14218b5df..7fc8a8bc1e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-preview.3.24165.20 - 9.0.0-preview.3.24162.31 - 9.0.0-preview.3.24162.31 + 9.0.100-preview.4.24175.5 + 9.0.0-preview.4.24173.6 + 9.0.0-preview.4.24173.6 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.3.24156.3 + 9.0.0-preview.3.24160.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24158.1 + 0.11.4-alpha.24168.1 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets index c54d20644cc..bebbef71778 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets @@ -212,6 +212,9 @@ _ResolveAssemblies MSBuild target. + + <_AndroidIncludeSystemGlobalizationNative Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' == '' ">true + <_ResolvedNativeLibraries Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.so' " /> diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx index f3791c24b23..376e51eaa50 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx @@ -968,7 +968,7 @@ Pokud chcete pro sestavení z příkazového řádku použít vlastní cestu JDK - '<{0}>' item '{1}' is missing required attribute '{2}'. + V položce <{0}> {1} chybí požadovaný atribut {2}. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Pokud chcete pro sestavení z příkazového řádku použít vlastní cestu JDK {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Nelze stáhnout soubor POM pro artefakt Maven {0}. - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Pokud chcete pro sestavení z příkazového řádku použít vlastní cestu JDK The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Závislosti Java {0} není vyhověno. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Závislosti Java {0} není vyhověno. Microsoft spravuje balíček NuGet {1}, který by mohl této závislosti vyhovět. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + Atribut {0} je vyžadován při použití {1} pro položku {2} {3}. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + Atribut {0} nemůže být pro položku {1} {2} prázdný. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Zadaný soubor POM {0} neexistuje. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + Nepovedlo se parsovat soubor POM {0}. - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Nepovedlo se přeložit soubor POM pro artefakt {0}. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + V souboru zámku se nepovedlo najít balíček NuGet {0} verze {1}. Ujistěte se, že se od přidání tohoto <PackageReference> spustilo obnovení NuGet. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx index 317d16757fa..925a2c51a38 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx @@ -968,7 +968,7 @@ Um einen benutzerdefinierten JDK-Pfad für einen Befehlszeilenbuild zu verwenden - '<{0}>' item '{1}' is missing required attribute '{2}'. + Für das „<{0}>“-Element „{1}“ fehlt das erforderliche Attribut „{2}“. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,8 +991,8 @@ Um einen benutzerdefinierten JDK-Pfad für einen Befehlszeilenbuild zu verwenden {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. -- {1} + Die POM-Datei für das Maven-Artefakt „{0}“ kann nicht heruntergeladen werden. +– {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id {1} - The HttpClient reported download exception message @@ -1014,47 +1014,47 @@ Um einen benutzerdefinierten JDK-Pfad für einen Befehlszeilenbuild zu verwenden The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Java-Abhängigkeit „{0}“ wurde nicht erfüllt. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Java-Abhängigkeit „{0}“ wurde nicht erfüllt. Microsoft verwaltet das NuGet-Paket „{1}“, das diese Abhängigkeit erfüllen könnte. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + Das Attribut „{0}“ ist erforderlich, wenn „{1}“ für das „{2}“-Element „{3}“ verwendet wird. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + Das Attribut „{0}“ darf für das „{1}“-Element „{2}“ nicht leer sein. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Die angegebene POM-Datei „{0}“ ist nicht vorhanden. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. -- {1} + Die POM-Datei „{0}“ konnte nicht analysiert werden. +– {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Die POM-Datei für das Artefakt „{0}“ konnte nicht aufgelöst werden. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Das NuGet-Paket „{0}“ der Version „{1}“ wurde in der Sperrdatei nicht gefunden. Stellen Sie sicher, dass die NuGet-Wiederherstellung seit dem Hinzufügen dieser <PackageReference> ausgeführt wurde. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx index bd609097665..2911162d5e3 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx @@ -968,7 +968,7 @@ Para usar una ruta de acceso de JDK personalizada para una compilación de líne - '<{0}>' item '{1}' is missing required attribute '{2}'. + El elemento "{0}" "{1}" no tiene el atributo "{2}" requerido {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Para usar una ruta de acceso de JDK personalizada para una compilación de líne {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + No se puede descargar el archivo POM para el artefacto de Maven "{0}". - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Para usar una ruta de acceso de JDK personalizada para una compilación de líne The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + No se cumple la dependencia de Java "{0}". The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + No se cumple la dependencia de Java "{0}". Microsoft mantiene el paquete NuGet "{1}" que podría satisfacer esta dependencia. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + Se requiere el atributo "{0}" cuando se usa "{1}" para el elemento "{2}" "{3}". {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + El atributo "{0}" no puede estar vacío para el elemento "{1}" "{2}". {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + El archivo POM especificado "{0}" no existe. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + No se pudo analizar el archivo POM "{0}". - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + No se pudo resolver el archivo POM para el artefacto "{0}". The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + No se encontró el paquete NuGet "{0}" versión "{1}" en el archivo de bloqueo. Asegúrese de que la restauración de NuGet se ha ejecutado desde que se agregó esta <PackageReference>. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx index 5a84540c68e..20a65b7c017 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx @@ -968,7 +968,7 @@ Pour utiliser un chemin JDK personnalisé pour une build de ligne de commande, d - '<{0}>' item '{1}' is missing required attribute '{2}'. + « <{0}> » l’élément « {1} » n’a pas l’attribut requis « {2} ». {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Pour utiliser un chemin JDK personnalisé pour une build de ligne de commande, d {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Impossible de télécharger le fichier POM pour l’artefact Maven « {0} ». - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Pour utiliser un chemin JDK personnalisé pour une build de ligne de commande, d The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + La dépendance Java « {0} » n’est pas satisfaite. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + La dépendance Java « {0} » n’est pas satisfaite. Microsoft gère le package NuGet « {1} » qui pourrait satisfaire cette dépendance. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + Un attribut « {0} » est requis lors de l’utilisation de « {1} » pour l’élément « {2} » « {3} ». {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + L’attribut « {0} » ne peut pas être vide pour « {1} », élément « {2} ». {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Le fichier POM « {0} » spécifié n’existe pas. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + Impossible d’analyser le fichier POM « {0} ». - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Impossible de résoudre le fichier POM pour l'artefact « {0} ». The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Package NuGet « {0} » version « {1} » introuvable dans le fichier de verrouillage. Vérifiez que la restauration NuGet s’est exécutée depuis l’ajout de ce <PackageReference>. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx index 74834fccfaf..c99f5421d1b 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx @@ -968,7 +968,7 @@ Per usare un percorso JDK personalizzato per una compilazione della riga di coma - '<{0}>' item '{1}' is missing required attribute '{2}'. + '<{0}>' L’elemento '{1}' non dispone dell'attributo '{2}' richiesto. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Per usare un percorso JDK personalizzato per una compilazione della riga di coma {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Non è possibile scaricare il file POM per l'artefatto Maven '{0}'. - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Per usare un percorso JDK personalizzato per una compilazione della riga di coma The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + La dipendenza Java '{0}' non è soddisfatta. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + La dipendenza Java '{0}' non è soddisfatta. Microsoft gestisce il pacchetto NuGet '{1}' che può soddisfare questa dipendenza. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + L'attributo '{0}' è obbligatorio quando si usa '{1}' per '{2}' l’elemento '{3}'. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + L'attributo '{0}' non può essere vuoto per '{1}' l’elemento '{2}'. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Il file POM '{0}' specificato non esiste. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + Non è stato possibile analizzare file POM '{0}'. - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Non è stato possibile risolvere il file POM per l'artefatto '{0}'. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Non è stato possibile trovare il pacchetto NuGet '{0}' versione '{1}' nel file di blocco. Verificare che il ripristino NuGet sia stato eseguito dopo l'aggiunta di questo <PackageReference>. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx index 59feff70257..957c132ec53 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx @@ -969,7 +969,7 @@ In this message, the term "handheld app" means "app for handheld devices." - '<{0}>' item '{1}' is missing required attribute '{2}'. + '<{0}>' アイテム '{1}' には、必要な属性 '{2}' がありません。 {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -992,7 +992,7 @@ In this message, the term "handheld app" means "app for handheld devices." {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Maven 成果物 '{0}' の POM ファイルをダウンロードできません。 - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1015,47 +1015,47 @@ In this message, the term "handheld app" means "app for handheld devices." The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Java 依存関係 '{0}' が満たされていません。 The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Java 依存関係 '{0}' が満たされていません。Microsoft は、この依存関係を満たす可能性のある NuGet パッケージ '{1}' を保持しています。 The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + '{2}' 項目 '{3}' に '{1}' を使用する場合は、属性 '{0}' が必要です。 {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + '{1}' アイテム '{2}' の属性 '{0}' を空にすることはできません。 {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + 指定された POM ファイル '{0}' は存在しません。 The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + POM ファイル '{0}' を解析できませんでした。 - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + 成果物 '{0}' の POM ファイルを解決できませんでした。 The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + NuGet パッケージ '{0}' バージョン '{1}' がロック ファイルに見つかりませんでした。この <PackageReference> が追加されてから NuGet の復元が実行されていることを確認します。 The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx index 507b88baae1..fee33d6527e 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx @@ -968,7 +968,7 @@ In this message, the term "handheld app" means "app for handheld devices." - '<{0}>' item '{1}' is missing required attribute '{2}'. + '<{0}>' 항목 '{1}'에 필수 특성 '{2}'이(가) 없습니다. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ In this message, the term "handheld app" means "app for handheld devices." {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Maven 아티팩트 '{0}'에 대한 POM 파일 다운로드할 수 없습니다. - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ In this message, the term "handheld app" means "app for handheld devices." The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Java 종속성 '{0}'이(가) 충족되지 않습니다. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Java 종속성 '{0}'이(가) 충족되지 않습니다. Microsoft는 이 종속성을 충족할 수 있는 NuGet 패키지 '{1}'을(를) 유지 관리합니다. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + '{2}' item '{3}'에 대해 '{1}'을(를) 사용하는 경우 '{0}' 특성이 필요합니다. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + '{1}' 항목 '{2}'에 대해 특성 '{0}'을(를) 비워 둘 수 없습니다. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + 지정한 POM 파일 '{0}'이(가) 없습니다. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + POM 파일 '{0}'을(를) 구문 분석할 수 없습니다. - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + 아티팩트 '{0}'에 대한 POM 파일 확인할 수 없습니다. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + 잠금 파일에서 NuGet 패키지 '{0}' 버전 '{1}'을(를) 찾을 수 없습니다. 이 <PackageReference>이 추가된 이후 NuGet 복원이 실행되었는지 확인합니다. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx index 172fbcecb81..5fb67462611 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx @@ -968,7 +968,7 @@ Aby użyć niestandardowej ścieżki zestawu JDK dla kompilacji wiersza poleceni - '<{0}>' item '{1}' is missing required attribute '{2}'. + W elemencie „<{0}>” „{1}” brakuje wymaganego atrybutu „{2}”. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,8 +991,8 @@ Aby użyć niestandardowej ścieżki zestawu JDK dla kompilacji wiersza poleceni {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. -- {1} + Nie można pobrać pliku POM dla artefaktu Maven „{0}”. +— {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id {1} - The HttpClient reported download exception message @@ -1014,47 +1014,47 @@ Aby użyć niestandardowej ścieżki zestawu JDK dla kompilacji wiersza poleceni The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Zależność Java „{0}” nie jest spełniona. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Zależność Java „{0}” nie jest spełniona. Firma Microsoft utrzymuje pakiet NuGet „{1}”, który może spełnić tę zależność. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + Atrybut „{0}” jest wymagany w przypadku używania elementu „{1}” dla elementu „{2}” „{3}”. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + Atrybut „{0}” nie może być pusty dla elementu „{1}” „{2}”. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Określony plik POM „{0}” nie istnieje. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. -- {1} + Nie można przeanalizować pliku POM „{0}”. +— {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Nie można rozpoznać pliku POM dla artefaktu „{0}”. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Nie można odnaleźć wersji „{1}” pakietu NuGet „{0}” w pliku blokady. Upewnij się, że narzędzie NuGet Restore zostało uruchomione od czasu dodania tego pakietu <PackageReference>. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx index ba3736e8cc7..3b7d5a7a3a0 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx @@ -968,7 +968,7 @@ Para usar um caminho JDK personalizado para um build de linha de comando, defina - '<{0}>' item '{1}' is missing required attribute '{2}'. + O item "<{0}>" "{1}" não tem o atributo necessário "{2}". {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Para usar um caminho JDK personalizado para um build de linha de comando, defina {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + Não é possível baixar o arquivo POM para o artefato Maven "{0}". - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Para usar um caminho JDK personalizado para um build de linha de comando, defina The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + A dependência de Java "{0}" não foi atendida. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + A dependência de Java "{0}" não foi atendida. A Microsoft mantém o pacote NuGet "{1}" que pode atender a essa dependência. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + O atributo "{0}" é necessário ao usar "{1}" para o item "{2}" "{3}". {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + O atributo "{0}" não pode estar vazio para o item "{1}" "{2}". {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + O arquivo POM especificado "{0}" não existe. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + Não foi possível analisar o arquivo POM "{0}". - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Não foi possível resolver o arquivo POM para o artefato "{0}". The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Não foi possível localizar o pacote NuGet "{0}" versão "{1}" no arquivo de bloqueio. Certifique-se de que a restauração do NuGet tenha sido executada desde que <PackageReference> foi adicionado. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx index 92ec45f2360..bf7d7705c6c 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx @@ -968,7 +968,7 @@ In this message, the term "handheld app" means "app for handheld devices." - '<{0}>' item '{1}' is missing required attribute '{2}'. + Элемент "<{0}>" "{1}" не содержит необходимого атрибута "{2}". {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,8 +991,8 @@ In this message, the term "handheld app" means "app for handheld devices." {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. -- {1} + Не удается скачать файл POM для артефакта Maven "{0}". +— {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id {1} - The HttpClient reported download exception message @@ -1014,47 +1014,47 @@ In this message, the term "handheld app" means "app for handheld devices." The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + Зависимость Java "{0}" не удовлетворена. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + Зависимость Java "{0}" не удовлетворена. Корпорация Майкрософт поддерживает пакет NuGet "{1}", который может выполнить эту зависимость. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + При использовании "{1}" для элемента "{2}" "{3}" требуется атрибут "{0}". {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + Атрибут "{0}" не может быть пустым для элемента "{1}" "{2}". {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Указанный файл POM "{0}" не существует. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. -- {1} + Не удалось проанализировать файл POM "{0}". +— {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + Не удалось разрешить файл POM для артефакта "{0}". The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + Не удалось найти пакет NuGet "{0}" версии "{1}" в файле блокировки. Убедитесь, что восстановление NuGet запущено с момента добавления <PackageReference>. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx index 7351d045590..6b1ad7b8383 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx @@ -968,7 +968,7 @@ Bir komut satırı derlemesi için özel bir SDK yolu kullanmak için 'JavaSdkDi - '<{0}>' item '{1}' is missing required attribute '{2}'. + '<{0}>', '{1} öğesinde gereken '{2}' özniteliği eksik. {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ Bir komut satırı derlemesi için özel bir SDK yolu kullanmak için 'JavaSdkDi {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + '{0}' Maven yapıtı için POM dosyası indirilemiyor. - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ Bir komut satırı derlemesi için özel bir SDK yolu kullanmak için 'JavaSdkDi The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + '{0}' Java bağımlılığı karşılanmadı. The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + '{0}' Java bağımlılığı karşılanmadı. Microsoft, bu bağımlılığı karşılayan '{1}' NuGet paketini korur. The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + '{0}' özniteliği '{2}', '{3}' öğesi için '{1}' kullanılırken gereklidir. {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + '{0}' özniteliği '{1}', '{2}' öğesi için boş olamaz. {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + Belirtilen '{0}' POM dosyası yok. The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + '{0}' POM dosyası ayrıştırılamadı. - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + '{0}' yapıt kimliği için POM dosyası çözümlenemedi. The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + '{0}' NuGet paketi '{1}' sürümü kilit dosyasında bulunamadı. Bu <PackageReference> eklendikten sonra NuGet Geri Yükleme'nin çalıştırıldığından emin olun. The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx index 3cb9de7df87..10dffd219c4 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx @@ -968,7 +968,7 @@ In this message, the term "handheld app" means "app for handheld devices." - '<{0}>' item '{1}' is missing required attribute '{2}'. + “<{0}>”项“{1}”缺少必需的特性“{2}”。 {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ In this message, the term "handheld app" means "app for handheld devices." {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + 无法下载 Maven 项目“{0}”的 POM 文件。 - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ In this message, the term "handheld app" means "app for handheld devices." The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + 不满足 Java 依赖项“{0}”。 The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + 不满足 Java 依赖项“{0}”。Microsoft 将维护可以满足此依赖项的 NuGet 包“{1}”。 The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + 对“{2}”项“{3}”使用“{1}”时，需要属性“{0}”。 {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + “{1}”项“{2}”的属性“{0}”不能为空。 {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + 指定的POM 文件“{0}”不存在。 The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + 无法分析 POM 文件“{0}”。 - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + 无法解析项目“{0}”的POM 文件。 The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + 在锁定文件中找不到 NuGet 包“{0}”版本“{1}”。确保自添加此 <PackageReference> 后 NuGet 还原已运行。 The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx index e1874db294f..e84a1211910 100644 --- a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx +++ b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx @@ -968,7 +968,7 @@ In this message, the term "handheld app" means "app for handheld devices." - '<{0}>' item '{1}' is missing required attribute '{2}'. + '<{0}>' 項目 '{1}' 缺少必要屬性 '{2}'。 {0} - The MSBuild ItemGroup Item name {1} - The MSBuild Item ItemSpec {2} - The omitted MSBuild Item metadata attribute @@ -991,7 +991,7 @@ In this message, the term "handheld app" means "app for handheld devices." {5} - The HttpClient provided download exception message - Cannot download POM file for Maven artifact '{0}'. + 無法下載 Maven 成品 '{0}' 的 POM 檔案。 - {1} The following are literal names and should not be translated: POM, Maven {0} - Maven artifact id @@ -1014,47 +1014,47 @@ In this message, the term "handheld app" means "app for handheld devices." The following are literal names and should not be translated: Android Support, AndroidX, .NET. - Java dependency '{0}' is not satisfied. + 無法滿足 JAVA 相依性 '{0}'。 The following are literal names and should not be translated: Java. {0} - Maven dependency id - Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency. + 無法滿足 JAVA 相依性 '{0}'。Microsoft 會維護可以滿足此相依性的 NuGet 套件 '{1}'。 The following are literal names and should not be translated: Java, Microsoft, NuGet. {0} - Maven dependency id {1} - NuGet package id - Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'. + 為 '{2}' 項目 '{3}' 使用 '{1}' 時，需要屬性 '{0}'。 {0}, {1} - MSBuild XML attribute {2} - MSBuild XML element name {3} - MSBuild ItemSpec value - Attribute '{0}' cannot be empty for '{1}' item '{2}'. + '{1}' 項目 '{2}' 的屬性 '{0}' 不能空白。 {0} - MSBuild XML attribute {1} - MSBuild XML element name {2} - MSBuild ItemSpec value - Specified POM file '{0}' does not exist. + 指定的 POM 檔案 '{0}' 不存在。 The following are literal names and should not be translated: POM. {0} - File path to POM file - Could not parse POM file '{0}'. + 無法剖析 POM 檔案 '{0}'。 - {1} The following are literal names and should not be translated: POM. {0} - File path to POM file {1} - Exception message - Could not resolve POM file for artifact '{0}'. + 無法解析成品 '{0}' 的 POM 檔案。 The following are literal names and should not be translated: POM. {0} - Java artifact id - Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added. + 在鎖定檔案中找不到 NuGet 套件 '{0}' 版本 '{1}'。請確認自新增此 <PackageReference> 後，已執行 NuGet 還原。 The following are literal names and should not be translated: NuGet, PackageReference. {0} - NuGet package id {1} - NuGet package version diff --git a/src/Xamarin.Android.Build.Tasks/Resources/LayoutBinding.cs b/src/Xamarin.Android.Build.Tasks/Resources/LayoutBinding.cs index 457c91add45..3f18da73069 100644 --- a/src/Xamarin.Android.Build.Tasks/Resources/LayoutBinding.cs +++ b/src/Xamarin.Android.Build.Tasks/Resources/LayoutBinding.cs @@ -1,27 +1,29 @@ -using System; +#nullable enable + +using System; using System.Diagnostics.CodeAnalysis; using Android.App; using Android.Views; namespace Xamarin.Android.Design { - public delegate Java.Lang.Object OnLayoutItemNotFoundHandler (int resourceId, Type expectedViewType); + public delegate Java.Lang.Object? OnLayoutItemNotFoundHandler (int resourceId, Type expectedViewType); abstract class LayoutBinding { const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors; - Activity boundActivity; - View boundView; - OnLayoutItemNotFoundHandler onLayoutItemNotFound; + Activity? boundActivity; + View? boundView; + OnLayoutItemNotFoundHandler? onLayoutItemNotFound; - protected LayoutBinding (Activity activity, OnLayoutItemNotFoundHandler onLayoutItemNotFound = null) + protected LayoutBinding (Activity activity, OnLayoutItemNotFoundHandler? onLayoutItemNotFound = null) { boundActivity = activity ?? throw new ArgumentNullException (nameof (activity)); this.onLayoutItemNotFound = onLayoutItemNotFound; } - protected LayoutBinding (View view, OnLayoutItemNotFoundHandler onLayoutItemNotFound = null) + protected LayoutBinding (View view, OnLayoutItemNotFoundHandler? onLayoutItemNotFound = null) { boundView = view ?? throw new ArgumentNullException (nameof (view)); this.onLayoutItemNotFound = onLayoutItemNotFound; @@ -38,14 +40,14 @@ protected T FindView < if (cachedField != null) return cachedField; - T ret; + T? ret = null; if (boundActivity != null) ret = boundActivity.FindViewById (resourceId); - else + else if (boundView != null) ret = boundView.FindViewById (resourceId); if (ret == null && onLayoutItemNotFound != null) - ret = (T)onLayoutItemNotFound (resourceId, typeof (T)); + ret = (T?)onLayoutItemNotFound (resourceId, typeof (T)); if (ret == null) throw new global::System.InvalidOperationException ($"View not found (Resource ID: {resourceId})"); @@ -71,8 +73,8 @@ T __FindFragment< T > ( int resourceId, - Func finder, - ref T cachedField) + Func finder, + ref T? cachedField) where T: Java.Lang.Object { if (cachedField != null) @@ -80,7 +82,7 @@ T __FindFragment< var ret = finder (EnsureActivity ()); if (ret == null && onLayoutItemNotFound != null) - ret = (T)onLayoutItemNotFound (resourceId, typeof (T)); + ret = (T?)onLayoutItemNotFound (resourceId, typeof (T)); if (ret == null) throw new InvalidOperationException ($"Fragment not found (ID: {resourceId}; Type: {typeof (T)})"); @@ -89,29 +91,25 @@ T __FindFragment< return ret; } #if __ANDROID_11__ +#pragma warning disable CA1422 protected T FindFragment< [DynamicallyAccessedMembers (Constructors)] T > ( int resourceId, - global::Android.App.Fragment __ignoreMe, - ref T cachedField + global::Android.App.Fragment? __ignoreMe, + ref T? cachedField ) where T: global::Android.App.Fragment { - return __FindFragment (resourceId, (activity) => activity.FragmentManager.FindFragmentById (resourceId), ref cachedField); + return __FindFragment (resourceId, (activity) => activity.FragmentManager?.FindFragmentById (resourceId), ref cachedField); } +#pragma warning restore CA1422 #endif // __ANDROID_11__ -#if __HAVE_SUPPORT__ - protected T FindFragment (int resourceId, global::Android.Support.V4.App.Fragment __ignoreMe, ref T cachedField) where T: global::Android.Support.V4.App.Fragment - { - return __FindFragment (resourceId, (activity) => activity.FragmentManager.FindFragmentById (resourceId), ref cachedField); - } -#endif // __HAVE_SUPPORT__ - #if __HAVE_ANDROIDX__ - protected T FindFragment (int resourceId, global::AndroidX.Fragment.App.Fragment __ignoreMe, ref T cachedField) where T: global::AndroidX.Fragment.App.Fragment + protected T FindFragment (int resourceId, global::AndroidX.Fragment.App.Fragment? __ignoreMe, ref T? cachedField) + where T : global::AndroidX.Fragment.App.Fragment { return __FindFragment(resourceId, (activity) => { if (activity is AndroidX.Fragment.App.FragmentActivity activity_) { diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.BindingGenerator.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.BindingGenerator.cs index b404d91156e..a31cecb1c08 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.BindingGenerator.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.BindingGenerator.cs @@ -30,8 +30,6 @@ public sealed class State // generating code for the partial Activity class public string BindingClassName { get; } - public bool LinkerPreserveConstructors { get; set; } - public List ExtraImportNamespaces { get; } = new List (); public string AndroidFragmentType { get; } @@ -155,20 +153,18 @@ protected virtual void WriteOnSetContentViewPartials (State state) WritePartialClassOnSetContentViewPartial_Int (state); } - public State BeginBindingFile (StreamWriter writer, string layoutResourceId, string classNamespace, string className, string androidFragmentType, bool linkerPreserveConstructors = true) + public State BeginBindingFile (StreamWriter writer, string layoutResourceId, string classNamespace, string className, string androidFragmentType) { - var state = new State (writer, className, !String.IsNullOrWhiteSpace (classNamespace), androidFragmentType) { - LinkerPreserveConstructors = linkerPreserveConstructors - }; + var state = new State (writer, className, !String.IsNullOrWhiteSpace (classNamespace), androidFragmentType); BeginBindingFile (state, layoutResourceId, classNamespace, className); - WriteBindingConstructors (state, className, state.LinkerPreserveConstructors); + WriteBindingConstructors (state, className); return state; } protected abstract void BeginBindingFile (State state, string layoutResourceId, string classNamespace, string className); public abstract void EndBindingFile (State state); - protected abstract void WriteBindingConstructors (State state, string className, bool linkerPreserve); + protected abstract void WriteBindingConstructors (State state, string className); protected abstract void WriteBindingViewProperty (State state, LayoutWidget widget, string resourceNamespace); protected abstract void WriteBindingFragmentProperty (State state, LayoutWidget widget, string resourceNamespace); protected abstract void WriteBindingMixedProperty (State state, LayoutWidget widget, string resourceNamespace); @@ -287,10 +283,11 @@ protected void WriteBindingPropertyBackingField (State state, LayoutWidget widge WriteResetLocation (state); } - public void WriteComment (State state, string text) + public void WriteComment (State state, params string [] text) { EnsureArgument (state, nameof (state)); - WriteLineIndent (state, $"{LineCommentString}{text}"); + foreach (string line in text) + WriteLineIndent (state, $"{LineCommentString}{line}"); } public void WriteComment (State state, ICollection lines) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs index bc2b9ff6db4..92372d223e7 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.CSharpBindingGenerator.cs @@ -157,8 +157,33 @@ void WriteClassClose (State state) WriteLineIndent (state, "}"); } + void WriteDisableWarnings (State state) + { + state.WriteLine ("#pragma warning disable CS8981"); + state.WriteLine ("#pragma warning disable CS1591"); + } + + void WriteEnableWarnings (State state) + { + state.WriteLine ("#pragma warning restore CS1591"); + state.WriteLine ("#pragma warning restore CS8981"); + } + + void WriteAutoGeneratedComment (State state) + { + state.WriteLine (@"//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------"); + } + void WriteFilePreamble (State state, string classNamespace) { + WriteAutoGeneratedComment (state); WriteUsings (state); state.WriteLine (); WriteNamespaceOpen (state, classNamespace); @@ -172,6 +197,7 @@ void WriteNamespaceOpen (State state, string classNamespace) state.WriteLine ($"namespace {classNamespace}"); state.WriteLine ("{"); state.IncreaseIndent (); + WriteDisableWarnings (state); } void WriteNamespaceClose (State state) @@ -179,6 +205,7 @@ void WriteNamespaceClose (State state) if (!state.IsInNamespace) return; + WriteEnableWarnings (state); state.DecreaseIndent (); state.WriteLine ("}"); } @@ -200,15 +227,14 @@ void WriteUsing (State state, string ns) state.WriteLine ($"using global::{ns};"); } - protected override void WriteBindingConstructors (State state, string className, bool linkerPreserve) + protected override void WriteBindingConstructors (State state, string className) { - WriteConstructor (state, className, "Android.App.Activity", linkerPreserve); - WriteConstructor (state, className, "Android.Views.View", linkerPreserve); + WriteConstructor (state, className, "Android.App.Activity"); + WriteConstructor (state, className, "Android.Views.View"); } - void WriteConstructor (State state, string className, string clientType, bool linkerPreserve) + void WriteConstructor (State state, string className, string clientType) { - WritePreserveAtribute (state, linkerPreserve); WriteLineIndent (state, $"public {className} ("); state.IncreaseIndent (); WriteLineIndent (state, $"global::{clientType} client,"); @@ -221,14 +247,6 @@ void WriteConstructor (State state, string className, string clientType, bool li state.WriteLine (); } - void WritePreserveAtribute (State state, bool linkerPreserve) - { - if (!linkerPreserve) - return; - - WriteLineIndent (state, $"[global::Android.Runtime.PreserveAttribute (Conditional=true)]"); - } - public override void EndBindingFile (State state) { EnsureArgument (state, nameof (state)); diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerIntermediateClass.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerIntermediateClass.cs index b6d89a6aaf6..22f9d4cf338 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerIntermediateClass.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateResourceDesignerIntermediateClass.cs @@ -24,6 +24,10 @@ public class GenerateResourceDesignerIntermediateClass : AndroidTask namespace %NAMESPACE% { #pragma warning disable IDE0002 + /// + /// Android Resource Designer class. + /// Exposes the Android Resource designer assembly into the project Namespace. + /// public partial class Resource : %BASECLASS% { } #pragma warning restore IDE0002 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 83d47a85bdc..1f5cff5a437 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -257,9 +257,15 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex proj.PackageReferences.Add (new Package { Id = "BenchmarkDotNet", Version = "0.13.1" }); proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download proj.SetProperty ("AndroidPackageFormat", packageFormat); + proj.SetProperty ("TrimmerSingleWarn", "false"); using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); - b.AssertHasNoWarnings (); + // FIXME: https://github.com/dotnet/runtime/issues/100256 + if (!xamarinForms && isRelease) { + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 4 Warning(s)"), $"{b.BuildLogFile} should have 4 MSBuild warnings."); + } else { + b.AssertHasNoWarnings (); + } Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"), "Should not get a warning from the task."); var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs index b79a61409d8..59a6d1742ed 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs @@ -339,6 +339,7 @@ void SuccessfulBuild_AndroidX (TestProjectInfo testInfo, bool many, bool dtb, Lo CopyLogs (testInfo, true); Assert.That (success, Is.True, "Build should have succeeded"); + Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings."); CopyGeneratedFiles (testInfo); @@ -508,7 +509,8 @@ string GetBuildTarget (bool isDTB) string[] GetBuildProperties (LocalBuilder builder, bool manyBuild, bool dtbBuild, bool referenceAndroidX, params string[] extraConstants) { var ret = new List { - "AndroidGenerateLayoutBindings=true" + "AndroidGenerateLayoutBindings=true", + "\"NoWarn=CS0414;CA1416;CS1591;XA1005;XA4225\"" }; if (manyBuild) ret.Add ("ForceParallelBuild=true"); 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 8864d67f6a3..54fb5b35130 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 @@ -37,12 +37,17 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", " Assert.IsTrue (dotnet.New ("android-layout", Path.Combine (dotnet.ProjectDirectory, "Resources", "layout")), "`dotnet new android-layout` should succeed"); // Debug build - Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Debug" }), "`dotnet build` should succeed"); + Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Debug", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed"); dotnet.AssertHasNoWarnings (); // Release build - Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release" }), "`dotnet build` should succeed"); - dotnet.AssertHasNoWarnings (); + Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed"); + // FIXME: https://github.com/dotnet/runtime/issues/100256 + if (template.Contains ("lib")) { + dotnet.AssertHasNoWarnings (); + } else { + Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 4 Warning(s)"), $"{dotnet.BuildLogFile} should have 4 MSBuild warnings."); + } } static readonly object[] DotNetPackTargetFrameworks = new object[] { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index 5886262970d..f72d4cc5633 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -5,70 +5,73 @@ "Size": 3036 }, "classes.dex": { - "Size": 377684 + "Size": 377764 }, "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": { "Size": 1027 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 63889 + "Size": 64234 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 90449 + "Size": 91668 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5145 + "Size": 5222 }, "lib/arm64-v8a/lib_System.Console.dll.so": { - "Size": 6541 + "Size": 6548 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 8647 + "Size": 8483 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 553289 + "Size": 566421 }, "lib/arm64-v8a/lib_System.Runtime.dll.so": { - "Size": 2545 + "Size": 2552 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4022 + "Size": 4025 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { - "Size": 2932 + "Size": 2934 }, "lib/arm64-v8a/libarc.bin.so": { "Size": 1512 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 87080 + "Size": 87352 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 355872 + "Size": 354064 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3185656 + "Size": 3132992 + }, + "lib/arm64-v8a/libSystem.Globalization.Native.so": { + "Size": 67248 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 94504 + "Size": 94720 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 155560 + "Size": 155568 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 12336 + "Size": 12656 }, "META-INF/BNDLTOOL.RSA": { "Size": 1221 }, "META-INF/BNDLTOOL.SF": { - "Size": 3147 + "Size": 3266 }, "META-INF/MANIFEST.MF": { - "Size": 3020 + "Size": 3139 }, "res/drawable-hdpi-v4/icon.png": { "Size": 2178 @@ -95,5 +98,5 @@ "Size": 1904 } }, - "PackageSize": 2668984 + "PackageSize": 2689557 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc index 015199489b9..2d232c645fb 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc @@ -5,10 +5,10 @@ "Size": 6652 }, "classes.dex": { - "Size": 9418292 + "Size": 9440180 }, "classes2.dex": { - "Size": 150904 + "Size": 150920 }, "kotlin/annotation/annotation.kotlin_builtins": { "Size": 928 @@ -38,127 +38,127 @@ "Size": 8090 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 72360 + "Size": 72397 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 456663 + "Size": 458327 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5145 + "Size": 5222 }, "lib/arm64-v8a/lib_mscorlib.dll.so": { - "Size": 3992 + "Size": 3998 }, "lib/arm64-v8a/lib_netstandard.dll.so": { - "Size": 5625 + "Size": 5631 }, "lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": { "Size": 11520 }, "lib/arm64-v8a/lib_System.Collections.dll.so": { - "Size": 15411 + "Size": 15413 }, "lib/arm64-v8a/lib_System.Collections.NonGeneric.dll.so": { - "Size": 7442 + "Size": 7441 }, "lib/arm64-v8a/lib_System.ComponentModel.dll.so": { - "Size": 1935 + "Size": 1941 }, "lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": { - "Size": 2549 + "Size": 2555 }, "lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": { - "Size": 6084 + "Size": 6089 }, "lib/arm64-v8a/lib_System.Console.dll.so": { - "Size": 6576 + "Size": 6580 }, "lib/arm64-v8a/lib_System.Core.dll.so": { - "Size": 1969 + "Size": 1976 }, "lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": { - "Size": 9060 + "Size": 9065 }, "lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": { - "Size": 6543 + "Size": 6552 }, "lib/arm64-v8a/lib_System.dll.so": { - "Size": 2326 + "Size": 2331 }, "lib/arm64-v8a/lib_System.Drawing.dll.so": { - "Size": 1932 + "Size": 1937 }, "lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": { - "Size": 11965 + "Size": 11968 }, "lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": { - "Size": 11187 + "Size": 11190 }, "lib/arm64-v8a/lib_System.IO.Compression.dll.so": { "Size": 15864 }, "lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": { - "Size": 9895 + "Size": 9897 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 20514 + "Size": 20166 }, "lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": { - "Size": 164629 + "Size": 164751 }, "lib/arm64-v8a/lib_System.Net.Http.dll.so": { - "Size": 67561 + "Size": 67559 }, "lib/arm64-v8a/lib_System.Net.Primitives.dll.so": { - "Size": 22354 + "Size": 22242 }, "lib/arm64-v8a/lib_System.Net.Requests.dll.so": { - "Size": 3588 + "Size": 3594 }, "lib/arm64-v8a/lib_System.ObjectModel.dll.so": { - "Size": 8565 + "Size": 8566 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 870644 + "Size": 872867 }, "lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": { - "Size": 193443 + "Size": 193446 }, "lib/arm64-v8a/lib_System.Private.Uri.dll.so": { - "Size": 42904 + "Size": 42910 }, "lib/arm64-v8a/lib_System.Private.Xml.dll.so": { - "Size": 216020 + "Size": 216089 }, "lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": { - "Size": 16622 + "Size": 16631 }, "lib/arm64-v8a/lib_System.Runtime.dll.so": { - "Size": 2703 + "Size": 2709 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4022 + "Size": 4025 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": { - "Size": 1859 + "Size": 1865 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": { - "Size": 2479 + "Size": 2484 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": { - "Size": 3751 + "Size": 3758 }, "lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": { - "Size": 8099 + "Size": 8102 }, "lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": { - "Size": 161328 + "Size": 161398 }, "lib/arm64-v8a/lib_System.Xml.dll.so": { - "Size": 1754 + "Size": 1760 }, "lib/arm64-v8a/lib_System.Xml.Linq.dll.so": { - "Size": 1768 + "Size": 1776 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { "Size": 5007 @@ -170,7 +170,7 @@ "Size": 6216 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.dll.so": { - "Size": 138025 + "Size": 138048 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.CardView.dll.so": { "Size": 6959 @@ -179,7 +179,7 @@ "Size": 17921 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.Core.dll.so": { - "Size": 126882 + "Size": 126998 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.CursorAdapter.dll.so": { "Size": 8978 @@ -188,7 +188,7 @@ "Size": 15286 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.Fragment.dll.so": { - "Size": 51498 + "Size": 51531 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.Legacy.Support.Core.UI.dll.so": { "Size": 6233 @@ -206,7 +206,7 @@ "Size": 13063 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.RecyclerView.dll.so": { - "Size": 93516 + "Size": 93541 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.SavedState.dll.so": { "Size": 5107 @@ -242,7 +242,10 @@ "Size": 354064 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3210968 + "Size": 3132992 + }, + "lib/arm64-v8a/libSystem.Globalization.Native.so": { + "Size": 67248 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 @@ -254,7 +257,7 @@ "Size": 155568 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 118456 + "Size": 118880 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -407,10 +410,10 @@ "Size": 6 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1221 + "Size": 1223 }, "META-INF/BNDLTOOL.SF": { - "Size": 98179 + "Size": 98298 }, "META-INF/com.android.tools/proguard/coroutines.pro": { "Size": 1345 @@ -437,7 +440,7 @@ "Size": 5 }, "META-INF/MANIFEST.MF": { - "Size": 98052 + "Size": 98171 }, "META-INF/maven/com.google.guava/listenablefuture/pom.properties": { "Size": 96 @@ -2477,5 +2480,5 @@ "Size": 812848 } }, - "PackageSize": 10193867 + "PackageSize": 10218536 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index 05a4fa33ba6..58e0c21192b 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -26,11 +26,9 @@ - + - - - + diff --git a/tests/CodeBehind/BuildTests/CodeBehindBuildTests.NET.csproj b/tests/CodeBehind/BuildTests/CodeBehindBuildTests.NET.csproj index 841b92a40eb..2175ae82a5d 100644 --- a/tests/CodeBehind/BuildTests/CodeBehindBuildTests.NET.csproj +++ b/tests/CodeBehind/BuildTests/CodeBehindBuildTests.NET.csproj @@ -64,6 +64,6 @@ - + diff --git a/tests/CodeBehind/BuildTests/MainMergeActivity.cs b/tests/CodeBehind/BuildTests/MainMergeActivity.cs index ec57f9540c8..d5b8600ed75 100644 --- a/tests/CodeBehind/BuildTests/MainMergeActivity.cs +++ b/tests/CodeBehind/BuildTests/MainMergeActivity.cs @@ -24,6 +24,8 @@ protected override void OnCreate (Bundle savedInstanceState) #if NOT_CONFLICTING_FRAGMENT CommonSampleLibrary.LogFragment log2 = secondary_log_fragment; +#elif __HAVE_ANDROIDX__ + global::AndroidX.Fragment.App.Fragment log2 = secondary_log_fragment; #else global::Android.App.Fragment log2 = secondary_log_fragment; #endif diff --git a/tests/CodeBehind/BuildTests/Properties/AndroidManifest.xml b/tests/CodeBehind/BuildTests/Properties/AndroidManifest.xml index a0230c27bfe..72a51695329 100644 --- a/tests/CodeBehind/BuildTests/Properties/AndroidManifest.xml +++ b/tests/CodeBehind/BuildTests/Properties/AndroidManifest.xml @@ -1,6 +1,5 @@  - diff --git a/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.NET.csproj b/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.NET.csproj index 6b1daa622d0..3765f0d1a57 100644 --- a/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.NET.csproj +++ b/tests/CodeBehind/CommonSampleLibrary/CommonSampleLibrary.NET.csproj @@ -5,4 +5,10 @@ CommonSampleLibrary false + + $(DefineConstants);$(ExtraConstants) + + + + diff --git a/tests/CodeBehind/CommonSampleLibrary/Logger/LogFragment.cs b/tests/CodeBehind/CommonSampleLibrary/Logger/LogFragment.cs index eec0fe59ae9..b6b29ff06fb 100644 --- a/tests/CodeBehind/CommonSampleLibrary/Logger/LogFragment.cs +++ b/tests/CodeBehind/CommonSampleLibrary/Logger/LogFragment.cs @@ -19,14 +19,21 @@ using Android.Views; using Android.Widget; using Android.Graphics; +using Android.Util; namespace CommonSampleLibrary { + #pragma warning disable CA1422 /** * Simple fraggment which contains a LogView and uses is to output log data it receives * through the LogNode interface. */ - public class LogFragment : Fragment + public class LogFragment : +#if __HAVE_ANDROIDX__ + AndroidX.Fragment.App.Fragment +#else + Fragment +#endif { LogView mLogView; ScrollView mScrollView; @@ -60,7 +67,7 @@ public View InflateViews () mLogView.Gravity = GravityFlags.Bottom; mLogView.SetTextAppearance (Activity, Android.Resource.Style.TextAppearanceMedium); - + mScrollView.AddView (mLogView); return mScrollView; } @@ -77,5 +84,6 @@ public LogView LogView { get { return mLogView; } } } + #pragma warning restore CA1422 }