From c834c8cd0b147e5232460174a1d6e89310b7a9e1 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 12 Jun 2018 11:52:50 -0700 Subject: [PATCH 1/7] add interactive flag for the add package and restore commands --- .../dotnet-add/dotnet-add-package/AddPackageParser.cs | 4 +++- .../dotnet-add-package/LocalizableStrings.resx | 3 +++ .../commands/dotnet-restore/LocalizableStrings.resx | 3 +++ .../commands/dotnet-restore/RestoreCommandParser.cs | 9 +++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs index 8724683cd..750efa51e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs @@ -47,7 +47,9 @@ namespace Microsoft.DotNet.Cli LocalizableStrings.CmdPackageDirectoryDescription, Accept.ExactlyOneArgument() .With(name: LocalizableStrings.CmdPackageDirectory) - .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}"))); + .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}")), + Create.Option("--interactive", + LocalizableStrings.CmdInteractiveRestoreDescription)); } public static IEnumerable QueryNuGet(string match) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 36320b010..38e62efed 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -165,4 +165,7 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. + + Allow the command to block and require manual action to proceed. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index 155845dc7..da0f30c11 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -169,4 +169,7 @@ Force all dependencies to be resolved even if the last restore was successful. This is equivalent to deleting project.assets.json. + + Allow restore to block and require manual action to proceed. + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index f6c566af3..11cbc6d56 100644 --- a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -94,8 +94,13 @@ namespace Microsoft.DotNet.Cli useShortOptions ? "-f|--force" : "--force", LocalizableStrings.CmdForceRestoreOptionDescription, Accept.NoArguments() - .ForwardAs("-property:RestoreForce=true")) + .ForwardAs("-property:RestoreForce=true")), + Create.Option( + "--interactive", + showHelp ? LocalizableStrings.CmdInteractiveRestoreOptionDescription : string.Empty, + Accept.NoArguments() + .ForwardAs("-property:NuGetInteractive=true")) }; } } -} \ No newline at end of file +} From c7cde12e2def4f962db8d72ee6a25e29b424f49f Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 12 Jun 2018 12:08:18 -0700 Subject: [PATCH 2/7] update xlf files --- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ 26 files changed, 130 insertions(+) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index dfe3f4ed9..ff155542f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -82,6 +82,11 @@ Nejde generovat dočasný soubor pro projekt {0}. Není možné přidat odkaz na balíček. Vyprázdněte prosím dočasný adresář a zkuste to znovu. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index a3016887c..8af9b379d 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -82,6 +82,11 @@ Für das Projekt "{0}" kann keine temporäre Datei generiert werden. Ein Paketverweis kann nicht hinzugefügt werden. Löschen Sie das temporäre Verzeichnis, und versuchen Sie es noch mal. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 0dd40da84..8deb95299 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -82,6 +82,11 @@ No se puede generar un archivo temporal para el proyecto "{0}". No se puede agregar la referencia del paquete. Borre el directorio temporal e inténtelo de nuevo. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index fa4124efb..d80770eed 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -82,6 +82,11 @@ Impossible de générer un fichier temporaire pour le projet '{0}'. Impossible d'ajouter une référence de package. Effacez le répertoire temporaire et réessayez. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index 97b0db78d..bebe45ec2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -82,6 +82,11 @@ Non è possibile generare un file temporaneo per il progetto '{0}'. Non è possibile aggiungere il riferimento al pacchetto. Cancellare la directory temp e riprovare. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 694661e14..49d4b1a24 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -82,6 +82,11 @@ プロジェクト '{0}' の一時ファイルを生成できません。パッケージ参照を追加できません。一時ディレクトリをクリアして、もう一度お試しください。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index 6f5e5962b..a85d2d632 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -82,6 +82,11 @@ '{0}' 프로젝트에 대한 임시 파일을 생성할 수 없습니다. 패키지 참조를 추가할 수 없습니다. 임시 디렉터리를 지우고 다시 시도하세요. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 45e41afee..7487aed91 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -82,6 +82,11 @@ Nie można wygenerować pliku tymczasowego dla projektu „{0}”. Nie można dodać odwołania do pakietu. Wyczyść katalog tymczasowy i spróbuj ponownie. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 05dc7dca2..b5b59df92 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -82,6 +82,11 @@ Não é possível gerar um arquivo temporário para o projeto '{0}'. Não é possível adicionar a referência do pacote. Limpe i diretório temporário e tente novamente. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index e57fae4e9..bf507e9d2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -82,6 +82,11 @@ Не удалось создать временный файл для проекта "{0}". Невозможно добавить ссылку на пакет. Очистите временный каталог и повторите попытку. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index edbca50eb..e2ab823e3 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -82,6 +82,11 @@ '{0}' projesi için bir geçici dosya oluşturulamıyor. Paket başvurusu eklenemiyor. Lütfen geçici dizini temizleyin ve yeniden deneyin. + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 9d4f9ebe7..741381fce 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -82,6 +82,11 @@ 未能为项目“{0}”生成临时文件。无法添加包引用。请清除临时目录，再重试。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 9f8584c45..fe7b898ee 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -82,6 +82,11 @@ 無法產生專案 '{0}' 的暫存檔案。無法新增套件參考。請清除暫存目錄並再試一次。 + + Allow the command to block and require manual action to proceed. + Allow the command to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index 334b4c013..83123ef77 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Tento příznak nastavte, pokud chcete vynutit vyřešení všech závislostí, i když poslední obnovení proběhlo úspěšně. Jedná se o ekvivalent odstranění project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 6f995fd04..1f497a696 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Legen Sie dieses Flag fest, damit alle Abhängigkeiten aufgelöst werden, auch wenn die letzte Wiederherstellung erfolgreich war. Dies entspricht dem Löschen von "project.assets.json". + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 21e4c7f6d..8a212cc48 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Establezca este indicador para forzar la resolución de todas las dependencias aunque la última restauración se haya realizado correctamente. Esta acción es equivalente a eliminar project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index 84858d4f1..fd6fd82fe 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Définissez cet indicateur pour forcer la résolution de toutes les dépendances même si la dernière restauration a réussi. Cela équivaut à supprimer project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index 9066cc895..abb659781 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Impostare questo flag per forzare la risoluzione di tutte le dipendenze anche se l'ultimo ripristino è riuscito. Equivale a eliminare project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index 835dc0c69..b23e93f2c 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. このフラグを設定すると、最後に行われた復元が成功した場合でも強制的にすべての依存関係を解決します。これは、project.assets.json を削除することと同じです。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index 78d22847a..f26e0a6de 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 마지막 복원이 성공적인 경우에도 이 플래그를 설정하여 모든 종속성을 확인합니다. project.assets.json을 삭제하는 것과 동일합니다. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index 7ecff7887..352b72654 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Ustaw tę flagę, aby wymusić rozstrzygnięcie wszystkich zależności nawet w przypadku, gdy ostatnie przywracanie się powiodło. Jest to równoważne usunięciu pliku project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 69099d848..66c269966 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Defina este sinalizador para forçar todas as dependências a serem resolvidas, mesmo que a última restauração tenha tido êxito. Isso equivale a excluir o project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index 7a5345c37..b4e464a24 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Задайте этот флаг, чтобы принудительно разрешать все зависимости даже в случае успеха последнего восстановления. Это эквивалентно удалению project.assets.json. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 3bac27e0e..4bfc9ff76 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. Son geri yükleme başarılı olsa bile tüm bağımlılıkların çözümlenmesini zorlamak için bu bayrağı ayarlayın. Bu, project.assets.json öğesini silmeyle eşdeğerdir. + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index e6bbe76ae..1be87cbe4 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 设置此标志以强制解析所有依赖项，即使最后一次还原已经成功。这等效于删除 project.assets.json。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index a0cec1f4d..c78e76935 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -88,6 +88,11 @@ This is equivalent to deleting project.assets.json. 設定此旗標可在即使上次還原已成功的情況下，仍然強制解決所有相依性。如此等同於刪除 project.assets.json。 + + Allow restore to block and require manual action to proceed. + Allow restore to block and require manual action to proceed. + + \ No newline at end of file From dba0aa33da7bc858f95d6c0c1f09a1bd0a3e8ad7 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 19 Jun 2018 16:33:59 -0700 Subject: [PATCH 3/7] Update the messages per the recommendation --- .../dotnet-add/dotnet-add-package/LocalizableStrings.resx | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-restore/LocalizableStrings.resx | 2 +- .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 38e62efed..564a2fcdb 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -166,6 +166,6 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index ff155542f..449b261dd 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index 8af9b379d..ac4f6b94f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index 8deb95299..d32981896 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index d80770eed..ce45e848e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index bebe45ec2..e7e122963 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 49d4b1a24..25d7475dc 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index a85d2d632..ab76e50ea 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index 7487aed91..ff0b4eec7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index b5b59df92..08ccc2d5a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index bf507e9d2..811d11db6 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index e2ab823e3..761e6e345 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index 741381fce..ebfd3ec4e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index fe7b898ee..25bd15a5a 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -83,8 +83,8 @@ - Allow the command to block and require manual action to proceed. - Allow the command to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index da0f30c11..63bc3cb98 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -170,6 +170,6 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index 83123ef77..fc8c864cc 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 1f497a696..33432091d 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 8a212cc48..66a74d4db 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index fd6fd82fe..063ba5b8a 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index abb659781..99cae559e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index b23e93f2c..55ab86705 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index f26e0a6de..a1973ddb0 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index 352b72654..be4c39e2d 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 66c269966..981657cfa 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index b4e464a24..6689efadb 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 4bfc9ff76..50e20535f 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index 1be87cbe4..519cdd150 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index c78e76935..853137b9c 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allow restore to block and require manual action to proceed. - Allow restore to block and require manual action to proceed. + Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication) From b23c3720773d7027d293dbe165508e15b32ee4ff Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 15:17:19 -0700 Subject: [PATCH 4/7] fix add package parsing --- .../dotnet-add/dotnet-add-package/AddPackageParser.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs index 750efa51e..c141be03b 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs @@ -49,7 +49,9 @@ namespace Microsoft.DotNet.Cli .With(name: LocalizableStrings.CmdPackageDirectory) .ForwardAsSingle(o => $"--package-directory {o.Arguments.Single()}")), Create.Option("--interactive", - LocalizableStrings.CmdInteractiveRestoreDescription)); + LocalizableStrings.CmdInteractiveRestoreDescription, + Accept.NoArguments() + .ForwardAs("--interactive"))); } public static IEnumerable QueryNuGet(string match) From 9cd006f591be8c9043ac7dd777b180b7c0679dc6 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 15:53:33 -0700 Subject: [PATCH 5/7] make the interactive switch not implicit --- .../dotnet-restore/RestoreCommandParser.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index 11cbc6d56..71afaabb4 100644 --- a/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -24,7 +24,14 @@ namespace Microsoft.DotNet.Cli { var fullRestoreOptions = AddImplicitRestoreOptions(new Option[] { CommonOptions.HelpOption() }, true, true); - return fullRestoreOptions.Concat(new Option[] { CommonOptions.VerbosityOption() }).ToArray(); + return fullRestoreOptions.Concat( + new Option[] { + CommonOptions.VerbosityOption(), + Create.Option( + "--interactive", + LocalizableStrings.CmdInteractiveRestoreOptionDescription, + Accept.NoArguments() + .ForwardAs("-property:NuGetInteractive=true")) }).ToArray(); } public static Option[] AddImplicitRestoreOptions( @@ -94,12 +101,7 @@ namespace Microsoft.DotNet.Cli useShortOptions ? "-f|--force" : "--force", LocalizableStrings.CmdForceRestoreOptionDescription, Accept.NoArguments() - .ForwardAs("-property:RestoreForce=true")), - Create.Option( - "--interactive", - showHelp ? LocalizableStrings.CmdInteractiveRestoreOptionDescription : string.Empty, - Accept.NoArguments() - .ForwardAs("-property:NuGetInteractive=true")) + .ForwardAs("-property:RestoreForce=true")) }; } } From c172433ce7f73465e4641ef2f4180388fa081762 Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Wed, 20 Jun 2018 16:40:27 -0700 Subject: [PATCH 6/7] add '.' period to the command description --- .../dotnet-add/dotnet-add-package/LocalizableStrings.resx | 2 +- .../dotnet-add-package/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- src/dotnet/commands/dotnet-restore/LocalizableStrings.resx | 2 +- .../commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx index 564a2fcdb..ec8af6d18 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.resx @@ -166,6 +166,6 @@ Unable to generate a temporary file for project '{0}'. Cannot add package reference. Please clear the temp directory and try again. - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf index 449b261dd..ed3a68382 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.cs.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf index ac4f6b94f..cc06b3996 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.de.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf index d32981896..64def58f0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.es.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf index ce45e848e..1903857f2 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.fr.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf index e7e122963..fe8e318c7 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.it.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf index 25d7475dc..3a90c9dc1 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ja.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf index ab76e50ea..f982cf749 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ko.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf index ff0b4eec7..d7f759822 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pl.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf index 08ccc2d5a..728c4482e 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.pt-BR.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf index 811d11db6..0ca1e3de0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.ru.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf index 761e6e345..c6c66a725 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.tr.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf index ebfd3ec4e..55e7419f0 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hans.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf index 25bd15a5a..b2096d6a8 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/xlf/LocalizableStrings.zh-Hant.xlf @@ -83,8 +83,8 @@ - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx index 63bc3cb98..155b7b7d5 100644 --- a/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx +++ b/src/dotnet/commands/dotnet-restore/LocalizableStrings.resx @@ -170,6 +170,6 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf index fc8c864cc..3dfcec338 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.cs.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf index 33432091d..00d8248a2 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.de.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf index 66a74d4db..c1dde2c11 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.es.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf index 063ba5b8a..165614404 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.fr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf index 99cae559e..485298ee0 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.it.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf index 55ab86705..c76cb47cf 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ja.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf index a1973ddb0..4c7717f81 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ko.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf index be4c39e2d..0f8d97ed8 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pl.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf index 981657cfa..318c35b4e 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.pt-BR.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf index 6689efadb..c931b8b09 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.ru.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf index 50e20535f..fdd3f8e42 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.tr.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf index 519cdd150..47c81f1cf 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hans.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). diff --git a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf index 853137b9c..564a5bb17 100644 --- a/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/dotnet/commands/dotnet-restore/xlf/LocalizableStrings.zh-Hant.xlf @@ -89,8 +89,8 @@ This is equivalent to deleting project.assets.json. - Allows the command to stop and wait for user input or action (for example to complete authentication) - Allows the command to stop and wait for user input or action (for example to complete authentication) + Allows the command to stop and wait for user input or action (for example to complete authentication). + Allows the command to stop and wait for user input or action (for example to complete authentication). From c7cf8a55b8964d2671d8e84a9474142bd247625f Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Mon, 25 Jun 2018 14:15:24 -0700 Subject: [PATCH 7/7] Add DOTNET_HOST_PATH for dotnet nuget commands --- src/dotnet/commands/dotnet-nuget/Program.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-nuget/Program.cs b/src/dotnet/commands/dotnet-nuget/Program.cs index 8e6378b41..1871da2cb 100644 --- a/src/dotnet/commands/dotnet-nuget/Program.cs +++ b/src/dotnet/commands/dotnet-nuget/Program.cs @@ -35,9 +35,14 @@ namespace Microsoft.DotNet.Tools.NuGet public int Run(string[] args) { var nugetApp = new NuGetForwardingApp(args); - + nugetApp.WithEnvironmentVariable("DOTNET_HOST_PATH", GetDotnetPath()); return nugetApp.Execute(); } } + + private static string GetDotnetPath() + { + return new Muxer().MuxerPath; + } } }