Merge branch 'main' into il_strip_net6

.github/workflows/label-checker.yml

@@ -17,14 +17,14 @@ jobs:
     - run: exit 0
       name: 'Monojenkins PR'
       # always happy if monojenkins
-      if: github.actor == 'vs-mobiletools-engineering-service2' || github.actor == 'github-actions[bot]'
+      if: github.actor == 'vs-mobiletools-engineering-service2' || github.actor == 'github-actions[bot] || github.actor == 'dotnet-maestro'
 
     - run: exit 1
       name: 'User PR with no labels'
-      # failure if not monojenkins and no labels
-      if: github.actor != 'vs-mobiletools-engineering-service2' && join(github.event.pull_request.labels, ',') == ''
+      # failure if not monojenkins and not dotnet-maestro and no labels
+      if: github.actor != 'vs-mobiletools-engineering-service2' && github.actor != 'dotnet-maestro' && join(github.event.pull_request.labels, ',') == ''
 
     - run: exit 0
       name: 'User PR with labels'
       # success if not monojenkins but labels
-      if: github.actor != 'vs-mobiletools-engineering-service2' && join(github.event.pull_request.labels, ',') != ''
+      if: github.actor != 'vs-mobiletools-engineering-service2' && github.actor != 'dotnet-maestro' && join(github.event.pull_request.labels, ',') != ''

Make.config

@@ -74,8 +74,8 @@ PULL_REQUEST_ID=$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)
 endif
 
 # For release branches, modify the following variables to hardcode a version name
-# Set the NUGET_HARDCODED_PRERELEASE_IDENTIFIER variable to the prerelease identifer you want (say "preview.5." (the trailing dot is important)
-NUGET_HARDCODED_PRERELEASE_IDENTIFIER=preview.10.
+# Set the NUGET_HARDCODED_PRERELEASE_IDENTIFIER variable to the prerelease identifer you want (say "preview.10")
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=preview.10
 # Set the NUGET_HARDCODED_PRERELEASE_BRANCH variable to the exact name for the branch the above variable should apply to (so that any other branches won't pick it up by accident).
 # For the previous example, this would be "release/6.0.1xx-preview5"
 # When creating a release branch from main, this must be changed from "main" to the new release branch.
@@ -89,7 +89,7 @@ NUGET_HARDCODED_PRERELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%
 ifneq ($(PULL_REQUEST_ID),)
 NUGET_PRERELEASE_IDENTIFIER=ci.pr.gh$(PULL_REQUEST_ID).
 else ifeq ($(NUGET_HARDCODED_PRERELEASE_BRANCH_ALPHANUMERIC),$(CURRENT_BRANCH_ALPHANUMERIC))
-NUGET_PRERELEASE_IDENTIFIER=$(NUGET_HARDCODED_PRERELEASE_IDENTIFIER)
+NUGET_PRERELEASE_IDENTIFIER=$(NUGET_HARDCODED_PRERELEASE_IDENTIFIER).
 else
 NUGET_PRERELEASE_IDENTIFIER=ci.$(CURRENT_BRANCH_ALPHANUMERIC).
 endif

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -255,8 +255,10 @@
 	<!-- PublishTrimmed must be calculated as part of a target because IsMacEnabled on Windows will be set after connecting to the Mac -->
 	<Target Name="_ComputePublishTrimmed">
 		<PropertyGroup>
-			<PublishTrimmed Condition="'$(PublishTrimmed)' == '' And '$(RuntimeIdentifier)' != '' And ($(_ProjectType.EndsWith('ExecutableProject')) Or $(_ProjectType.EndsWith('AppExtensionProject'))) And '$(IsMacEnabled)' == 'true'">true</PublishTrimmed>
+			<_MustTrim Condition="'$(_MustTrim)' == '' And '$(RuntimeIdentifier)' != '' And ($(_ProjectType.EndsWith('ExecutableProject')) Or $(_ProjectType.EndsWith('AppExtensionProject'))) And '$(IsMacEnabled)' == 'true'">true</_MustTrim>
+			<PublishTrimmed Condition="'$(PublishTrimmed)' == '' And '$(_MustTrim)' == 'true'">true</PublishTrimmed>
 		</PropertyGroup>
+		<Error Condition="'$(_MustTrim)' == 'true' And '$(PublishTrimmed)' != 'true'" Text="$(_PlatformName) projects must build with PublishTrimmed=true. Current value: $(PublishTrimmed)." />
 	</Target>
 
 	<Target Name="_WarnRuntimeIdentifiersClash" Condition="'$(_RuntimeIdentifiersClashMessage)' != ''">
@@ -994,15 +996,12 @@
 			_ReadAppManifest;
 			_WriteAppManifest;
 			_CompileNativeExecutable;
+			_ComputeLinkNativeExecutableInputs;
 		</_LinkNativeExecutableDependsOn>
 	</PropertyGroup>
 
