Align hangdump type help with validator

src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpCommandLineProvider.cs

@@ -22,12 +22,20 @@ internal sealed class HangDumpCommandLineProvider : CommandLineOptionsProviderBa
     private static readonly string[] HangDumpTypeOptions = ["Mini", "Heap", "Full", "None"];
 #endif
 
+    private static readonly string HangDumpTypeOptionsForDescription = FormatHangDumpTypeOptions("or");
+
+    private static readonly string HangDumpTypeOptionsForValidation = FormatHangDumpTypeOptions("and");
+
     private static readonly IReadOnlyCollection<CommandLineOption> CachedCommandLineOptions =
     [
         new(HangDumpOptionName, ExtensionResources.HangDumpOptionDescription, ArgumentArity.Zero, false),
         new(HangDumpTimeoutOptionName, ExtensionResources.HangDumpTimeoutOptionDescription, ArgumentArity.ExactlyOne, false),
         new(HangDumpFileNameOptionName, ExtensionResources.HangDumpFileNameOptionDescription, ArgumentArity.ExactlyOne, false),
-        new(HangDumpTypeOptionName, ExtensionResources.HangDumpTypeOptionDescription, ArgumentArity.ExactlyOne, false)
+        new(
+            HangDumpTypeOptionName,
+            string.Format(CultureInfo.InvariantCulture, ExtensionResources.HangDumpTypeOptionDescription, HangDumpTypeOptionsForDescription),
+            ArgumentArity.ExactlyOne,
+            false)
     ];
 
     public HangDumpCommandLineProvider()
