Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to release/dev16.9 #10234

Merged
merged 1 commit into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/fsharp/CompilerOptions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1422,8 +1422,13 @@ let displayHelpFsc tcConfigB (blocks:CompilerOptionBlock list) =
PrintCompilerOptionBlocks blocks
exit 0

let displayVersion tcConfigB =
printfn "%s" tcConfigB.productNameForBannerText
exit 0

let miscFlagsBoth tcConfigB =
[ CompilerOption("nologo", tagNone, OptionUnit (fun () -> tcConfigB.showBanner <- false), None, Some (FSComp.SR.optsNologo()))
CompilerOption("version", tagNone, OptionUnit (fun () -> displayVersion tcConfigB), None, Some (FSComp.SR.optsVersion()))
]

let miscFlagsFsc tcConfigB =
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,7 @@ optsDefine,"Define conditional compilation symbols (Short form: -d)"
optsMlcompatibility,"Ignore ML compatibility warnings"
optsNologo,"Suppress compiler copyright message"
optsHelp,"Display this usage message (Short form: -?)"
optsVersion,"Display compiler version banner and exit"
optsResponseFile,"Read response file for more options"
optsCodepage,"Specify the codepage used to read source files"
optsUtf8output,"Output messages in UTF-8 encoding"
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Nerozpoznaná hodnota {0} pro parametr --langversion; seznam možností zobrazíte zadáním --langversion:?</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Funkce správy balíčků vyžaduje jazykovou verzi 5.0, použijte /langversion:preview.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Unbekannter Wert "{0}" für "--langversion". Verwenden Sie "--langversion:?", um die vollständige Liste anzuzeigen.</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Für das Paketverwaltungsfeature ist Sprachversion 5.0 erforderlich. Verwenden Sie /langversion:preview.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Valor no reconocido "{0}" para --langversion, use --langversion:? para una lista completa</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">La característica de administración de paquetes requiere la versión de lenguaje 5.0; use /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Valeur non reconnue '{0}' pour --langversion use --langversion:? pour la liste complète</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">La fonctionnalité de gestion des packages nécessite la version 5.0 du langage. Utilisez /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Valore '{0}' non riconosciuto per --langversion. Per l'elenco completo usare --langversion:?</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Con la funzionalità di gestione pacchetti è richiesta la versione 5.0 del linguaggio. Usare /langversion:preview</target>
Expand Down
15 changes: 10 additions & 5 deletions src/fsharp/xlf/FSComp.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,16 @@
<target state="new">The module contains the field\n {0} \nbut its signature specifies\n {1} \nThe 'static' modifiers differ</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="needs-review-translation">パッケージ管理機能では、言語バージョン 5.0 で /langversion:preview を使用する必要があります</target>
<note />
</trans-unit>
<trans-unit id="FieldNotContainedTypesDiffer">
<source>The module contains the field\n {0} \nbut its signature specifies\n {1} \nThe types differ</source>
<target state="new">The module contains the field\n {0} \nbut its signature specifies\n {1} \nThe types differ</target>
Expand Down Expand Up @@ -3852,11 +3862,6 @@
<target state="new">Write the xmldoc of the assembly to the given file</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="new">The package management feature requires language version 5.0 use /langversion:preview</target>
<note />
</trans-unit>
<trans-unit id="packageManagerError">
<source>{0}</source>
<target state="new">{0}</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">전체 목록에 대한 --langversion use --langversion:?의 인식할 수 없는 값 '{0}'입니다.</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">패키지 관리 기능을 사용하려면 언어 버전 5.0이 필요합니다. /langversion:preview를 사용하세요.</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Nierozpoznana wartość „{0}” dla parametru –langversion; podaj parametr –langversion:?, aby uzyskać pełną listę</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Funkcja zarządzania pakietami wymaga języka w wersji 5.0, użyj parametru /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Valor não reconhecido '{0}' para --langversion use --langversion:? para a lista completa</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">O recurso de gerenciamento de pacotes requer a versão de idioma 5.0. Use /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">Не удалось распознать значение "{0}" для параметра --langversion. Для получения полного списка допустимых значений выполните команду use --langversion:?</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Для функции управления пакетами требуется версия языка 5.0, используйте параметр /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">--langversion için '{0}' değeri tanınmıyor. Tam liste için --langversion:? kullanın</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">Paket yönetimi özelliği dil sürümü 5.0 gerektiriyor, /langversion:preview kullanın</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">--langversion 的值“{0}”无法识别,使用 --langversion:? 获取完整列表。</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">包管理功能需要语言版本 5.0,请使用 /langversion:preview</target>
Expand Down
5 changes: 5 additions & 0 deletions src/fsharp/xlf/FSComp.txt.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,11 @@
<target state="translated">對 --langversion 為無法識別的值 '{0}',對完整清單使用 --langversion:?</target>
<note />
</trans-unit>
<trans-unit id="optsVersion">
<source>Display compiler version banner and exit</source>
<target state="new">Display compiler version banner and exit</target>
<note />
</trans-unit>
<trans-unit id="packageManagementRequiresVFive">
<source>The package management feature requires language version 5.0 use /langversion:preview</source>
<target state="translated">套件管理功能需要語言版本 5.0,請使用 /langversion:preview</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ Copyright (c) Microsoft Corporation. All Rights Reserved.

- MISCELLANEOUS -
--nologo Suppress compiler copyright message
--version Display compiler version banner and
exit
--help Display this usage message (Short
form: -?)
--@<file> Read response file for more options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Usage: fsharpi <options> [script.fsx [<arguments>]]

- MISCELLANEOUS -
--nologo Suppress compiler copyright message
--version Display compiler version banner and
exit
--help Display this usage message (Short
form: -?)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]

- MISCELLANEOUS -
--nologo Suppress compiler copyright message
--version Display compiler version banner and
exit
--help Display this usage message (Short
form: -?)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ Usage: fsiAnyCpu <options> [script.fsx [<arguments>]]

- MISCELLANEOUS -
--nologo Suppress compiler copyright message
--version Display compiler version banner and
exit
--help Display this usage message (Short
form: -?)

Expand Down