-	<Target Name="_LinkNativeExecutable"
-			DependsOnTargets="$(_LinkNativeExecutableDependsOn)"
-			Inputs="@(_NativeExecutableObjectFiles)"
-			Outputs="$(_IntermediateNativeLibraryDir)$(_NativeExecutableName)"
-		>
-		<ItemGroup>
+	<Target Name="_ComputeLinkNativeExecutableInputs">
+		<ItemGroup Condition="'$(IsMacEnabled)' == 'true'">
 			<_XamarinMainLibraries Include="$(_XamarinNativeLibraryDirectory)/$(_LibXamarinName)" />
 			<!-- Link with the libraries shipped with the mono runtime pack -->
 			<_XamarinMainLibraries Include="@(_MonoLibrary)" />
@@ -1018,7 +1017,18 @@
 			<!-- Mono requires zlib and iconv -->
 			<_MainLinkerFlags Include="-lz" />
 			<_MainLinkerFlags Include="-liconv" />
+
+			<!-- Here we must add all the files that should make us (re-)link the executable -->
+			<_LinkNativeExecutableInputs Include="@(_NativeExecutableObjectFiles)" />
+			<_LinkNativeExecutableInputs Include="@(_XamarinMainLibraries)" />
 		</ItemGroup>
+	</Target>
+
+	<Target Name="_LinkNativeExecutable"
+			DependsOnTargets="$(_LinkNativeExecutableDependsOn)"
+			Inputs="@(_LinkNativeExecutableInputs)"
+			Outputs="$(_IntermediateNativeLibraryDir)$(_NativeExecutableName)"
+		>
 
 		<LinkNativeCode
 			SessionId="$(BuildSessionId)"

eng/Version.Details.xml

@@ -1,12 +1,12 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rtm.21472.4">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rtm.21476.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>06123d8e7494c1944ca9707fbd1bd17dad99ff26</Sha>
+      <Sha>885ff3819901e75ee1782185a53a3ab4ea6deac8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21459.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
-      <Uri>https://github.com/mono/linker</Uri>
-      <Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21473.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+      <Uri>https://github.com/dotnet/linker</Uri>
+      <Sha>d51cc207fac85547787bbba83f54f69d8e72e9f5</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -1,8 +1,8 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rtm.21472.4</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rtm.21476.2</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21473.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
   </PropertyGroup>

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx

@@ -711,10 +711,10 @@
         <value>Poskytnutá cesta k archivu nepochází z platného souboru archivu (.xcarchive). Cesta k archivu: {0}</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Nepovedlo se namapovat verzi macOS {0} na odpovídající verzi iOS.</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Could not map the iOS version {0} to a corresponding macOS version</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Nepovedlo se přeložit IP adresy hostitele pro nastavení ladicího programu Wi-Fi.
@@ -1047,7 +1047,7 @@
         </comment>
     </data>
   <data name="E7081" xml:space="preserve">
-        <value>The AOT compiler '{0}' does not exist.</value>
+        <value>Kompilátor AOT {0} neexistuje.</value>
         <comment>
             AOT: Ahead-Of-Time
             {0}: the path to the compiler

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx

@@ -711,10 +711,10 @@
         <value>Der angegebene Archivpfad stammt nicht aus einer gültigen Archivdatei (XCARCHIVE). Archivpfad: "{0}"</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Die macOS-Version {0} konnte keiner entsprechenden macOS-Version zugeordnet werden.</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Could not map the iOS version {0} to a corresponding macOS version</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Die Host-IP-Adressen für die WLAN-Debuggereinstellungen konnten nicht aufgelöst werden.
@@ -1047,7 +1047,7 @@
         </comment>
     </data>
   <data name="E7081" xml:space="preserve">
-        <value>The AOT compiler '{0}' does not exist.</value>
+        <value>Der AOT-Compiler „{0}“ ist nicht vorhanden.</value>
         <comment>
             AOT: Ahead-Of-Time
             {0}: the path to the compiler

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx

@@ -711,10 +711,10 @@
         <value>La ruta de acceso de archivo proporcionada no pertenece a un archivo de almacenamiento (.xcarchive) válido. Ruta de acceso de archivo: "{0}"</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>No se pudo asignar la versión de macOS {0} a una versión de iOS correspondiente</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>No se pudo asignar la versión de iOS {0} a una versión de macOS correspondiente</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>No se pudieron resolver las direcciones IP del host para la configuración del depurador Wi-Fi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx

@@ -711,10 +711,10 @@
         <value>Le chemin d'archive fourni ne provient pas d'un fichier d'archive valide (.xcarchive). Chemin d'archive : « {0} »</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Impossible de mapper la version iOS {0} à une version correspondante</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Impossible de faire correspondre la version iOS{0} à la version macOS correspondante</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Impossible de résoudre les adresses IP des hôtes pour les paramètres du débogueur Wi-Fi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx

