Merge branch 'main' into mm-cleanup-and-enable

* main: Localized file check-in by OneLocBuild Task: Build definition ID 11410: Build ID 6746307 (dotnet#7414) [Mono.Android] Add [Flags] to Android.Nfc.NfcReaderFlags. (dotnet#7410) [monodroid, java-runtime] Add local date time offset monovm prop (dotnet#7331)
grendello · Sep 27, 2022 · d708edc · d708edc
2 parents 71aafd5 + b321a15
commit d708edc
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 18 deletions.
diff --git a/Configuration.props b/Configuration.props
@@ -25,7 +25,7 @@
     <!-- Should correspond to the first value from `$(API_LEVELS)` in `build-tools/api-xml-adjuster/Makefile` -->
     <AndroidFirstFrameworkVersion Condition="'$(AndroidFirstFrameworkVersion)' == ''">v4.4</AndroidFirstFrameworkVersion>
     <AndroidFirstApiLevel Condition="'$(AndroidFirstApiLevel)' == ''">19</AndroidFirstApiLevel>
-    <AndroidJavaRuntimeApiLevel Condition="'$(AndroidJavaRuntimeApiLevel)' == ''">21</AndroidJavaRuntimeApiLevel>
+    <AndroidJavaRuntimeApiLevel Condition="'$(AndroidJavaRuntimeApiLevel)' == ''">26</AndroidJavaRuntimeApiLevel>
     <!-- The min API level supported by Microsoft.Android.Sdk, should refactor/remove when this value is the same as $(AndroidFirstApiLevel) -->
     <AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
     <AndroidFirstPlatformId Condition="'$(AndroidFirstPlatformId)' == ''">$(AndroidFirstApiLevel)</AndroidFirstPlatformId>

diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv
@@ -5898,13 +5898,13 @@ E,19,android/nfc/cardemulation/CardEmulation.SELECTION_MODE_PREFER_DEFAULT,0,And
 E,19,android/nfc/cardemulation/HostApduService.DEACTIVATION_DESELECTED,1,Android.Nfc.CardEmulators.DeactivationReason,Deselected,remove,
 E,19,android/nfc/cardemulation/HostApduService.DEACTIVATION_LINK_LOSS,0,Android.Nfc.CardEmulators.DeactivationReason,LinkLoss,remove,
 E,24,android/nfc/cardemulation/HostNfcFService.DEACTIVATION_LINK_LOSS,0,Android.Nfc.CardEmulators.DeactivationReasonF,DeactivationLinkLoss,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_A,1,Android.Nfc.NfcReaderFlags,NfcA,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_B,2,Android.Nfc.NfcReaderFlags,NfcB,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_BARCODE,16,Android.Nfc.NfcReaderFlags,NfcBarcode,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_F,4,Android.Nfc.NfcReaderFlags,NfcF,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_V,8,Android.Nfc.NfcReaderFlags,NfcV,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS,256,Android.Nfc.NfcReaderFlags,NoPlatformSounds,remove,
-E,19,android/nfc/NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,128,Android.Nfc.NfcReaderFlags,SkipNdefCheck,remove,
+E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_A,1,Android.Nfc.NfcReaderFlags,NfcA,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_B,2,Android.Nfc.NfcReaderFlags,NfcB,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_BARCODE,16,Android.Nfc.NfcReaderFlags,NfcBarcode,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_F,4,Android.Nfc.NfcReaderFlags,NfcF,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_NFC_V,8,Android.Nfc.NfcReaderFlags,NfcV,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS,256,Android.Nfc.NfcReaderFlags,NoPlatformSounds,remove,flags
+E,19,android/nfc/NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK,128,Android.Nfc.NfcReaderFlags,SkipNdefCheck,remove,flags
 E,30,android/nfc/NfcAdapter.PREFERRED_PAYMENT_CHANGED,2,Android.Nfc.PreferredPaymentAction,Changed,remove,
 E,30,android/nfc/NfcAdapter.PREFERRED_PAYMENT_LOADED,1,Android.Nfc.PreferredPaymentAction,Loaded,remove,
 E,30,android/nfc/NfcAdapter.PREFERRED_PAYMENT_UPDATED,3,Android.Nfc.PreferredPaymentAction,Updated,remove,

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>Vlastnost MSBuild „AotAssemblies“ je zastaralá. Upravte soubor projektu v textovém editoru, aby se tato vlastnost odebrala, a místo toho použijte vlastnost MSBuild „RunAOTCompilation“.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</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>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>Die MSBuild-Eigenschaft „AotAssemblies“ ist veraltet. Bearbeiten Sie die Projektdatei in einem Text-Editor, um diese Eigenschaft zu entfernen, und verwenden Sie stattdessen die MSBuild-Eigenschaft „RunAOTCompilation“.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</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>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>La propiedad MSBuild "AotAssemblies" está en desuso. Edite el archivo de proyecto en un editor de texto para quitar esta propiedad y use en su lugar la propiedad MSBuild "RunAOTCompilation".</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>Se detectó el uso de AppDomain.CreateDomain() en el ensamblado: {0}. En .NET 6 y versiones posteriores solo se admitirá una instancia de AppDomain, por lo que esta API ya no estará disponible en Xamarin.Android una vez que se haya lanzado .NET 6.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>La propriété MSBuild « AotAssemblies » est déconseillée. Modifiez le fichier projet dans un éditeur de texte pour supprimer cette propriété et utilisez la propriété MSBuild « RunAOTCompilation » à la place.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>Utilisation de AppDomain.CreateDomain() détectée dans l'assembly : {0}. .NET 6 et les versions ultérieures prend uniquement en charge un seul AppDomain. Cette API ne sera donc plus disponible dans Xamarin.Android après la publication de .NET 6.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>La proprietà MSBuild 'AotAssemblies' è deprecata. Modificare il file di progetto in un editor di testo per rimuovere questa proprietà e usare invece la proprietà MSBuild 'RunAOTCompilation'.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>È stato rilevato l'uso di AppDomain.CreateDomain() nell'assembly: {0}. .NET 6 e versioni successive supporteranno solo un singolo AppDomain, quindi questa API non sarà più disponibile in Xamarin.Android dopo il rilascio di .NET 6.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>'AotAssemblies' MSBuild プロパティは非推奨です。テキスト エディターでプロジェクト ファイルを編集してこのプロパティを削除し、代わりに 'RunAOTCompilation' MSBuild プロパティを使用してください。</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>アセンブリ {0} で AppDomain.CreateDomain() が使用されていることが検出されました。.NET 6 以降では単一の AppDomain のみがサポートされる予定のため、.NET 6 がリリースされるとこの API は Xamarin.Android では使用できなくなります。</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>'AotAssemblies' MSBuild 속성은 더 이상 사용되지 않습니다. 텍스트 편집기에서 프로젝트 파일을 편집하여 이 속성을 제거하고 대신 'RunAOTCompilation' MSBuild 속성을 사용하세요.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>어셈블리에서 AppDomain.CreateDomain()의 사용이 검색되었습니다. {0}. .NET 6 이상에서는 단일 AppDomain만 지원하므로 .NET 6이 릴리스된 후에는 이 API를 Xamarin.Android에서 더 이상 사용할 수 없습니다.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>Właściwość „AotAssemblies” programu MSBuild jest przestarzała. Edytuj plik projektu w edytorze tekstu, aby usunąć tę właściwość, a zamiast tego użyj właściwości „RunAOTCompilation” programu MSBuild.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>Wykryto użycie metody AppDomain.CreateDomain() w zestawie: {0}. Platforma .NET 6 lub nowsza wersja obsługuje tylko jedną domenę aplikacji, dlatego ten interfejs API nie będzie już dostępny w rozszerzeniu Xamarin.Android po wydaniu platformy .NET 6.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>A propriedade MSBuild 'AotAssemblies' foi preterida. Edite o arquivo de projeto em um editor de texto para remover essa propriedade e use a propriedade 'RunAOTCompilation' do MSBuild em lugar disso.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>O uso de AppDomain.CreateDomain() foi detectado no assembly: {0}. O .NET 6 e superior dará suporte apenas a um único AppDomain, portanto, esta API não estará mais disponível no Xamarin.Android quando o .NET 6 for lançado.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>Свойство MSBuild "AotAssemblies" является нерекомендуемым. Удалите это свойство, изменив файл проекта в текстовом редакторе, и используйте вместо этого свойство MSBuild "RunAOTCompilation".</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>В сборке обнаружено использование AppDomain.CreateDomain(): {0}. .NET 6 и более поздние версии будут поддерживать только один домен AppDomain, поэтому этот API больше не будет доступен в Xamarin.Android после выпуска .NET 6.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>'AotAssemblies' MSBuild özelliği kullanım dışı bırakıldı. Bu özelliği kaldırmak için proje dosyasını bir metin düzenleyicisinde düzenleyin ve bunun yerine 'RunAOTCompilation' MSBuild özelliğini kullanın.</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>{0} bütünleştirilmiş kodunda AppDomain.CreateDomain() metodunun kullanıldığı saptandı. .NET 6 üstünde yalnızca tek bir AppDomain destekleneceğinden bu API, .NET 6 yayımlandıktan sonra artık Xamarin.Android içinde bulunmayacaktır.</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>"AotAssemblies" MSBuild 属性已弃用。在文本编辑器中编辑项目文件以删除此属性，并改用 "RunAOTCompilation" MSBuild 属性。</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>在程序集 {0} 中检测到使用了 AppDomain.CreateDomain()。.NET 6 及更高版本将仅支持一个 AppDomain，因此 .NET 6 发布后，将无法再在 Xamarin.Android 中使用此 API。</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain

diff --git a/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx b/src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx
@@ -466,6 +466,10 @@ In this message, the term "binding" means a piece of generated code that makes i
     <value>'AotAssemblies' MSBuild 屬性已被取代。在文字編輯器中編輯專案檔案以移除此屬性，並改為使用 'RunAOTCompilation' MSBuild 屬性。</value>
     <comment>The following are literal names and should not be translated: 'AotAssemblies', 'RunAOTCompilation'</comment>
   </data>
+  <data name="XA1030" xml:space="preserve">
+    <value>The 'RunAOTCompilation' MSBuild property is only supported when trimming is enabled. Edit the project file in a text editor to set 'PublishTrimmed' to 'true' for this build configuration.</value>
+    <comment>The following are literal names and should not be translated: 'RunAOTCompilation', 'PublishTrimmed'</comment>
+  </data>
   <data name="XA2000" xml:space="preserve">
     <value>在下列組件中偵測到使用 AppDomain.CreateDomain(): {0}。.NET 6 及更新版本只支援單一 AppDomain，因此在 .NET 6 發行之後，此 API 就無法再於 Xamarin.Android 中使用。</value>
     <comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain