Merge branch 'main' into dev/grendel/enable-marshal-methods

* main: [Mono.Android] AndroidMessageHandler should follow HTTP-308 redirects (#8951) [Microsoft.Android.Templates] Add icons to templates (#8883) [native] Native call tracing infra + native build system overhaul (#8857) [build] fix code-flow from dotnet/installer, .NET 9.0.100-preview.5.24262.2 (#8949) [ci] Re-enable to push to dotnet9 feed (#8950) LEGO: Merge pull request 8952
dotnet · May 16, 2024 · 5eb2542 · 5eb2542
2 parents 79d6968 + ef31401
commit 5eb2542
Show file tree

Hide file tree

Showing 179 changed files with 4,819 additions and 3,199 deletions.
diff --git a/.gdn/policheck/source.gdnsuppress b/.gdn/policheck/source.gdnsuppress
@@ -9,7 +9,7 @@
     "default": {
       "name": "default",
       "createdDate": "2023-02-22 23:55:29Z",
-      "lastUpdatedDate": "2024-02-22 21:40:38Z"
+      "lastUpdatedDate": "2024-04-22 13:40:30Z"
     }
   },
   "results": {
@@ -101,43 +101,43 @@
       "justification": "Reference to an Android logging function.",
       "createdDate": "2023-02-22 23:55:29Z"
     },
-    "a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0": {
-      "signature": "a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0",
+    "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10": {
+      "signature": "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10",
       "alternativeSignatures": [
-        "9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
+        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
       ],
       "memberOf": [
         "default"
       ],
       "justification": "Reference to find first set bit function.",
       "createdDate": "2023-02-22 23:55:29Z"
     },
-    "1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb": {
-      "signature": "1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb",
+    "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae": {
+      "signature": "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae",
       "alternativeSignatures": [
-        "9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
+        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
       ],
       "memberOf": [
         "default"
       ],
       "justification": "Reference to find first set bit function.",
       "createdDate": "2023-02-22 23:55:29Z"
     },
-    "a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845": {
-      "signature": "a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845",
+    "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354": {
+      "signature": "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354",
       "alternativeSignatures": [
-        "9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
+        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
       ],
       "memberOf": [
         "default"
       ],
       "justification": "Reference to find first set bit function.",
       "createdDate": "2023-02-22 23:55:29Z"
     },
-    "f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31": {
-      "signature": "f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31",
+    "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45": {
+      "signature": "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45",
       "alternativeSignatures": [
-        "9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
+        "f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
       ],
       "memberOf": [
         "default"

diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,7 @@
 [submodule "external/constexpr-xxh3"]
 	path = external/constexpr-xxh3
 	url = https://github.com/chys87/constexpr-xxh3.git
+[submodule "external/libunwind"]
+	path = external/libunwind
+	url = https://github.com/libunwind/libunwind.git
+	branch = master
diff --git a/Configuration.props b/Configuration.props
@@ -104,6 +104,9 @@
     <IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
     <OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
     <SqliteSourceDirectory Condition=" '$(SqliteSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\sqlite</SqliteSourceDirectory>
+    <LibUnwindSourceDirectory Condition=" '$(LibUnwindSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libunwind</LibUnwindSourceDirectory>
+    <LibUnwindGeneratedHeadersDirectory Condition=" '$(LibUnwindGeneratedHeadersDirectory)' == '' ">$(BootstrapOutputDirectory)\libunwind</LibUnwindGeneratedHeadersDirectory>
+    <LZ4SourceDirectory Condition=" '$(LZ4SourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\lz4</LZ4SourceDirectory>
     <XamarinAndroidSourcePath>$(MSBuildThisFileDirectory)</XamarinAndroidSourcePath>
     <ThirdPartySourcePath>$(MSBuildThisFileDirectory)src-ThirdParty\</ThirdPartySourcePath>
     <AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
@@ -144,6 +147,9 @@
     <JavaInteropFullPath>$([System.IO.Path]::GetFullPath ('$(JavaInteropSourceDirectory)'))</JavaInteropFullPath>
     <MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
     <SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
+    <LibUnwindSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindSourceDirectory)'))</LibUnwindSourceFullPath>
+    <LibUnwindGeneratedHeadersFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindGeneratedHeadersDirectory)'))</LibUnwindGeneratedHeadersFullPath>
+    <LZ4SourceFullPath>$([System.IO.Path]::GetFullPath ('$(LZ4SourceDirectory)'))</LZ4SourceFullPath>
     <OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
     <JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
   </PropertyGroup>

diff --git a/...t.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/...t.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl
@@ -22,8 +22,11 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android class library that binds to a native Java library]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proyecto para crear una biblioteca de clases de .NET for Android que enlaza a una biblioteca de Java nativa]]></Val>
+            <Val><![CDATA[Proyecto para crear una biblioteca de clases de .NET para Android que enlaza a una biblioteca de Java nativa]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android class library that binds to a native Java library]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...crosoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/...crosoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl
@@ -22,8 +22,11 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proyecto para crear una aplicación .NET for Android Wear]]></Val>
+            <Val><![CDATA[Proyecto para crear una aplicación .NET para Android Wear]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...rc/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/...rc/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl
@@ -22,8 +22,11 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android application]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proyecto para crear una aplicación .NET for Android]]></Val>
+            <Val><![CDATA[Proyecto para crear una aplicación .NET para Android]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android application]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/...Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl
@@ -22,8 +22,11 @@
         <Str Cat="Text">
           <Val><![CDATA[A project for creating a .NET for Android class library]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Proyecto para crear una biblioteca de clases .NET for Android]]></Val>
