[net8.0] Merge main into net8.0. (#18609)

xamarin · Aug 2, 2023 · 26b46ed · 26b46ed · vs-mobiletools-engineering-service2 · Aug 2, 2023
2 parents 72811eb + 34667eb
commit 26b46ed
Show file tree

Hide file tree

Showing 29 changed files with 234 additions and 1,102 deletions.
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -0,0 +1,148 @@
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: need-info
+      - noActivitySince:
+          days: 7
+      actions:
+      - addReply:
+          reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
+      - closeIssue
+    - description: 
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: need-repro
+      - noActivitySince:
+          days: 7
+      actions:
+      - addReply:
+          reply: Hi @${issueAuthor}. Due to inactivity, we will be closing this issue. Please feel free to re-open this issue if the issue persists. For enhanced visibility, if over 7 days have passed, please open a new issue and link this issue there. Thank you.
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isOpen
+      - hasLabel:
+          label: move-to-vs-feedback
+      - noActivitySince:
+          days: 3
+      actions:
+      - addReply:
+          reply: This issue is being closed due to inactivity. If this issue is still affecting you, please follow the steps above to use the VS Feedback Tool to report the issue.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: need-info
+      then:
+      - addReply:
+          reply: Hi @${issueAuthor}. We have added the "need-info" label to this issue, which indicates that we have an open question for you before we can take further action. This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
+      description: 
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: need-repro
+      then:
+      - addReply:
+          reply: >-
+            Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/xamarin/xamarin-macios/blob/main/docs/bug-repro.md
+
+
+            This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isOpen
+      - or:
+        - hasLabel:
+            label: need-info
+        - hasLabel:
+            label: need-repro
+      - not:
+          activitySenderHasPermission:
+            permission: Admin
+      - not:
+          activitySenderHasPermission:
+            permission: Write
+      then:
+      - removeLabel:
+          label: need-info
+      - removeLabel:
+          label: need-repro
+      - addLabel:
+          label: need-attention
+      description: 
+    - if:
+      - payloadType: Issues
+      - isOpen
+      - labelAdded:
+          label: move-to-vs-feedback
+      then:
+      - addReply:
+          reply: >-
+            Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.
+
+
+            If you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.
+
+
+            1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue
+
+            2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.
+
+
+            This issue will be automatically closed in 3 days if there are no further comments.
+      description: 
+onFailure: 
+onSuccess: 
diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx
@@ -1206,7 +1206,7 @@
         <value>Úloze “{0}“ nebyla určena hodnota parametru „{1}“, která se při sestavování na této platformě vyžaduje.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Sestavení illink neexistuje: „{0}“</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx
@@ -1206,7 +1206,7 @@
         <value>Der "{0}"-Aufgabe wurde kein Wert für den Parameter "{1}" übergeben, der beim Erstellen auf dieser Plattform erforderlich ist.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Die illink-Assembly ist nicht vorhanden: „{0}“.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx
@@ -1206,7 +1206,7 @@
         <value>A la tarea "{0}" no se le asignó un valor para el parámetro "{1}", que es necesario para compilar en esta plataforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>El ensamblado illink no existe: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx
@@ -1206,7 +1206,7 @@
         <value>La tâche « {0} » n’a pas reçu de valeur pour le paramètre « {1} », ce qui est requis lors de la génération sur cette plateforme.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>L’assembly illink n’existe pas : '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx
@@ -1206,7 +1206,7 @@
         <value>All'attività "{0}" non è stato assegnato un valore per il parametro "{1}", necessario per la compilazione in questa piattaforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>L'assembly illink non esiste: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx
@@ -1206,7 +1206,7 @@
         <value>"{0}" タスクにパラメーター "{1}" の値が指定されませんでした。これは、このプラットフォームでビルドするときに必要です。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink アセンブリが存在しません: '{0}'。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ko.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ko.resx
@@ -1206,7 +1206,7 @@
         <value>"{0}" 작업에 이 플랫폼에서 빌드할 때 필요한 매개 변수 "{1}" 값이 제공되지 않았습니다.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>잘못된 어셈블리가 없습니다. '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pl.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pl.resx
@@ -1206,7 +1206,7 @@
         <value>Zadanie „{0}” nie otrzymało wartości parametru „{1}”, która jest wymagana podczas kompilowania na tej platformie.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Zestaw plików illink nie istnieje „{0}”.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-BR.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-BR.resx
@@ -1206,7 +1206,7 @@
         <value>A tarefa "{0}" não recebeu um valor para o parâmetro "{1}", que é necessário ao compilar nesta plataforma.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>O assembly illink não existe: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ru.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ru.resx
@@ -1206,7 +1206,7 @@
         <value>Задаче "{0}" не было присвоено значение параметра "{1}", которое требуется при сборке на этой платформе.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>Сборка illink не существует: '"{0}".</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.tr.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.tr.resx
@@ -1206,7 +1206,7 @@
         <value>"{0}" görevine bu platformda derleme sırasında gerekli olan "{1}" parametresi için bir değer verilmedi.</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink derlemesi yok: '{0}'.</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hans.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hans.resx
@@ -1206,7 +1206,7 @@
         <value>"{0}"任务未给参数 "{1}" 提供值，在此平台上生成时需要该值。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink 程序集不存在:“{0}”。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hant.resx b/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hant.resx
@@ -1206,7 +1206,7 @@
         <value>"{0}" 工作未指定參數 "{1}" 的值，這是在此平台上建置時的必要值。</value>
     </data>
   <data name="E7115" xml:space="preserve">
-        <value>The illink assembly doesn't exist: '{0}'.</value>
+        <value>illink 組件不存在: '{0}'。</value>
         <comment>
             {0}: the path to the linker assembly
         </comment>

diff --git a/tests/xharness/Harness.cs b/tests/xharness/Harness.cs
@@ -163,7 +163,12 @@ string MlaunchPath {
 						return $"Not building any mobile platform, so can't provide a location to mlaunch.";
 					}
 					var mlaunchPath = Path.Combine (DOTNET_DIR, "packs");
-					mlaunchPath = Path.Combine (mlaunchPath, $"Microsoft.{platform}.Sdk", config [$"{platform.ToUpperInvariant ()}_NUGET_VERSION_NO_METADATA"]);
+					// there is a diff between getting the path for the current platform when running on CI or off CI. The config files in the CI do not 
+					// contain the correct workload version, the reason for this is that the workload is built in a different machine which means that
+					// the Make.config will use the wrong version. The CI set the version in the environment variable {platform}_WORKLOAD_VERSION via a script.
+					var workloadVersion = Environment.GetEnvironmentVariable ($"{platform.ToUpperInvariant ()}_WORKLOAD_VERSION");
+					mlaunchPath = Path.Combine (mlaunchPath, $"Microsoft.{platform}.Sdk",
+							string.IsNullOrEmpty (workloadVersion) ? config [$"{platform.ToUpperInvariant ()}_NUGET_VERSION_NO_METADATA"] : workloadVersion);
 					mlaunchPath = Path.Combine (mlaunchPath, "tools", "bin", "mlaunch");
 					return mlaunchPath;
 				} else if (INCLUDE_XAMARIN_LEGACY && INCLUDE_IOS) {

diff --git a/tools/mtouch/TranslatedAssemblies/Errors.cs.resx b/tools/mtouch/TranslatedAssemblies/Errors.cs.resx
@@ -1537,10 +1537,10 @@
 		<value>Registrátor našel neoptimální typ {0}: tento typ postrádá konstruktor, který přijímá dva argumenty (ObjCRuntime.NativeHandle, bool). Našel (a použil se) se však konstruktor, který přijímá dva argumenty (System.IntPtr, bool). Důrazně doporučujeme změnit podpis na konstruktoru (System.IntPtr, bool) na (ObjCRuntime.NativeHandle, bool).</value>
 	</data>
   <data name="MX4187" xml:space="preserve">
-		<value>Could not find a [UserDelegateType] attribute on the type '{0}'.</value>
+		<value>Nelze najít atribut [UserDelegateType] u typu „{0}“.</value>
 	</data>
   <data name="MX4188" xml:space="preserve">
-		<value>Unable to compute the block signature for the type '{0}': {1}</value>
+		<value>Nepovedlo se vypočítat signaturu bloku pro typ „{0}“: {1}</value>
 	</data>
   <data name="MT5101" xml:space="preserve">
 		<value>Chybí kompilátor {0}. Nainstalujte prosím nástroje příkazového řádku Xcode.
@@ -1805,12 +1805,12 @@
 		<value>Argument musí být neprázdný řetězec.</value>
 	</data>
   <data name="MX8053" xml:space="preserve">
-		<value>Could not resolve the module in the assembly {0}.</value>
+		<value>Modul v sestavení {0} nelze přeložit.</value>
 	</data>
   <data name="MX8054" xml:space="preserve">
-		<value>Can't resolve metadata tokens for methods when using the managed static registrar (token: 0x{0}).</value>
+		<value>Nelze přeložit tokeny metadat pro metody při použití spravovaného statického registrátora (token: 0x{0}).</value>
 	</data>
   <data name="MX8055" xml:space="preserve">
-		<value>Could not find the type 'ObjCRuntime.__Registrar__' in the assembly '{0}'.</value>
+		<value>V sestavení „{0}“ nelze najít typ „ObjCRuntime.__Registrar__“.</value>
 	</data>
 </root>
diff --git a/tools/mtouch/TranslatedAssemblies/Errors.de.resx b/tools/mtouch/TranslatedAssemblies/Errors.de.resx
@@ -1537,10 +1537,10 @@
 		<value>Die Registrierungsstelle hat einen nicht optimalen Typ "{0}" gefunden: Der Typ verfügt nicht über einen Konstruktor, der zwei Argumente (ObjCRuntime.NativeHandle, bool) akzeptiert. Es wurde jedoch ein Konstruktor gefunden, der zwei Argumente (System.IntPtr, bool) akzeptiert (und stattdessen verwendet wird). Es wird dringend empfohlen, die Signatur des (System.IntPtr, bool)-Konstruktors in (ObjCRuntime.NativeHandle, bool) zu ändern.</value>
 	</data>
   <data name="MX4187" xml:space="preserve">
-		<value>Could not find a [UserDelegateType] attribute on the type '{0}'.</value>
+		<value>Für den Typ „{0}“ wurde kein [UserDelegateType]-Attribut gefunden.</value>
 	</data>
   <data name="MX4188" xml:space="preserve">
-		<value>Unable to compute the block signature for the type '{0}': {1}</value>
+		<value>Die Blocksignatur für den Typ „{0}“ kann nicht berechnet werden: {1}</value>
 	</data>
   <data name="MT5101" xml:space="preserve">
 		<value>Der Compiler "{0}" fehlt. Installieren Sie die Xcode-Komponente "Befehlszeilentools".
@@ -1805,12 +1805,12 @@
 		<value>Die Signatur darf keine leere Zeichenfolge sein.</value>
 	</data>
   <data name="MX8053" xml:space="preserve">
-		<value>Could not resolve the module in the assembly {0}.</value>
+		<value>Das Modul in der Assembly {0} konnte nicht aufgelöst werden.</value>
 	</data>
   <data name="MX8054" xml:space="preserve">
-		<value>Can't resolve metadata tokens for methods when using the managed static registrar (token: 0x{0}).</value>
+		<value>Metadatentoken für Methoden können nicht aufgelöst werden, wenn die verwaltete statische Registrierungsstelle verwendet wird (Token: 0x{0}).</value>
 	</data>
   <data name="MX8055" xml:space="preserve">
-		<value>Could not find the type 'ObjCRuntime.__Registrar__' in the assembly '{0}'.</value>
+		<value>Der Typ „ObjCRuntime.__Registrar__“ wurde in der Assembly „{0}“ nicht gefunden.</value>
 	</data>
 </root>
diff --git a/tools/mtouch/TranslatedAssemblies/Errors.es.resx b/tools/mtouch/TranslatedAssemblies/Errors.es.resx
@@ -1537,10 +1537,10 @@
 		<value>El registrador encontró un tipo "{0}" no óptimo: el tipo no tiene un constructor que tome dos argumentos (ObjCRuntime.NativeHandle, bool). Sin embargo, se encontró un constructor que toma dos argumentos (System.IntPtr, bool) y se usará en su lugar. Se recomienda encarecidamente cambiar la signatura del constructor (System.IntPtr, bool) para que sea (ObjCRuntime.NativeHandle, bool).</value>
 	</data>
   <data name="MX4187" xml:space="preserve">
-		<value>Could not find a [UserDelegateType] attribute on the type '{0}'.</value>
+		<value>No se encontró un atributo [UserDelegateType] en el tipo '{0}'.</value>
 	</data>
   <data name="MX4188" xml:space="preserve">
-		<value>Unable to compute the block signature for the type '{0}': {1}</value>
+		<value>No se puede calcular la firma de bloque para el tipo '{0}': {1}</value>
 	</data>
   <data name="MT5101" xml:space="preserve">
 		<value>Falta el compilador "{0}". Instale el componente "Herramientas de línea de comandos" de Xcode.
@@ -1805,12 +1805,12 @@
 		<value>La firma debe ser una cadena no vacía.</value>
 	</data>
   <data name="MX8053" xml:space="preserve">
-		<value>Could not resolve the module in the assembly {0}.</value>
+		<value>No se pudo resolver el módulo en el ensamblado {0}.</value>
 	</data>
   <data name="MX8054" xml:space="preserve">
-		<value>Can't resolve metadata tokens for methods when using the managed static registrar (token: 0x{0}).</value>
+		<value>No se pueden resolver tokens de metadatos para métodos cuando se usa el registrador estático administrado (token: 0x{0}).</value>
 	</data>
   <data name="MX8055" xml:space="preserve">
-		<value>Could not find the type 'ObjCRuntime.__Registrar__' in the assembly '{0}'.</value>
+		<value>No se encontró el tipo 'ObjCRuntime.__Registrar__' en el ensamblado '{0}'.</value>
 	</data>
 </root>