Skip to content

Commit 26d7cc5

Browse files
KevinRansomKevinRansom
authored
Update language version status of some features (#9507)
* Update language status * fsharpqa baselines for langversion * Update LanguageFeatures.fs
1 parent efd13af commit 26d7cc5

7 files changed

Lines changed: 84 additions & 104 deletions

File tree

‎src/fsharp/LanguageFeatures.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type LanguageVersion (specifiedVersionAsString) =
4646
static let latestMajorVersion = languageVersion47 // Language version when latestmajor specified
4747

4848
static let validOptions = [| "preview"; "default"; "latest"; "latestmajor" |]
49-
static let languageVersions = set [| languageVersion46; languageVersion47 (*; languageVersion50 *) |]
49+
static let languageVersions = set [| languageVersion46; languageVersion47 ; languageVersion50 |]
5050

5151
static let features =
5252
dict [
@@ -58,17 +58,17 @@ type LanguageVersion (specifiedVersionAsString) =
5858

5959
// F# 5.0
6060
LanguageFeature.FixedIndexSlice3d4d, languageVersion50
61-
LanguageFeature.FromEndSlicing, languageVersion50
6261
LanguageFeature.DotlessFloat32Literal, languageVersion50
62+
LanguageFeature.AndBang, languageVersion50
63+
LanguageFeature.NullableOptionalInterop, languageVersion50
64+
LanguageFeature.DefaultInterfaceMemberConsumption, languageVersion50
6365

6466
// F# preview
65-
LanguageFeature.NameOf, previewVersion
67+
LanguageFeature.FromEndSlicing, previewVersion
6668
LanguageFeature.OpenStaticClasses, previewVersion
6769
LanguageFeature.PackageManagement, previewVersion
68-
LanguageFeature.AndBang, previewVersion
69-
LanguageFeature.NullableOptionalInterop, previewVersion
70-
LanguageFeature.DefaultInterfaceMemberConsumption, previewVersion
7170
LanguageFeature.WitnessPassing, previewVersion
71+
LanguageFeature.NameOf, previewVersion
7272
]
7373

7474
let specified =
@@ -80,7 +80,7 @@ type LanguageVersion (specifiedVersionAsString) =
8080
| "latestmajor" -> latestMajorVersion
8181
| "4.6" -> languageVersion46
8282
| "4.7" -> languageVersion47
83-
(* | "5.0" -> languageVersion50 *)
83+
| "5.0" -> languageVersion50
8484
| _ -> 0m
8585

8686
let versionToString v =

‎tests/fsharp/Compiler/Conformance/BasicGrammarElements/BasicConstants.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ printfn "%A" x14
177177
"""
178178
[<Test>]
179179
let ``dotless float``() =
180-
CompilerAssert.CompileExeWithOptions [|"--langversion:preview"|]
180+
CompilerAssert.CompileExeWithOptions [|"--langversion:5.0"|]
181181
"""
182182
let x = 42f
183183
printfn "%A" x
@@ -193,7 +193,7 @@ printfn "%A" x
193193

194194
[<Test>]
195195
let ``dotted floats should be equal to dotless floats``() =
196-
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:preview"|]
196+
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:5.0"|]
197197
"""
198198
if 1.0f <> 1f then failwith "1.0f <> 1f"
199199
"""
@@ -214,14 +214,14 @@ if 1e1f <> 10.f then failwith "1e1f <> 10.f"
214214

215215
[<Test>]
216216
let ``exponent dotted floats should be equal to dotless floats``() =
217-
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:preview"|]
217+
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:5.0"|]
218218
"""
219219
if 1.0e1f <> 10f then failwith "1.0e1f <> 10f"
220220
"""
221221

222222
[<Test>]
223223
let ``exponent dotless floats should be equal to dotless floats``() =
224-
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:preview"|]
224+
CompilerAssert.CompileExeAndRunWithOptions [|"--langversion:5.0"|]
225225
"""
226226
if 1e1f <> 10f then failwith "1e1f <> 10f"
227227
"""

‎tests/fsharp/Compiler/Language/DefaultInterfaceMemberTests.fs‎

Lines changed: 57 additions & 57 deletions
Large diffs are not rendered by default.

‎tests/fsharp/Compiler/Language/OptionalInteropTests.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ Test.M(x = Some 1)
4343
CompilationUtil.CreateCSharpCompilation(csSrc, CSharpLanguageVersion.CSharp8, TargetFramework.NetStandard20, additionalReferences = ImmutableArray.CreateRange [fsharpCoreAssembly])
4444
|> CompilationReference.Create
4545

46-
let fs = Compilation.Create(fsSrc, SourceKind.Fsx, CompileOutput.Exe, options = [|"--langversion:preview"|], cmplRefs = [cs])
46+
let fs = Compilation.Create(fsSrc, SourceKind.Fsx, CompileOutput.Exe, options = [|"--langversion:5.0"|], cmplRefs = [cs])
4747
CompilerAssert.Compile fs

‎tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ default
44
latest
55
latestmajor
66
4.6
7-
4.7 (Default)
7+
4.7 (Default)
8+
5.0

‎tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ default
44
latest
55
latestmajor
66
4.6
7-
4.7 (Default)
7+
4.7 (Default)
8+
5.0

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -92,46 +92,24 @@
9292
</Compile>
9393
<Compile Include="Package\Constants.vb" />
9494
<Compile Include="Package\InternalException.vb" />
95-
<Compile Include="PropertyPages\ApplicationPropPage.vb">
96-
<SubType>UserControl</SubType>
97-
</Compile>
98-
<Compile Include="PropertyPages\ApplicationPropPageBase.vb">
99-
<SubType>UserControl</SubType>
100-
</Compile>
101-
<Compile Include="PropertyPages\BuildEventCommandLineDialog.vb">
102-
<SubType>Form</SubType>
103-
</Compile>
95+
<Compile Include="PropertyPages\ApplicationPropPage.vb" />
96+
<Compile Include="PropertyPages\ApplicationPropPageBase.vb" />
97+
<Compile Include="PropertyPages\BuildEventCommandLineDialog.vb" />
10498
<Compile Include="PropertyPages\BuildEventCommandLineDialogService.vb" />
105-
<Compile Include="PropertyPages\BuildEventsPropPage.vb">
106-
<SubType>UserControl</SubType>
107-
</Compile>
108-
<Compile Include="PropertyPages\BuildPropPage.vb">
109-
<SubType>UserControl</SubType>
110-
</Compile>
111-
<Compile Include="PropertyPages\DebugPropPage.vb">
112-
<SubType>UserControl</SubType>
113-
</Compile>
99+
<Compile Include="PropertyPages\BuildEventsPropPage.vb" />
100+
<Compile Include="PropertyPages\BuildPropPage.vb" />
101+
<Compile Include="PropertyPages\DebugPropPage.vb" />
114102
<Compile Include="PropertyPages\PropertyListener.vb" />
115103
<Compile Include="PropertyPages\skumatrix.vb" />
116-
<Compile Include="PropertyPages\FSharpApplicationPropPage.vb">
117-
<SubType>UserControl</SubType>
118-
</Compile>
119-
<Compile Include="PropertyPages\ReferencePathsPropPage.vb">
120-
<SubType>UserControl</SubType>
121-
</Compile>
104+
<Compile Include="PropertyPages\FSharpApplicationPropPage.vb" />
105+
<Compile Include="PropertyPages\ReferencePathsPropPage.vb" />
122106
<Compile Include="PropertyPages\PropPage.vb" />
123-
<Compile Include="DesignFramework\BaseDialog.vb">
124-
<SubType>Form</SubType>
125-
</Compile>
107+
<Compile Include="DesignFramework\BaseDialog.vb" />
126108
<Compile Include="PropertyPages\ValidationException.vb" />
127109
<Compile Include="PropertyPages\PropertyControlData.vb" />
128110
<Compile Include="PropertyPages\ControlDataFlags.vb" />
129-
<Compile Include="PropertyPages\PropPageHostDialog.vb">
130-
<SubType>Form</SubType>
131-
</Compile>
132-
<Compile Include="PropertyPages\PropPageUserControlBase.vb">
133-
<SubType>UserControl</SubType>
134-
</Compile>
111+
<Compile Include="PropertyPages\PropPageHostDialog.vb" />
112+
<Compile Include="PropertyPages\PropPageUserControlBase.vb" />
135113
<Compile Include="PropertyPages\VSProductSKU.vb" />
136114
<Compile Include="PropertyPages\ValidationResult.vb" />
137115
<Compile Include="PropertyPages\ChildPageSite.vb" />

0 commit comments

Comments
 (0)