diff --git a/src/fsharp/LanguageFeatures.fs b/src/fsharp/LanguageFeatures.fs index 9afe3c59ab..8b60a9361e 100644 --- a/src/fsharp/LanguageFeatures.fs +++ b/src/fsharp/LanguageFeatures.fs @@ -44,9 +44,9 @@ type LanguageVersion (specifiedVersionAsString) = static let languageVersion47 = 4.7m static let languageVersion50 = 5.0m static let previewVersion = 9999m // Language version when preview specified - static let defaultVersion = languageVersion47 // Language version when default specified + static let defaultVersion = languageVersion50 // Language version when default specified static let latestVersion = defaultVersion // Language version when latest specified - static let latestMajorVersion = languageVersion47 // Language version when latestmajor specified + static let latestMajorVersion = languageVersion50 // Language version when latestmajor specified static let validOptions = [| "preview"; "default"; "latest"; "latestmajor" |] static let languageVersions = set [| languageVersion46; languageVersion47 ; languageVersion50 |] diff --git a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs index dbad94ed4b..5b0c17da33 100644 --- a/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs +++ b/tests/FSharp.Compiler.ComponentTests/ErrorMessages/ConstructorTests.fs @@ -46,7 +46,7 @@ let p = |> typecheck |> shouldFail |> withDiagnostics [ - (Error 39, Line 7, Col 12, Line 7, Col 16, "The value or constructor 'Name' is not defined. Maybe you want one of the following:" + System.Environment.NewLine + " nan") + (Error 39, Line 7, Col 12, Line 7, Col 16, "The value or constructor 'Name' is not defined. Maybe you want one of the following:" + System.Environment.NewLine + " nameof" + System.Environment.NewLine + " nan") (Warning 20, Line 7, Col 12, Line 7, Col 25, "The result of this equality expression has type 'bool' and is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'.") (Error 39, Line 8, Col 12, Line 8, Col 15, "The value or constructor 'Age' is not defined.") (Error 501, Line 7, Col 5, Line 8, Col 21, "The object constructor 'Person' takes 0 argument(s) but is here given 1. The required signature is 'new : unit -> Person'. If some of the arguments are meant to assign values to properties, consider separating those arguments with a comma (',').")] diff --git a/tests/fsharp/Compiler/Language/StringInterpolation.fs b/tests/fsharp/Compiler/Language/StringInterpolation.fs index c08b7a28ec..dd1890fcc4 100644 --- a/tests/fsharp/Compiler/Language/StringInterpolation.fs +++ b/tests/fsharp/Compiler/Language/StringInterpolation.fs @@ -610,8 +610,8 @@ check "vcewweh23" $"abc{({| A=1 |})}def" "abc{ A = 1 }def" [] - let ``Basic string interpolation (no preview)`` () = - CompilerAssert.TypeCheckWithErrorsAndOptions [| |] + let ``Basic string interpolation (4.7)`` () = + CompilerAssert.TypeCheckWithErrorsAndOptions [| "--langversion:4.7" |] """ let x = $"one" """ diff --git a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl index 1eb33e50b6..00c7ea5875 100644 --- a/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl +++ b/tests/fsharp/typecheck/overloads/neg_System.Convert.ToString.OverloadList.bsl @@ -46,11 +46,3 @@ Available overloads: - System.Convert.ToString(value: uint16, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - System.Convert.ToString(value: uint32, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - System.Convert.ToString(value: uint64, provider: System.IFormatProvider) : string // Argument 'value' doesn't match - -neg_System.Convert.ToString.OverloadList.fsx(3,1,3,48): typecheck error FS0041: A unique overload for method 'ToString' could not be determined based on type information prior to this program point. A type annotation may be needed. - -Known types of arguments: provider:'a0 * value:int when 'a0 : null - -Candidates: - - System.Convert.ToString(value: int, provider: System.IFormatProvider) : string - - System.Convert.ToString(value: obj, provider: System.IFormatProvider) : string diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl index 35fc56a3ab..b7f6805220 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/langversion/langversionhelp.437.1033.bsl @@ -4,5 +4,5 @@ default latest latestmajor 4.6 -4.7 (Default) -5.0 \ No newline at end of file +4.7 +5.0 (Default) \ No newline at end of file diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl index 35fc56a3ab..b7f6805220 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/langversion/langversionhelp.437.1033.bsl @@ -4,5 +4,5 @@ default latest latestmajor 4.6 -4.7 (Default) -5.0 \ No newline at end of file +4.7 +5.0 (Default) \ No newline at end of file