@@ -51,7 +59,11 @@ public override Task<ValidationResult> ValidateOptionArgumentsAsync(CommandLineO
         {
             if (!HangDumpTypeOptions.Contains(arguments[0], StringComparer.OrdinalIgnoreCase))
             {
-                return ValidationResult.InvalidTask(string.Format(CultureInfo.InvariantCulture, ExtensionResources.HangDumpTypeOptionInvalidType, arguments[0]));
+                return ValidationResult.InvalidTask(string.Format(
+                    CultureInfo.InvariantCulture,
+                    ExtensionResources.HangDumpTypeOptionInvalidType,
+                    arguments[0],
+                    HangDumpTypeOptionsForValidation));
             }
         }
 
@@ -65,4 +77,12 @@ public override Task<ValidationResult> ValidateCommandLineOptionsAsync(ICommandL
             !commandLineOptions.IsOptionSet(HangDumpOptionName)
             ? ValidationResult.InvalidTask(ExtensionResources.MissingHangDumpMainOption)
             : ValidationResult.ValidTask;
+
+    private static string FormatHangDumpTypeOptions(string conjunction)
+    {
+        string[] quotedOptions = Array.ConvertAll(HangDumpTypeOptions, option => $"'{option}'");
+        return quotedOptions.Length == 1
+            ? quotedOptions[0]
+            : string.Join(", ", quotedOptions, 0, quotedOptions.Length - 1) + $" {conjunction} " + quotedOptions[^1];
+    }
 }

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/ExtensionResources.resx

@@ -188,12 +188,12 @@ The timeout value is specified in one of the following formats:
   </data>
   <data name="HangDumpTypeOptionDescription" xml:space="preserve">
     <value>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</value>
   </data>
   <data name="HangDumpTypeOptionInvalidType" xml:space="preserve">
     <value>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</value>
+Valid options are {1}</value>
   </data>
   <data name="HangDumpUnsupportedRequestTypeErrorMessage" xml:space="preserve">
     <value>Request of type '{0}' is not supported</value>

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.cs.xlf

@@ -113,18 +113,18 @@ Hodnota časového limitu se zadává v jednom z následujících formátů:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Určete typ výpisu paměti.
-Platné hodnoty jsou Mini, Heap, Triage, None (dostupné jenom v .NET 6+) nebo Full.
-Výchozí typ je Full.</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">{0} není platný typ výpisu paměti.
-Platné možnosti jsou Mini, Heap, Triage, None (dostupné jenom v .NET 6+) a Full.</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.de.xlf

@@ -113,18 +113,18 @@ Der Timeoutwert wird in einem der folgenden Formate angegeben:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Geben Sie den Typ des Speicherabbilds an.
-Gültige Werte sind „Mini“, „Heap“, „Triage“, „None“ (nur in .NET 6 und höher verfügbar) oder „Full“.
-Der Standardtyp ist „Full“.</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">„{0}“ ist kein gültiger Speicherabbildtyp.
-Gültige Optionen sind „Mini“, „Heap“, „Triage“ (nur in .NET 6 und höher verfügbar) und „Full“.</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.es.xlf

@@ -113,18 +113,18 @@ El valor de tiempo de espera se especifica en uno de los formatos siguientes:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Especifique el tipo de volcado.
-Los valores válidos son "Mini", "Heap", "Triage", "None" (solo disponible en .NET 6+) o "Full".
-El tipo predeterminado es 'Full'</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">'{0}' no es un tipo de volcado válido.
-Las opciones válidas son "Mini", "Heap", "Triage", "None" (solo disponible en .NET 6+) y "Full"</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.fr.xlf

@@ -113,18 +113,18 @@ La valeur du délai d'expiration est spécifiée dans l'un des formats suivants
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Spécifiez le type de vidage.
-Les valeurs valides sont « Mini », « Heap », « Triage », « None » (uniquement disponible dans .NET 6+) ou « Full ».
-Le type par défaut est « Complet »</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">« {0} » n'est pas un type de vidage valide.
-Les options valides sont « Mini », « Heap », « Triage », « None » (uniquement disponible dans .NET 6+) et « Full »</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.it.xlf

@@ -113,18 +113,18 @@ Il valore del timeout è specificato in uno dei formati seguenti:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Specificare il tipo di dump.
-I valori validi sono 'Mini', 'Heap', 'Triage', 'None' (disponibile solo in .NET 6+) o 'Full'.
-Il tipo predefinito è 'Full'</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">'{0}' non è un tipo di dump valido.
-Le opzioni valide sono 'Mini', 'Heap', 'Triage', 'None' (disponibile solo in .NET 6+) e 'Full'</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.ja.xlf

@@ -113,18 +113,18 @@ The timeout value is specified in one of the following formats:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">ダンプの型を指定します。
-有効な値は、'Mini'、'Heap'、'Triage'、'None' (.NET 6 以降でのみ利用可能)、または 'Full' です。
-既定の型は 'Full' です</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">'{0}' は有効なダンプの型ではありません。
-有効なオプションは、'Mini'、'Heap'、'Triage'、'None' (.NET 6 以降でのみ利用可能)、'Full' です</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.ko.xlf

@@ -113,18 +113,18 @@ The timeout value is specified in one of the following formats:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">덤프의 유형을 지정합니다.
-유효한 값은 'Mini', 'Heap', 'Triage', 'None'(.NET 6+에서만 사용 가능) 또는 'Full'입니다.
-기본 유형은 'Full'입니다.</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">'{0}'은(는) 올바른 덤프 유형이 아닙니다.
-유효한 옵션은 'Mini', 'Heap', 'Triage', 'None'(.NET 6 이상에서만 사용 가능) 및 'Full'입니다.</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.pl.xlf

@@ -113,18 +113,18 @@ Wartość limitu czasu jest określana w jednym z następujących formatów:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Określ typ zrzutu.
-Prawidłowe wartości to „Mini”, „Heap”, „Triage”, „None” (dostępne tylko na platformie .NET 6+) lub „Full”.
-Domyślny typ to „Full”</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">„{0}” nie jest prawidłowym typem zrzutu.
-Prawidłowe opcje to „Mini”, „Heap”, „Triage”, „None” (dostępne tylko na platformie .NET 6+) i „Full”</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.pt-BR.xlf

@@ -113,18 +113,18 @@ O valor de tempo limite é especificado em um dos seguintes formatos:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Especifique o tipo do despejo.
-Os valores válidos são "Mini", "Heap", "Triage", "None" (disponível somente no .NET 6+) ou "Full".
-O tipo padrão é ''Full''</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">"{0}" não é um tipo de despejo válido.
-As opções válidas são "Mini", "Heap", "Triage", "None" (disponível somente no .NET 6+) e "Full"</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.ru.xlf

@@ -113,18 +113,18 @@ The timeout value is specified in one of the following formats:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Укажите тип дампа.
-Допустимые значения: "Mini", "Heap", "Triage", "None" (доступно только в .NET 6+) или "Full".
-Тип по умолчанию — "Full"</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">"{0}" не является допустимым типом дампа.
-Допустимые параметры: "Mini", "Heap", "Triage", "None" (доступно только в .NET 6+) и "Full"</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.tr.xlf

@@ -113,18 +113,18 @@ Zaman aşımı değeri, aşağıdaki biçimlerden biri ile belirtilir:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">Dökümün türünü belirtin.
-Geçerli değerler: 'Mini', 'Heap', 'Triage', 'None' (yalnızca .NET 6+ sürümlerinde kullanılabilir) veya 'Full'.
-Varsayılan tür: 'Full'</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">'{0}' geçerli bir döküm türü değil.
-Geçerli seçenekler: 'Mini', 'Heap', 'Triage', 'None' (yalnızca .NET 6+ sürümlerinde kullanılabilir) ve 'Full'</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">

src/Platform/Microsoft.Testing.Extensions.HangDump/Resources/xlf/ExtensionResources.zh-Hans.xlf

@@ -113,18 +113,18 @@ The timeout value is specified in one of the following formats:
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionDescription">
         <source>Specify the type of the dump.
-Valid values are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) or 'Full'.
+Valid values are {0}.
 Default type is 'Full'</source>
-        <target state="translated">指定转储的类型。
-有效值为 "Mini"、"Heap"、"Triage"(仅适用于 .NET 6+)或 "Full"。
-默认类型为 "Full"</target>
+        <target state="new">Specify the type of the dump.
+Valid values are {0}.
+Default type is 'Full'</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpTypeOptionInvalidType">
         <source>'{0}' is not a valid dump type.
-Valid options are 'Mini', 'Heap', 'Triage', 'None' (only available in .NET 6+) and 'Full'</source>
-        <target state="translated">“{0}”不是有效的转储类型。
-有效选项为 "Mini"、"Heap"、"Triage"(仅适用于 .NET 6+)和 "Full"</target>
+Valid options are {1}</source>
+        <target state="new">'{0}' is not a valid dump type.
+Valid options are {1}</target>
         <note />
       </trans-unit>
       <trans-unit id="HangDumpUnsupportedRequestTypeErrorMessage">