Skip to content

Commit 5eb2542

Browse files
grendellogrendello
committed
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
2 parents 79d6968 + ef31401 commit 5eb2542

179 files changed

Lines changed: 4819 additions & 3199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gdn/policheck/source.gdnsuppress‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"default": {
1010
"name": "default",
1111
"createdDate": "2023-02-22 23:55:29Z",
12-
"lastUpdatedDate": "2024-02-22 21:40:38Z"
12+
"lastUpdatedDate": "2024-04-22 13:40:30Z"
1313
}
1414
},
1515
"results": {
@@ -101,43 +101,43 @@
101101
"justification": "Reference to an Android logging function.",
102102
"createdDate": "2023-02-22 23:55:29Z"
103103
},
104-
"a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0": {
105-
"signature": "a2b4d032c59a9d1211d218c3cd550cf8febb369941d70284d07d03ebee855bc0",
104+
"bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10": {
105+
"signature": "bca629d8e7888af4116b013c6585b78d0908d248a80138339e0eb1620832eb10",
106106
"alternativeSignatures": [
107-
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
107+
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
108108
],
109109
"memberOf": [
110110
"default"
111111
],
112112
"justification": "Reference to find first set bit function.",
113113
"createdDate": "2023-02-22 23:55:29Z"
114114
},
115-
"1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb": {
116-
"signature": "1c87b45a6044d205dc3f3562f349c238f7cabe22b4609da762df9dc44151e9fb",
115+
"dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae": {
116+
"signature": "dc43990fd9fa6a44f2fb2fffcb0497571af4379f23090482035d79a98970e7ae",
117117
"alternativeSignatures": [
118-
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
118+
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
119119
],
120120
"memberOf": [
121121
"default"
122122
],
123123
"justification": "Reference to find first set bit function.",
124124
"createdDate": "2023-02-22 23:55:29Z"
125125
},
126-
"a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845": {
127-
"signature": "a6639098c4785509a4215c9e2fc10f82c06fce461915dc11a00227ddec558845",
126+
"eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354": {
127+
"signature": "eb60d4f1e48ca85ad5fa4a413d8ff76c4975bccb12931f51179d67c24a82f354",
128128
"alternativeSignatures": [
129-
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
129+
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
130130
],
131131
"memberOf": [
132132
"default"
133133
],
134134
"justification": "Reference to find first set bit function.",
135135
"createdDate": "2023-02-22 23:55:29Z"
136136
},
137-
"f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31": {
138-
"signature": "f94ede7b396cb54934db2084f0879cd31a17ce2584eb01e0bfcd35324a724c31",
137+
"bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45": {
138+
"signature": "bb80a900ad96e4833eb7f54f55723a3425e846a290dd62b709d4714952cd9d45",
139139
"alternativeSignatures": [
140-
"9feaec8a73b72e0d212c0e18d863e4fe16ff010c5d33cf8d47d8b0f465cc4c5e"
140+
"f35d63032e4f346c1afcc299d50eb17a0a05ecea81ba3025f14c7fbf78b10100"
141141
],
142142
"memberOf": [
143143
"default"

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@
2828
[submodule "external/constexpr-xxh3"]
2929
path = external/constexpr-xxh3
3030
url = https://github.com/chys87/constexpr-xxh3.git
31+
[submodule "external/libunwind"]
32+
path = external/libunwind
33+
url = https://github.com/libunwind/libunwind.git
34+
branch = master

‎Configuration.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@
104104
<IgnoreMaxMonoVersion Condition=" '$(IgnoreMaxMonoVersion)' == '' ">True</IgnoreMaxMonoVersion>
105105
<OpenTKSourceDirectory>$(MSBuildThisFileDirectory)external\opentk</OpenTKSourceDirectory>
106106
<SqliteSourceDirectory Condition=" '$(SqliteSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\sqlite</SqliteSourceDirectory>
107+
<LibUnwindSourceDirectory Condition=" '$(LibUnwindSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\libunwind</LibUnwindSourceDirectory>
108+
<LibUnwindGeneratedHeadersDirectory Condition=" '$(LibUnwindGeneratedHeadersDirectory)' == '' ">$(BootstrapOutputDirectory)\libunwind</LibUnwindGeneratedHeadersDirectory>
109+
<LZ4SourceDirectory Condition=" '$(LZ4SourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\lz4</LZ4SourceDirectory>
107110
<XamarinAndroidSourcePath>$(MSBuildThisFileDirectory)</XamarinAndroidSourcePath>
108111
<ThirdPartySourcePath>$(MSBuildThisFileDirectory)src-ThirdParty\</ThirdPartySourcePath>
109112
<AllSupported32BitTargetAndroidAbis>armeabi-v7a;x86</AllSupported32BitTargetAndroidAbis>
@@ -144,6 +147,9 @@
144147
<JavaInteropFullPath>$([System.IO.Path]::GetFullPath ('$(JavaInteropSourceDirectory)'))</JavaInteropFullPath>
145148
<MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
146149
<SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
150+
<LibUnwindSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindSourceDirectory)'))</LibUnwindSourceFullPath>
151+
<LibUnwindGeneratedHeadersFullPath>$([System.IO.Path]::GetFullPath ('$(LibUnwindGeneratedHeadersDirectory)'))</LibUnwindGeneratedHeadersFullPath>
152+
<LZ4SourceFullPath>$([System.IO.Path]::GetFullPath ('$(LZ4SourceDirectory)'))</LZ4SourceFullPath>
147153
<OpenTKSourceFullPath>$([System.IO.Path]::GetFullPath ('$(OpenTKSourceDirectory)'))</OpenTKSourceFullPath>
148154
<JavaInteropTargetFrameworkVersion>net8.0</JavaInteropTargetFrameworkVersion>
149155
</PropertyGroup>

‎Localize/loc/es/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
<Str Cat="Text">
2323
<Val><![CDATA[A project for creating a .NET for Android class library that binds to a native Java library]]></Val>
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
25-
<Val><![CDATA[Proyecto para crear una biblioteca de clases de .NET for Android que enlaza a una biblioteca de Java nativa]]></Val>
25+
<Val><![CDATA[Proyecto para crear una biblioteca de clases de .NET para Android que enlaza a una biblioteca de Java nativa]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android class library that binds to a native Java library]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

‎Localize/loc/es/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
<Str Cat="Text">
2323
<Val><![CDATA[A project for creating a .NET for Android Wear application]]></Val>
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
25-
<Val><![CDATA[Proyecto para crear una aplicación .NET for Android Wear]]></Val>
25+
<Val><![CDATA[Proyecto para crear una aplicación .NET para Android Wear]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

‎Localize/loc/es/src/Microsoft.Android.Templates/android/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
<Str Cat="Text">
2323
<Val><![CDATA[A project for creating a .NET for Android application]]></Val>
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
25-
<Val><![CDATA[Proyecto para crear una aplicación .NET for Android]]></Val>
25+
<Val><![CDATA[Proyecto para crear una aplicación .NET para Android]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android application]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

‎Localize/loc/es/src/Microsoft.Android.Templates/androidlib/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
<Str Cat="Text">
2323
<Val><![CDATA[A project for creating a .NET for Android class library]]></Val>
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
25-
<Val><![CDATA[Proyecto para crear una biblioteca de clases .NET for Android]]></Val>
25+
<Val><![CDATA[Proyecto para crear una biblioteca de clases .NET para Android]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android class library]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

‎Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,10 @@
649649
<Str Cat="Text">
650650
<Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET for Android projects that target .NET 6 or higher.]]></Val>
651651
<Tgt Cat="Text" Stat="Loc" Orig="New">
652-
<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>
652+
<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>
653653
</Tgt>
654654
<Prev Cat="Text">
655-
<Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in Xamarin.Android projects that target .NET 6 or higher.]]></Val>
655+
<Val><![CDATA[Ignoring configuration file '{0}'. .NET configuration files are not supported in .NET Android projects that target .NET 6 or higher.]]></Val>
656656
</Prev>
657657
</Str>
658658
<Disp Icon="Str" />
@@ -679,10 +679,10 @@
679679
<Str Cat="Text">
680680
<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>
681681
<Tgt Cat="Text" Stat="Loc" Orig="New">
682-
<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>
682+
<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>
683683
</Tgt>
684684
<Prev Cat="Text">
685-
<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>
685+
<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>
686686
</Prev>
687687
</Str>
688688
<Disp Icon="Str" />
@@ -811,10 +811,10 @@
811811
<Str Cat="Text">
812812
<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>
813813
<Tgt Cat="Text" Stat="Loc" Orig="New">
814-
<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>
814+
<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>
815815
</Tgt>
816816
<Prev Cat="Text">
817-
<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>
817+
<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>
818818
</Prev>
819819
</Str>
820820
<Disp Icon="Str" />
@@ -1165,10 +1165,10 @@
11651165
<Str Cat="Text">
11661166
<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>
11671167
<Tgt Cat="Text" Stat="Loc" Orig="New">
1168-
<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>
1168+
<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>
11691169
</Tgt>
11701170
<Prev Cat="Text">
1171-
<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>
1171+
<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>
11721172
</Prev>
11731173
</Str>
11741174
<Disp Icon="Str" />
@@ -1177,10 +1177,10 @@
11771177
<Str Cat="Text">
11781178
<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>
11791179
<Tgt Cat="Text" Stat="Loc" Orig="New">
1180-
<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>
1180+
<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>
11811181
</Tgt>
11821182
<Prev Cat="Text">
1183-
<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>
1183+
<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>
11841184
</Prev>
11851185
</Str>
11861186
<Disp Icon="Str" />
@@ -1465,10 +1465,10 @@
14651465
<Str Cat="Text">
14661466
<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>
14671467
<Tgt Cat="Text" Stat="Loc" Orig="New">
1468-
<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>
1468+
<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>
14691469
</Tgt>
14701470
<Prev Cat="Text">
1471-
<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>
1471+
<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>
14721472
</Prev>
14731473
</Str>
14741474
<Disp Icon="Str" />
@@ -1606,10 +1606,10 @@
16061606
<Str Cat="Text">
16071607
<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>
16081608
<Tgt Cat="Text" Stat="Loc" Orig="New">
1609-
<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>
1609+
<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>
16101610
</Tgt>
16111611
<Prev Cat="Text">
1612-
<Val><![CDATA[Tools > Android > Android SDK Manager...]]></Val>
1612+
<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>
16131613
</Prev>
16141614
</Str>
16151615
<Disp Icon="Str" />

‎Localize/loc/ja/src/Microsoft.Android.Templates/android-bindinglib/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
2525
<Val><![CDATA[ネイティブ Java ライブラリにバインドする .NET for Android クラス ライブラリを作成するためのプロジェクト]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android class library that binds to a native Java library]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

‎Localize/loc/ja/src/Microsoft.Android.Templates/android-wear/.template.config/localize/templatestrings.json.lcl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<Tgt Cat="Text" Stat="Loc" Orig="New">
2525
<Val><![CDATA[.NET for Android Wear アプリケーションを作成するためのプロジェクト]]></Val>
2626
</Tgt>
27+
<Prev Cat="Text">
28+
<Val><![CDATA[A project for creating a .NET Android Wear application]]></Val>
29+
</Prev>
2730
</Str>
2831
<Disp Icon="Str" />
2932
</Item>

0 commit comments

Comments
 (0)