Merge branch 'main' into native-profiling-and-debugging

* main: Localized file check-in by OneLocBuild Task: Build definition ID 11410: Build ID 7029692 (dotnet#7575) [monodroid] Attach current thread to MonoVM when registering a type (dotnet#7560) [build] `make all` doesn't need `-m:1` (dotnet#7589) Update CODEOWNERS (dotnet#7593) [build] Add support for Visual Studio on win-arm64 (dotnet#7471) Fix reading assembly store hashes in AssemblyStoreReader
grendello · Nov 30, 2022 · a4b923a · a4b923a
2 parents ae9fe5d + 2a26c1e
commit a4b923a
Show file tree

Hide file tree

Showing 20 changed files with 224 additions and 46 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -16,6 +16,8 @@
 /build-tools/api-merge @jonpryor
 /build-tools/api-xml-adjuster @jonpryor
 /build-tools/automation @pjcollins @jonpryor
+/build-tools/cmake @grendello
+/build-tools/wrap-sh @grendello
 /build-tools/debian-metadata @directhex
 /build-tools/enumification-helpers @jonpryor
 /build-tools/manifest-attribute-codegen @jonpryor
@@ -33,6 +35,7 @@
 /src/Xamarin.Android.NamingCustomAttributes @jonpryor
 /src/Xamarin.Android.Tools.Aidl @jonpryor
 /src/monodroid/ @jonpryor @grendello
+/src/sqlite-xamarin @grendello
 /tests/TestRunner.* @grendello
 /tests/BCL-Tests @grendello
 /tests/CodeBehind @grendello
@@ -44,6 +47,9 @@
 /src/Mono.Android/java/mono/android/ @mcumming @jonpryor
 /src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Designer.targets @mcumming @jonpryor
 
+/tools/assembly-store-reader @grendello
+/tools/decompress-assemblies @grendello
 /tools/jit-times @jonpryor
-/tools/xabuild @jonathanpeppers @jonpryor
 /tools/setup-windows @jonathanpeppers @jonpryor
+/tools/tmt @grendello
+/tools/xabuild @jonathanpeppers @jonpryor
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ _PREPARE_CI_MODE_ARGS = $(_PREPARE_CI_MODE_PR_ARGS) -a
 _PREPARE_ARGS =
 
 all:
-	$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION) -m:1
+	$(call DOTNET_BINLOG,all) $(MSBUILD_FLAGS) $(SOLUTION)
 	$(call DOTNET_BINLOG,setup-workload) -t:ConfigureLocalWorkload build-tools/create-packs/Microsoft.Android.Sdk.proj
 	$(call MSBUILD_BINLOG,all,$(_SLN_BUILD)) /restore $(MSBUILD_FLAGS) tools/xabuild/xabuild.csproj
 

diff --git a/build-tools/create-packs/vs-workload.in.props b/build-tools/create-packs/vs-workload.in.props
@@ -13,7 +13,7 @@
       <Replacement>Android.Manifest</Replacement>
     </ShortNames>
     <ComponentResources Include="android" Version="@WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for Android" Description=".NET SDK Workload for building Android applications."/>
-    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Android.Manifest*.nupkg" Version="@WORKLOAD_VERSION@" />
+    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Android.Manifest*.nupkg" Version="@WORKLOAD_VERSION@" SupportsMachineArch="true" />
     <MultiTargetPackNames Include="Microsoft.Android.Sdk" />
   </ItemGroup>
 </Project>
diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Nepovedlo se zkompilovat soubor nativního sestavení: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Nepovedlo se zkompilovat soubor nativního sestavení: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Nepovedlo se připojit nativní sdílenou knihovnu: {0}</value>
+    <value>Nepovedlo se připojit nativní sdílenou knihovnu: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Kvůli {1} se nepovedlo vygenerovat typ Javy pro třídu {0}.</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Die native Assemblydatei konnte nicht kompiliert werden: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Die native Assemblydatei konnte nicht kompiliert werden: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Die native freigegebene Bibliothek konnte nicht verknüpft werden: {0}</value>
+    <value>Die native freigegebene Bibliothek konnte nicht verknüpft werden: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Fehler beim Generieren des Java-Typs für die Klasse "{0}". Ursache: {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>No se pudo compilar el archivo de ensamblado nativo: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>No se pudo compilar el archivo de ensamblado nativo: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>No se pudo vincular la biblioteca compartida nativa: {0}</value>
+    <value>No se pudo vincular la biblioteca compartida nativa: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>No se pudo generar el tipo Java {0} para la clase debido a lo siguiente: {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Impossible de compiler le fichier d'assembly natif : {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Impossible de compiler le fichier d'assembly natif : {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Impossible de lier la bibliothèque partagée native : {0}</value>
+    <value>Impossible de lier la bibliothèque partagée native : {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Échec de la génération du type Java pour la classe {0} en raison de {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Non è stato possibile compilare il file di assembly nativo: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Non è stato possibile compilare il file di assembly nativo: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Non è stato possibile collegare la libreria condivisa nativa: {0}</value>
+    <value>Non è stato possibile collegare la libreria condivisa nativa: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Non è stato possibile generare il tipo Java per la classe {0} a causa di {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>ネイティブ アセンブリ ファイルをコンパイルできませんでした: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>ネイティブ アセンブリ ファイルをコンパイルできませんでした: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>ネイティブの共有ライブラリをリンクできませんでした: {0}</value>
+    <value>ネイティブの共有ライブラリをリンクできませんでした: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>{1} のため、クラス {0} の Java の型を生成できませんでした</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>네이티브 어셈블리 파일을 컴파일할 수 없음: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>네이티브 어셈블리 파일을 컴파일할 수 없음: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>네이티브 공유 라이브러리를 연결할 수 없음: {0}</value>
+    <value>네이티브 공유 라이브러리를 연결할 수 없음: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>클래스의 Java 형식({0})을 생성하지 못했습니다(원인: {1}).</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Nie można skompilować natywnego pliku zestawu: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Nie można skompilować natywnego pliku zestawu: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Nie można połączyć natywnej biblioteki współużytkowanej: {0}</value>
+    <value>Nie można połączyć natywnej biblioteki współużytkowanej: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Nie można wygenerować typu języka Java dla klasy {0} z powodu wyjątku {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Não foi possível compilar o arquivo do assembly nativo: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Não foi possível compilar o arquivo do assembly nativo: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Não foi possível vincular a biblioteca compartilhada nativa: {0}</value>
+    <value>Não foi possível vincular a biblioteca compartilhada nativa: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Falha ao gerar o tipo Java para a classe: {0} devido a {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Не удалось скомпилировать файл собственной сборки: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Не удалось скомпилировать платформенный файл сборки: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Не удалось связать собственную общую библиотеку: {0}</value>
+    <value>Не удалось связать платформенную общую библиотеку: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>Не удалось создать тип Java для класса {0}, так как возникло исключение {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>Yerel bütünleştirilmiş kod dosyası derlenemedi: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>Yerel bütünleştirilmiş kod dosyası derlenemedi: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>Yerel paylaşılan kitaplık bağlanamadı: {0}</value>
+    <value>Yerel paylaşılan kitaplık bağlanamadı: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>{0} sınıfı için şu özel durum nedeniyle Java türü oluşturulamadı: {1}</value>

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx
@@ -530,11 +530,12 @@ In this message, the term "binding" means a piece of generated code that makes i
 "r10d" is the version of the NDK.</comment>
   </data>
   <data name="XA3006" xml:space="preserve">
-    <value>无法编译本机程序集文件: {0}</value>
-    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces.)</comment>
+    <value>无法编译本机程序集文件: {0}{1}</value>
+    <comment>In this message, the term "assembly" means the low-level language that an assembler like `as` takes as input. (This is different from most of the other messages, where the term "assembly" means the file type that the C# compiler produces). The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA3007" xml:space="preserve">
-    <value>无法链接本机共享库: {0}</value>
+    <value>无法链接本机共享库: {0}{1}</value>
+    <comment>The '{1}' placeholder is replaced with full output of the failed command, starting and ending with a newline.</comment>
   </data>
   <data name="XA4209" xml:space="preserve">
     <value>由于 {1}，未能为类 {0} 生成 Java 类型</value>