@@ -711,10 +711,10 @@
         <value>Il percorso dell'archivio specificato non è un file di archivio valido (estensione xcarchive). Percorso dell'archivio: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Non è stato possibile eseguire il mapping della versione macOS {0} a una versione di iOS corrispondente</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Non è stato possibile eseguire il mapping della versione iOS {0} a una versione di macOS corrispondente</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Non è stato possibile risolvere gli indirizzi IP host per le impostazioni del debugger Wi-Fi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx

@@ -711,10 +711,10 @@
         <value>指定されたアーカイブ パスは、有効なアーカイブ ファイル (.xcarchive) からのものではありません。アーカイブ パス: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>macOS バージョン {0} を対応する iOS バージョンにマップできません</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Could not map the iOS version {0} to a corresponding macOS version</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>WiFi デバッガー設定のホスト IP を解決できませんでした。
@@ -1047,7 +1047,7 @@
         </comment>
     </data>
   <data name="E7081" xml:space="preserve">
-        <value>The AOT compiler '{0}' does not exist.</value>
+        <value>AOT コンパイラ '{0}' が存在しません。</value>
         <comment>
             AOT: Ahead-Of-Time
             {0}: the path to the compiler

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ko.resx

@@ -711,10 +711,10 @@
         <value>입력된 보관 경로의 출처가 유효한 보관 파일(.xcarchive)이 아닙니다. 보관 경로: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>macOS 버전 {0}을(를) 해당 iOS 버전에 매핑할 수 없습니다.</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Could not map the iOS version {0} to a corresponding macOS version</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>WiFi 디버거 설정의 호스트 IP를 확인할 수 없습니다.
@@ -1047,7 +1047,7 @@
         </comment>
     </data>
   <data name="E7081" xml:space="preserve">
-        <value>The AOT compiler '{0}' does not exist.</value>
+        <value>AOT 컴파일러 '{0}'이(가) 없습니다.</value>
         <comment>
             AOT: Ahead-Of-Time
             {0}: the path to the compiler

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pl.resx

@@ -711,10 +711,10 @@
         <value>Podana ścieżka archiwum nie pochodzi z prawidłowego pliku archiwum (.xcarchive). Ścieżka archiwum: „{0}”</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Nie można zmapować wersji systemu MacOS {0} na odpowiadającą jej wersję systemu iOS</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Nie można zmapować systemu iOS w wersji {0} na odpowiadającą jej wersję systemu macOS</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Nie można rozpoznać adresów IP hosta dla ustawień debugera WiFi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-BR.resx

@@ -711,10 +711,10 @@
         <value>O Caminho do Arquivo Morto fornecido não é de um arquivo morto válido (.xcarchive). Caminho do Arquivo Morto: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Não foi possível mapear a versão {0} do macOS para uma versão correspondente do iOS</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Não foi possível mapear a versão iOS {0} para uma versão macOS correspondente</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Não foi possível resolver os IPs do host para as configurações do depurador de WiFi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ru.resx

@@ -711,10 +711,10 @@
         <value>Указанный путь к архиву ведет к недопустимому файлу архива (XCARCHIVE). Путь к архиву: "{0}".</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>Не удалось сопоставить версию macOS {0} с соответствующей версией iOS</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>Не удалось сопоставить версию iOS {0} с соответствующей версией macOS</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Не удалось разрешить IP-адреса узлов для параметров отладчика Wi-Fi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.tr.resx

@@ -711,10 +711,10 @@
         <value>Sağlanan Arşiv yolu geçerli bir arşiv dosyasından (.xcarchive) değil. Arşiv Yolu: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>{0} macOS sürümü karşılık gelen bir iOS sürümüne eşlenemedi</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>{0} iOS sürümüne karşılık gelen bir macOS sürümüne eşlenemedi</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>Wi-Fi hata ayıklayıcısı ayarları için konak IP'leri çözümlenemedi.

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hans.resx

@@ -711,10 +711,10 @@
         <value>提供的存档路径并非来自有效的存档文件(.xcarchive)。存档路径:“{0}”</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>无法将 macOS 版本 {0} 映射到相应 iOS 版本</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>无法将 iOS 版本的 {0} 映射到相应的 macOS 版本</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>无法解析 WiFi 调试程序设置的主机 IP。

msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hant.resx

@@ -711,10 +711,10 @@
         <value>提供的封存路徑不是來自有效的封存檔案 (.xcarchive)。封存路徑: '{0}'</value>
     </data>
   <data name="E0187" xml:space="preserve">
-        <value>無法將 macOS 版本 {0}　對應至相應的 iOS 版本</value>
+        <value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
     </data>
   <data name="E0188" xml:space="preserve">
-        <value>無法將 iOS 版本 {0}　對應至相應的 macOS 版本</value>
+        <value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
     </data>
   <data name="E7001" xml:space="preserve">
         <value>無法解析 WiFi 偵錯工具設定的主機 IP。