Merge branch 'main' into dev/grendel/perfetto-integration

* main: Localized file check-in by OneLocBuild Task (#8974) Bump to xamarin/xamarin-android-binutils/L_18.1.6-8.0.0@97b574b (#8969) [Mono.Android] Bind API-VanillaIceCream Beta 2 (#8948) [ci] Update OneLocBuildToken (#8973) [s360] Ignore irrelevant lz4+Python warnings (#8962) LEGO: Merge pull request 8971 Localized file check-in by OneLocBuild Task (#8963) [ci] Use long version for maestro publishing (#8964) Localized file check-in by OneLocBuild Task (#8957) LEGO: Merge pull request 8958
dotnet · May 23, 2024 · 2934099 · 2934099
2 parents 59290b3 + efdbc7a
commit 2934099
Show file tree

Hide file tree

Showing 102 changed files with 3,632 additions and 513 deletions.
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -1,2 +1,6 @@
 queries:
   - exclude: cs/campaign/constantine
+paths:
+  exclude:
+    # we don't ship lz4 tests
+    - external/lz4/tests
diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -1,8 +1,8 @@
 # HowTo: Add a new Android API Level
 
-## Developer Preview
+## Unstable Previews
 
-The first developer preview generally ships in late February or early March.  At this early
+The first unstable preview generally ships in late February or early March.  At this early
 stage for the APIs, we simply add literal bindings for them.  We do not spend resources on
 the more manual parts like enumification that will likely change as the APIs mature.
 
@@ -13,22 +13,32 @@ the more manual parts like enumification that will likely change as the APIs mat
 - Add new level to `/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs`:
   - `new AndroidPlatformComponent ("platform-S_r01", apiLevel: "S", pkgRevision: "1"),`
 
-At this point, you can run `Xamarin.Android.sln /t:Prepare` using your usual mechanism, and
+At this point, you can run `Xamarin.Android.sln -t:Prepare` using your usual mechanism, and
 the new platform will be downloaded to your local Android SDK.
 
+### Build Xamarin.Android
+
+Build `Xamarin.Android.sln` using your usual mechanism. This will not use the new platform yet,
+but will build the tools like `param-name-importer` and `class-parse` that will be needed
+in the next steps.
+
 ### Generate `params.txt` File
 
-- In `/external/Java.Interop/tools/param-name-importer`:
-  - Run: `dotnet run -source-stub-zip C:/Users/USERNAME/android-toolchain/platforms/android-35/android-stubs-src.jar -output-text api-35.params.txt -output-xml api-35.params.xml -verbose -framework-only`
-- Copy the produced `api-X.params.txt` file to `/src/Mono.Android/Profiles/`
+Build the `params.txt` file for the desired level:
+
+- Unstable: `dotnet-local.cmd build build-tools/create-android-api -t:GenerateParamsFile -p:ParamApiLevel=VanillaIceCream`
+- Stable: `dotnet-local.cmd build build-tools/create-android-api -t:GenerateParamsFile -p:ParamApiLevel=35`
+
+This will create a `api-XX.params.txt` file in `/src/Mono.Android/Profiles/` that needs to be committed.
 
 ### Generate `api.xml` File
 
 - Run `xaprepare android-sdk-platforms=all` to download all Android SDK platforms
 - Add level to `/build-tools/api-merge/merge-configuration.xml` to create `api-S.xml.class-parse`
 - Run the following command to create a merged `api.xml`:
-  - `dotnet-local.cmd build build-tools\create-android-api -t:GenerateApiDescription`
-- Copy the `bin\BuildDebug\api\api-xx.xml` file to `src\Mono.Android\Profiles`
+  - `dotnet-local.cmd build build-tools/create-android-api -t:GenerateApiDescription`
+
+This will create a `api-XX.xml` file in `/src/Mono.Android/Profiles/` that needs to be committed.
 
 ### Other Infrastructure Changes
 

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[Projekt pro vytvoření knihovny tříd androidu .NET, která se váže na nativní knihovnu Java]]></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[Projekt pro vytvoření aplikace .NET for Android Wear]]></Val>
+            <Val><![CDATA[Projekt pro vytvoření aplikace .NET 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[Projekt pro vytvoření aplikace .NET pro 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[Projekt pro vytvoření knihovny tříd .NET pro 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/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl
@@ -652,7 +652,7 @@
             <Val><![CDATA[Ignoruje se konfigurační soubor {0}. Konfigurační soubory .NET se v projektech .NET pro Android, které cílí na .NET 6 nebo vyšší, nepodporují.]]></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[Používání AAPT se v projektech .NET pro Android, 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.]]></Val>
+            <Val><![CDATA[Používání AAPT se v projektech .NET pro Android, 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 MSBuild AndroidUseAapt2 na 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" />
@@ -814,7 +814,7 @@
             <Val><![CDATA[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 po vydání .NET 6 už v .NET pro Android nebude dostupné.]]></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" />
@@ -1168,7 +1168,7 @@
             <Val><![CDATA[Hodnota analyzátoru tříd Androidu {0} je zastaralá a v budoucí verzi .NET pro Android se odebere. Aktualizujte vlastnosti projektu tak, aby používaly 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" />
@@ -1180,7 +1180,7 @@
             <Val><![CDATA[Cíl generování kódu pro Androidu {0} je zastaralý a v budoucí verzi .NET pro Android se odebere. Aktualizujte vlastnosti projektu tak, aby používaly 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" />
@@ -1468,7 +1468,7 @@
             <Val><![CDATA[Odkazování na projekt aplikace pro Android Wear {0} z projektu aplikace pro Android je zastaralé a v budoucí verzi .NET pro Android 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.]]></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" />
@@ -1609,7 +1609,7 @@
             <Val><![CDATA[Buď tuto komponentu nainstalujte ve Správci sady Android SDK (Nástroje > Android > Správce sady Android SDK…), nebo změňte projekt .NET pro Android tak, aby cílil na nainstalovanou verzi rozhraní API.]]></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
@@ -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[Ein Projekt zum Erstellen einer .NET for Android-Klassenbibliothek, die an eine native Java-Bibliothek gebunden wird]]></Val>
+            <Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android-Klassenbibliothek, die an eine native Java-Bibliothek gebunden wird]]></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[Ein Projekt zum Erstellen einer .NET for Android Wear-Anwendung]]></Val>
+            <Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android Wear-Anwendung]]></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[Ein Projekt zum Erstellen einer .NET for Android-Anwendung]]></Val>
+            <Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android-Anwendung]]></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[Ein Projekt zum Erstellen einer .NET for Android-Klassenbibliothek]]></Val>
+            <Val><![CDATA[Ein Projekt zum Erstellen einer .NET für Android-Klassenbibliothek]]></Val>
           </Tgt>
+          <Prev Cat="Text">
+            <Val><![CDATA[A project for creating a .NET Android class library]]></Val>
+          </Prev>
         </Str>
         <Disp Icon="Str" />
       </Item>