Skip to content

Commit 4f99eeb

Browse files
TIHanTIHan
authored
Merge branch 'release/dev16.3' into merges/master-to-release/dev16.3
2 parents dbee477 + c807da6 commit 4f99eeb

93 files changed

Lines changed: 694 additions & 761 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0-beta3-19222-02
1+
3.2.0-beta4-19312-15

‎eng/Versions.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.4</FSPackageMajorVersion>
27-
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
26+
<FSPackageMajorVersion>10.6</FSPackageMajorVersion>
27+
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>1</VSMinorVersion>
33+
<VSMinorVersion>3</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -55,6 +55,7 @@
5555
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
5656
https://api.nuget.org/v3/index.json;
5757
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
58+
https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json;
5859
https://dotnet.myget.org/F/symreader-converter/api/v3/index.json;
5960
https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
6061
https://myget.org/F/vs-devcore/api/v3/index.json;

‎eng/targets/Settings.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<IncludeVsLanguageServer>true</IncludeVsLanguageServer>
11+
<!-- this should be false for branch `release/dev16.2`, true otherwise -->
12+
<IncludeVsLanguageServer>false</IncludeVsLanguageServer>
1213
</PropertyGroup>
1314

1415
</Project>

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">{0} pro F# {1}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">{0} für F# {1}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">{0} para F# {1}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">{0} pour F# {1}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">{0} per F# {1}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">F# {1} の {0}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="new">{0} for F# {1}</target>
7+
<target state="translated">F# {1}용 {0}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

0 commit comments

Comments
 (0)