+            <Val><![CDATA[Proyecto para crear una biblioteca de clases .NET para Android]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android class library]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

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
@@ -649,10 +649,10 @@
         <Str Cat="Text">
           <Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET for Android projects that target .NET 6 or higher.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Ignorando el archivo de configuración "{0}". Los archivos de configuración .NET no son compatibles con proyectos .NET for Android que tengan como objetivo .NET 6 o superior.]]></Val>
+            <Val><![CDATA[Ignorando el archivo de configuración "{0}". Los archivos de configuración .NET no son compatibles con proyectos .NET para Android que tengan como objetivo .NET 6 o superior.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.]]></Val>
+            <Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET Android projects that target .NET 6 or higher.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -679,10 +679,10 @@
         <Str Cat="Text">
           <Val><![CDATA[Using AAPT is not supported in .NET for 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'.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El uso de AAPT no es compatible con proyectos .NET for Android que tengan como objetivo .NET 6 o superior. Habilite "Use el sistema de empaquetado de Android incremental (aapt2)" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo del proyecto en un editor de texto y establezca la propiedad "AndroidUseAapt2" de MSBuild en "true".]]></Val>
+            <Val><![CDATA[El uso de AAPT no es compatible con proyectos .NET para Android que tengan como objetivo .NET 6 o superior. Habilite "Usar el sistema de empaquetado de Android incremental (aapt2)" en las páginas de propiedades del proyecto de Visual Studio o edite el archivo del proyecto en un editor de texto y establezca la propiedad "AndroidUseAapt2" de MSBuild en "true".]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Using AAPT is not supported in Xamarin.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'.]]></Val>
+            <Val><![CDATA[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'.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -811,10 +811,10 @@
         <Str Cat="Text">
           <Val><![CDATA[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 for Android once .NET 6 is released.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Uso de AppDomain.CreateDomain() detectado en el ensamblado: {0}.NET 6 y superiores solo admitirán un único AppDomain, por lo que esta API dejará de estar disponible en .NET for Android una vez que se publique .NET 6.]]></Val>
+            <Val><![CDATA[Uso de AppDomain.CreateDomain() detectado en el ensamblado: {0}.NET 6 y superiores solo admitirán un único AppDomain, por lo que esta API dejará de estar disponible en .NET para Android una vez que se publique .NET 6.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[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 Xamarin.Android once .NET 6 is released.]]></Val>
+            <Val><![CDATA[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.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -1165,10 +1165,10 @@
         <Str Cat="Text">
           <Val><![CDATA[The Android class parser value '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'class-parse'.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El valor "{0}" del analizador de clases de Android está obsoleto y se eliminará en una futura versión de .NET for Android. Actualice las propiedades del proyecto para usar "class-parse".]]></Val>
+            <Val><![CDATA[El valor "{0}" del analizador de clases de Android está en desuso y se eliminará en una futura versión de .NET para Android. Actualice las propiedades del proyecto para usar "class-parse".]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[The Android class parser value '{0}' is deprecated and will be removed in a future version of Xamarin.Android. Update the project properties to use 'class-parse'.]]></Val>
+            <Val><![CDATA[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'.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -1177,10 +1177,10 @@
         <Str Cat="Text">
           <Val><![CDATA[The Android code generation target '{0}' is deprecated and will be removed in a future version of .NET for Android. Update the project properties to use 'XAJavaInterop1'.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[El objetivo de generación de código Android "{0}" está obsoleto y se eliminará en una futura versión de .NET for Android. Actualice las propiedades del proyecto para usar "XAJavaInterop1".]]></Val>
+            <Val><![CDATA[El objetivo de generación de código Android "{0}" está en desuso y se eliminará en una futura versión de .NET para Android. Actualice las propiedades del proyecto para usar "XAJavaInterop1".]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[The Android code generation target '{0}' is deprecated and will be removed in a future version of Xamarin.Android. Update the project properties to use 'XAJavaInterop1'.]]></Val>
+            <Val><![CDATA[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'.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -1465,10 +1465,10 @@
         <Str Cat="Text">
           <Val><![CDATA[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 for Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Hacer referencia al proyecto de aplicación Android Wear "{0}" desde un proyecto de aplicación Android está obsoleto y ya no se admitirá en una versión futura de .NET for Android. Elimine la referencia al proyecto de la aplicación Android Wear del proyecto de la aplicación Android y distribuya en su lugar la aplicación Wear como una aplicación independiente.]]></Val>
+            <Val><![CDATA[Hacer referencia al proyecto de aplicación Android Wear "{0}" desde un proyecto de aplicación Android está en desuso y ya no se admitirá en una versión futura de .NET para Android. Elimine la referencia al proyecto de la aplicación Android Wear del proyecto de la aplicación Android y distribuya en su lugar la aplicación Wear como una aplicación independiente.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[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 Xamarin.Android. Remove the Android Wear application project reference from the Android application project and distribute the Wear application as a standalone application instead.]]></Val>
+            <Val><![CDATA[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.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />
@@ -1606,10 +1606,10 @@
         <Str Cat="Text">
           <Val><![CDATA[Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), or change the .NET for Android project to target an API version that is installed.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Instálelo en el Android SDK Manager (herramientas > Android > Android SDK Manager...) o cambie el proyecto .NET for Android para que se dirija a una versión de la API que esté instalada.]]></Val>
+            <Val><![CDATA[Instálelo en el Administrador de Android SDK (Herramientas > Android > Administrador de Android SDK...) o cambie el proyecto .NET para Android para que se dirija a una versión de la API que esté instalada.]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Tools > Android > Android SDK Manager...]]></Val>
+            <Val><![CDATA[Either install it in the Android SDK Manager (Tools > Android > Android SDK Manager...), or change the .NET Android project to target an API version that is installed.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

diff --git a/...t.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl b/...t.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl
@@ -24,6 +24,9 @@
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[ネイティブ Java ライブラリにバインドする .NET for Android クラス ライブラリを作成するためのプロジェクト]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android class library that binds to a native Java library]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...crosoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl b/...crosoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl
@@ -24,6 +24,9 @@
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[.NET for Android Wear アプリケーションを作成するためのプロジェクト]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...rc/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl b/...rc/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl
@@ -24,6 +24,9 @@
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[.NET for Android アプリケーションを作成するためのプロジェクト]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android application]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/...Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl b/...Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl
@@ -24,6 +24,9 @@
           <Tgt Cat="Text" Stat="Loc" Orig="New">
             <Val><![CDATA[.NET for Android クラス ライブラリを作成するためのプロジェクト]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android class library]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>