Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/blobs-in-lib
Browse files Browse the repository at this point in the history 
* main:
  [ci] Don't emit warnings for normal `CheckAdbTarget` operations. (#8568)
  Localized file check-in by OneLocBuild Task (#8570)
  • Loading branch information
@grendello
grendello committed Dec 7, 2023
2 parents 7f932f6 + abd6af7 commit 5f3598a
Show file tree
Hide file tree
Showing 15 changed files with 271 additions and 209 deletions.
7 changes: 6 additions & 1 deletion build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/Adb.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ protected class CommandInfo
public Func<string> ArgumentsGenerator { get; set; }
public bool MergeStdoutAndStderr { get; set; } = true;
public bool IgnoreExitCode { get; set; }
public bool LogIgnoredExitCodeAsWarning { get; set; } = true;
public string StdoutFilePath { get; set; }
public bool StdoutAppend { get; set; }
public string StderrFilePath { get; set; }
Expand Down Expand Up @@ -88,7 +89,11 @@ public override bool Execute ()
Log.LogError (message);
break;
}
Log.LogWarning (message);

if (info.LogIgnoredExitCodeAsWarning)
Log.LogWarning (message);
else
Log.LogMessage (MessageImportance.Normal, message);
} catch {
throw;
} finally {
Expand Down
5 changes: 5 additions & 0 deletions ...marin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckAdbTarget.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class CheckAdbTarget : Adb

public override bool Execute ()
{
// Log messages as output rather than warnings
WriteOutputAsMessage = true;

base.Execute ();

// We always succeed
Expand All @@ -43,12 +46,14 @@ public override bool Execute ()
new CommandInfo {
ArgumentsString = $"{AdbTarget} shell getprop ro.build.version.sdk",
IgnoreExitCode = true,
LogIgnoredExitCodeAsWarning = false,
MergeStdoutAndStderr = false,
},

new CommandInfo {
ArgumentsString = $"{AdbTarget} shell pm path com.android.shell",
IgnoreExitCode = true,
LogIgnoredExitCodeAsWarning = false,
MergeStdoutAndStderr = false,
ShouldRun = () => IsValidTarget
},
Expand Down
36 changes: 20 additions & 16 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex
<data name="XA1019" xml:space="preserve">
<value>Soubor LibraryProjectProperties {0} se nachází v adresáři, který je nadřazený přechodnému výstupnímu adresáři vazebního projektu. Upravte prosím cestu tak, aby se používal původní soubor project.properties přímo z adresáře projektu knihovny Androidu.</value>
<comment>The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android
In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a Xamarin.Android project written in C# or F#.
In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#.
{0} - The path of the LibraryProjectProperties file</comment>
</data>
<data name="XA1020" xml:space="preserve">
Expand All @@ -438,8 +438,8 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</comment>
</data>
<data name="XA1024" xml:space="preserve">
<value>Ignoruje se konfigurační soubor {0}. Konfigurační soubory .NET se v projektech Xamarin.Androidu, které cílí na .NET 6 nebo vyšší, nepodporují.</value>
<comment>The following are literal names and should not be translated: .NET, Xamarin.Android.
<value>Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET Android projects that target .NET 6 or higher.</value>
<comment>The following are literal names and should not be translated: .NET, .NET Android.
{0} - The file name such as 'Foo.dll.config'</comment>
</data>
<data name="XA1025" xml:space="preserve">
Expand All @@ -451,7 +451,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true.</comment>
</data>
<data name="XA1026_dotnet" xml:space="preserve">
<value>Používání AAPT se v projektech Xamarin.Androidu, které cílí na .NET 6 nebo vyšší, nepodporuje. Povolte prosím možnost Použít systém přírůstkového balení pro Android (aapt2) na stránce vlastností projektu sady Visual Studio, nebo upravte soubor projektu v textovém editoru a nastavte vlastnost MSBuildu AndroidUseAapt2 na true.</value>
<value>Using AAPT is not supported in .NET Android projects that target .NET 6 or higher. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'.</value>
<comment>The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true.</comment>
</data>
<data name="XA1027" xml:space="preserve">
Expand Down Expand Up @@ -511,7 +511,7 @@ Buď změňte hodnotu v souboru AndroidManifest.xml tak, aby odpovídala hodnot
{1} - The SupportedOSPlatformVersion property value</comment>
</data>
<data name="XA2000" xml:space="preserve">
<value>Použití funkce AppDomain.CreateDomain() zjištěné v sestavení: {0}. .NET 6 a vyšší bude podporovat jenom jednu doménu AppDomain, takže toto rozhraní API už nebude dostupné v Xamarin.Android po vydání .NET 6.</value>
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in .NET Android once .NET 6 is released.</value>
<comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain
{0} - The name of the assembly</comment>
</data>
Expand Down Expand Up @@ -710,12 +710,12 @@ In this message, "root element" refers to the root element of an XML file.
<comment>{0} - The exception message and stack trace of the associated exception</comment>
</data>
<data name="XA4231" xml:space="preserve">
<value>Hodnota parseru tříd Androidu {0} je zastaralá a v budoucí verzi Xamarin.Androidu se odebere. Aktualizujte vlastnosti projektu tak, aby používaly class-parse.</value>
<value>The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'class-parse'.</value>
<comment>The following are literal names and should not be translated: class-parse
{0} - The name of the current class parser value</comment>
</data>
<data name="XA4232" xml:space="preserve">
<value>Cíl generování kódu pro Androidu {0} je zastaralý a v budoucí verzi Xamarin.Androidu se odebere. Aktualizujte vlastnosti projektu tak, aby používaly XAJavaInterop1.</value>
<value>The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'XAJavaInterop1'.</value>
<comment>The following are literal names and should not be translated: XAJavaInterop1
{0} - The name of the current code generation target</comment>
</data>
Expand Down Expand Up @@ -796,7 +796,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi
"Wear" is a short version of the full product name "Wear OS" and so should not be translated.</comment>
</data>
<data name="XA4312" xml:space="preserve">
<value>Odkazování na projekt aplikace pro Android Wear {0} z projektu aplikace pro Android je zastaralé a v budoucí verzi Xamarin.Androidu se už nebude podporovat. Odeberte odkaz na projekt aplikace pro Android Wear z projektu aplikace pro Android a distribuujte aplikaci pro Wear jako samostatnou aplikaci.</value>
<value>Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of .NET Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.</value>
<comment>The following are literal names and should not be translated: Android Wear, Android, Wear.
{0} - The referenced Android Wear project.</comment>
</data>
Expand Down Expand Up @@ -867,19 +867,23 @@ Odeberte z projektu odkaz na {0} a místo toho přidejte balíček NuGet{1}.
{0} - The missing tool name</comment>
</data>
<data name="XA5207" xml:space="preserve">
<value>Nepovedlo se najít android.jar pro úroveň rozhraní API {0}. To znamená, že platforma sady Android SDK pro úroveň rozhraní API {0} není nainstalovaná. Buď ji nainstalujte ve Správci sady Android SDK ({2}), nebo změňte projekt Xamarin.Android tak, aby cílil na verzi rozhraní API, která je nainstalovaná. (Chybí {1}.)</value>
<value>Could not find android.jar for API level {0}. This means the Android SDK platform for API level {0} is not installed; it was expected to be in `{1}`.
{2}
See https://aka.ms/xa5207 for more details.</value>
<comment>The following are literal names and should not be translated: android.jar
{0} - The API level name
{1} - The expected path of the android.jar file
{2} - The menu location in Visual Studio that can be used to launch the Android SDK Manager</comment>
</data>
<data name="XA5207_SDK_Manager_macOS" xml:space="preserve">
<value>Nástroje &gt; Otevřít správce sady Android SDK...</value>
<comment>This string is the location of a menu command in Visual Studio for Mac.</comment>
{2} - The instructions to install the missing component</comment>
</data>
<data name="XA5207_SDK_Manager_Windows" xml:space="preserve">
<value>Nástroje &gt; Android &gt; Správce sady Android SDK...</value>
<comment>This string is the location of a menu command in Visual Studio.</comment>
<value>Either install it in the Android SDK Manager (Tools &gt; Android &gt; Android SDK Manager...), or change the .NET Android project to target an API version that is installed.</value>
<comment>This string is the instrucitons to install the component</comment>
</data>
<data name="XA5207_SDK_Manager_CLI" xml:space="preserve">
<value>You can install the missing API level by running `dotnet build -t:InstallAndroidDependencies -f {0} "-p:AndroidSdkDirectory={1}"`, or change the project to target an API version that is installed.</value>
<comment>This string is the instrucitons to install the component
{0} - The TargetFramework the app is targeting.
{1} - The current AndroidSdkDirectory path.</comment>
</data>
<data name="XA5211" xml:space="preserve">
<value>Název vložené aplikace pro Wear se liší od názvu balíčku aplikace pro kapesní zařízení ({0} != {1}).</value>
Expand Down
36 changes: 20 additions & 16 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ The capitalized word "Portable" that appears earlier in the message is plain tex
<data name="XA1019" xml:space="preserve">
<value>Die LibraryProjectProperties-Datei "{0}" befindet sich in einem übergeordneten Verzeichnis des Zwischenausgabeverzeichnisses für das Bindungsprojekt. Passen Sie den Pfad so an, dass die ursprüngliche Datei "project.properties" direkt aus dem Android-Bibliotheksprojektverzeichnis verwendet wird.</value>
<comment>The following are literal names and should not be translated: LibraryProjectProperties, project.properties, Android
In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a Xamarin.Android project written in C# or F#.
In this message, the term "binding" means a piece of generated code that makes it easy to access an Android API written in Java from a .NET Android project written in C# or F#.
{0} - The path of the LibraryProjectProperties file</comment>
</data>
<data name="XA1020" xml:space="preserve">
Expand All @@ -438,8 +438,8 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: DX, DEX, d8, AndroidDexTool.</comment>
</data>
<data name="XA1024" xml:space="preserve">
<value>Die Konfigurationsdatei "{0}" wird ignoriert. .NET-Konfigurationsdateien werden in Xamarin.Android-Projekten für .NET 6 oder höher nicht unterstützt.</value>
<comment>The following are literal names and should not be translated: .NET, Xamarin.Android.
<value>Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET Android projects that target .NET 6 or higher.</value>
<comment>The following are literal names and should not be translated: .NET, .NET Android.
{0} - The file name such as 'Foo.dll.config'</comment>
</data>
<data name="XA1025" xml:space="preserve">
Expand All @@ -451,7 +451,7 @@ In this message, the term "binding" means a piece of generated code that makes i
<comment>The following are literal names and should not be translated: AAPT, AAPT2, Android, AndroidUseAapt2, true.</comment>
</data>
<data name="XA1026_dotnet" xml:space="preserve">
<value>Die Verwendung von AAPT wird in Xamarin.Android-Projekten für .NET 6 oder höher nicht unterstützt. Aktivieren Sie "Inkrementelles Android-Paketierungssystem (aapt2) verwenden" in den Visual Studio-Projekteigenschaftenseiten, oder bearbeiten Sie die Projektdatei in einem Text-Editor, und legen Sie die MSBuild-Eigenschaft "AndroidUseAapt2" auf TRUE fest.</value>
<value>Using AAPT is not supported in .NET Android projects that target .NET 6 or higher. Please enable 'Use incremental Android packaging system (aapt2)' in the Visual Studio project property pages or edit the project file in a text editor and set the 'AndroidUseAapt2' MSBuild property to 'true'.</value>
<comment>The following are literal names and should not be translated: AAPT, Android, AndroidUseAapt2, true.</comment>
</data>
<data name="XA1027" xml:space="preserve">
Expand Down Expand Up @@ -511,7 +511,7 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von "System
{1} - The SupportedOSPlatformVersion property value</comment>
</data>
<data name="XA2000" xml:space="preserve">
<value>In der Assembly "{0}" wurde die Verwendung von "AppDomain.CreateDomain()" festgestellt. .NET 6 und höher unterstützt nur eine einzelne AppDomain, sodass diese API nach dem Release von .NET 6 nicht mehr in Xamarin.Android verfügbar ist.</value>
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in .NET Android once .NET 6 is released.</value>
<comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain
{0} - The name of the assembly</comment>
</data>
Expand Down Expand Up @@ -710,12 +710,12 @@ In this message, "root element" refers to the root element of an XML file.
<comment>{0} - The exception message and stack trace of the associated exception</comment>
</data>
<data name="XA4231" xml:space="preserve">
<value>Der Wert "{0}" des Android-Klassenparsers ist veraltet und wird in einer zukünftigen Version von Xamarin.Android entfernt. Aktualisieren Sie die Projekteigenschaften auf die Verwendung von "class-parse".</value>
<value>The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'class-parse'.</value>
<comment>The following are literal names and should not be translated: class-parse
{0} - The name of the current class parser value</comment>
</data>
<data name="XA4232" xml:space="preserve">
<value>Das Ziel "{0}" für die Android-Codegenerierung ist veraltet und wird in einer zukünftigen Version von Xamarin.Android entfernt. Aktualisieren Sie die Projekteigenschaften auf die Verwendung von "XAJavaInterop1".</value>
<value>The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET Android. Update the project properties to use 'XAJavaInterop1'.</value>
<comment>The following are literal names and should not be translated: XAJavaInterop1
{0} - The name of the current code generation target</comment>
</data>
Expand Down Expand Up @@ -796,7 +796,7 @@ The following are literal names and should not be translated: ABI, 'libs/armeabi
"Wear" is a short version of the full product name "Wear OS" and so should not be translated.</comment>
</data>
<data name="XA4312" xml:space="preserve">
<value>Verweise von einem Android-Anwendungsprojekt auf das Android Wear-Anwendungsprojekt "{0}" ist veraltet und wird in zukünftigen Versionen von Xamarin.Android nicht mehr unterstützt. Entfernen Sie den Verweis auf das Android Wear-Anwendungsprojekt aus dem Android-Anwendungsprojekt, und verteilen Sie die Wear-Anwendung stattdessen als eigenständige Anwendung.</value>
<value>Referencing the Android Wear application project '{0}' from an Android application project is deprecated and will no longer be supported in a future version of .NET Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.</value>
<comment>The following are literal names and should not be translated: Android Wear, Android, Wear.
{0} - The referenced Android Wear project.</comment>
</data>
Expand Down Expand Up @@ -867,19 +867,23 @@ Entfernen Sie den '{0}' Verweis aus Ihrem Projekt, und fügen Sie stattdessen da
{0} - The missing tool name</comment>
</data>
<data name="XA5207" xml:space="preserve">
<value>"android.jar" wurde für API-Ebene {0} nicht gefunden. Dies bedeutet, dass die Android SDK-Plattform für API-Ebene {0} nicht installiert ist. Führen Sie die Installation entweder im Android-SDK-Manager ({2}) durch, oder ändern Sie das Xamarin.Android-Projekt, um eine installierte API-Version als Ziel zu verwenden ("{1}" fehlt.)</value>
<value>Could not find android.jar for API level {0}. This means the Android SDK platform for API level {0} is not installed; it was expected to be in `{1}`.
{2}
See https://aka.ms/xa5207 for more details.</value>
<comment>The following are literal names and should not be translated: android.jar
{0} - The API level name
{1} - The expected path of the android.jar file
{2} - The menu location in Visual Studio that can be used to launch the Android SDK Manager</comment>
</data>
<data name="XA5207_SDK_Manager_macOS" xml:space="preserve">
<value>Extras &gt; Android-SDK-Manager öffnen...</value>
<comment>This string is the location of a menu command in Visual Studio for Mac.</comment>
{2} - The instructions to install the missing component</comment>
</data>
<data name="XA5207_SDK_Manager_Windows" xml:space="preserve">
<value>Extras &gt; Android &gt; Android-SDK-Manager...</value>
<comment>This string is the location of a menu command in Visual Studio.</comment>
<value>Either install it in the Android SDK Manager (Tools &gt; Android &gt; Android SDK Manager...), or change the .NET Android project to target an API version that is installed.</value>
<comment>This string is the instrucitons to install the component</comment>
</data>
<data name="XA5207_SDK_Manager_CLI" xml:space="preserve">
<value>You can install the missing API level by running `dotnet build -t:InstallAndroidDependencies -f {0} "-p:AndroidSdkDirectory={1}"`, or change the project to target an API version that is installed.</value>
<comment>This string is the instrucitons to install the component
{0} - The TargetFramework the app is targeting.
{1} - The current AndroidSdkDirectory path.</comment>
</data>
<data name="XA5211" xml:space="preserve">
<value>Der Name des eingebetteten Wear-App-Pakets weicht vom Namen des Handheld-App-Pakets ab ({0} != {1}).</value>
Expand Down
Loading

0 comments on commit 5f3598a

Please sign in to comment.