Merge pull request #9884 from dotnet/merges/master-to-feature/string-interp

Merge master to feature/string-interp

Author: KevinRansom

tests/FSharp.Compiler.ComponentTests/Language/CodeQuotationTests.fs

@@ -36,6 +36,6 @@ let z : unit =
         failwithf "did not expect expression for 'z': %A" e
         """
         |> asExe
-        |> withOptions ["--langversion:preview"]
+        |> withPreview
         |> compileAndRun
         |> shouldSucceed

tests/FSharp.Test.Utilities/Compiler.fs

@@ -176,6 +176,11 @@ module rec Compiler =
         | FS fs -> FS { fs with Options = options }
         | _ -> failwith "withOptions is only supported n F#"
 
+    let withPreview (cUnit: CompilationUnit) : CompilationUnit =
+        match cUnit with
+        | FS fs -> FS { fs with Options = [ "--langversion:preview" ] }
+        | _ -> failwith "withPreview is only supported in F#"
+
     let asLibrary (cUnit: CompilationUnit) : CompilationUnit =
         match cUnit with
         | FS fs -> FS { fs with OutputType = CompileOutput.Library }

tests/fsharp/Compiler/Language/WitnessTests.fs

@@ -19,7 +19,7 @@ module WitnessTests =
         """ (dir ++ "provider.fsx"))
         |> asExe
         |> ignoreWarnings
-        |> withOptions ["--langversion:preview"]
+        |> withPreview
         |> compile
         |> shouldSucceed
         |> ignore