Skip to content

Commit 97ec795

Browse files
KevinRansomKevinRansom
authored
help text (dotnet#9690)
* help text * Fix tests * Moar tests * Fix x platform testing
1 parent c01c44f commit 97ec795

30 files changed

+13295
-111
lines changed

‎src/fsharp/FSharp.Compiler.Private.Scripting/FSharpScript.fs

+24-2
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,38 @@ open System.Threading
77
open FSharp.Compiler
88
open FSharp.Compiler.Interactive.Shell
99

10-
type FSharpScript(?additionalArgs: string[]) =
10+
[<RequireQualifiedAccess>]
11+
type LangVersion =
12+
| V47
13+
| V50
14+
| Preview
15+
16+
type FSharpScript(?additionalArgs: string[], ?quiet: bool, ?langVersion: LangVersion) =
1117

1218
let additionalArgs = defaultArg additionalArgs [||]
19+
let quiet = defaultArg quiet true
20+
let langVersion = defaultArg langVersion LangVersion.Preview
21+
1322
let config = FsiEvaluationSession.GetDefaultConfiguration()
23+
1424
let computedProfile =
1525
// If we are being executed on the desktop framework (we can tell because the assembly containing int is mscorlib) then profile must be mscorlib otherwise use netcore
1626
if typeof<int>.Assembly.GetName().Name = "mscorlib" then "mscorlib"
1727
else "netcore"
18-
let baseArgs = [| typeof<FSharpScript>.Assembly.Location; "--noninteractive"; "--targetprofile:" + computedProfile; "--quiet" |]
28+
29+
let baseArgs = [|
30+
typeof<FSharpScript>.Assembly.Location;
31+
"--noninteractive";
32+
"--targetprofile:" + computedProfile
33+
if quiet then "--quiet"
34+
match langVersion with
35+
| LangVersion.V47 -> "--langversion:4.7"
36+
| LangVersion.V50 -> "--langversion:5.0"
37+
| LangVersion.Preview -> "--langversion:preview"
38+
|]
39+
1940
let argv = Array.append baseArgs additionalArgs
41+
2042
let fsi = FsiEvaluationSession.Create (config, argv, stdin, stdout, stderr)
2143

2244
member __.ValueBound = fsi.ValueBound

‎src/fsharp/FSharp.DependencyManager.Nuget/FSDependencyManager.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
cantReferenceSystemPackage,"PackageManager can not reference the System Package '%s'"
33
requiresAValue,"%s requires a value"
44
unableToApplyImplicitArgument,"Unable to apply implicit argument number %d"
5-
notUsed,"Not used."
5+
notUsed,"Not used"
6+
loadNugetPackage,"Load Nuget Package"
7+
version,"version"
8+
highestVersion,"with the highest version"

‎src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fs

+5
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@ type FSharpDependencyManager (outputDir:string option) =
163163

164164
member _.Key = key
165165

166+
member _.HelpMessages = [|
167+
sprintf """ #r "nuget:FSharp.Data, 3.1.2";; // %s 'FSharp.Data' %s '3.1.2'""" (SR.loadNugetPackage()) (SR.version())
168+
sprintf """ #r "nuget:FSharp.Data";; // %s 'FSharp.Data' %s""" (SR.loadNugetPackage()) (SR.highestVersion())
169+
|]
170+
166171
member _.ResolveDependencies(scriptExt:string, packageManagerTextLines:string seq, tfm: string, rid: string) : obj =
167172

168173
let scriptExt, poundRprefix =

‎src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.fsi

+2
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ type FSharpDependencyManager =
3636

3737
member Key:string
3838

39+
member HelpMessages:string[]
40+
3941
member ResolveDependencies: scriptExt:string * packageManagerTextLines:string seq * tfm: string * rid: string -> obj

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager se nemůže odkazovat na systémový balíček {0}.</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Nepoužito</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Nepoužito</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Nepovedlo se použít implicitní počet argumentů {0}.</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager kann nicht auf das Systempaket "{0}" verweisen.</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Nicht verwendet.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Nicht verwendet.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Die Zahl für das implizierte Argument ({0}) kann nicht angewendet werden.</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager no puede hacer referencia al paquete del sistema "{0}".</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">No utilizado.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">No utilizado.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">No se puede aplicar el número de argumento implícito {0}.</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager ne peut pas référencer le package système '{0}'</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Non utilisé.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Non utilisé.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Impossible d'appliquer le numéro d'argument implicite {0}</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.it.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager non può fare riferimento al pacchetto di sistema '{0}'</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Non utilizzato.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Non utilizzato.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Non è possibile applicare il numero di argomento implicito {0}</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ja.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager がシステム パッケージ '{0}' を参照できません</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">使用されていません。</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">使用されていません。</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">暗黙的な引数番号 {0} を適用できません</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.ko.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager에서 시스템 패키지 '{0}'을(를) 참조할 수 없습니다.</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">사용되지 않습니다.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">사용되지 않습니다.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">암시적 인수 번호 {0}을(를) 적용할 수 없습니다.</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pl.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">Program PacketManager nie może odwoływać się do pakietu systemowego „{0}”</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Nieużywane.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Nieużywane.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Nie można zastosować niejawnego argumentu o numerze {0}</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.pt-BR.xlf

+17-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
<target state="translated">PackageManager não pode referenciar o pacote do sistema '{0}'</target>
88
<note />
99
</trans-unit>
10+
<trans-unit id="highestVersion">
11+
<source>with the highest version</source>
12+
<target state="new">with the highest version</target>
13+
<note />
14+
</trans-unit>
15+
<trans-unit id="loadNugetPackage">
16+
<source>Load Nuget Package</source>
17+
<target state="new">Load Nuget Package</target>
18+
<note />
19+
</trans-unit>
1020
<trans-unit id="notUsed">
11-
<source>Not used.</source>
12-
<target state="translated">Não usado.</target>
21+
<source>Not used</source>
22+
<target state="needs-review-translation">Não usado.</target>
1323
<note />
1424
</trans-unit>
1525
<trans-unit id="requiresAValue">
@@ -22,6 +32,11 @@
2232
<target state="translated">Não é possível aplicar o número do argumento implícito {0}</target>
2333
<note />
2434
</trans-unit>
35+
<trans-unit id="version">
36+
<source>version</source>
37+
<target state="new">version</target>
38+
<note />
39+
</trans-unit>
2540
</body>
2641
</file>
2742
</xliff>

0 commit comments

Comments
 (0)