Merge pull request #7393 from dotnet/merges/release/dev16.3-to-release/dev16.4

Merge release/dev16.3 to release/dev16.4

Author: dotnet-automerge-bot

src/fsharp/LanguageFeatures.fs

@@ -52,7 +52,7 @@ type LanguageVersion (specifiedVersion) =
         LanguageFeature.SingleUnderscorePattern, languageVersion47
         LanguageFeature.WildCardInForLoop, languageVersion47
         LanguageFeature.RelaxWhitespace, languageVersion47
-        LanguageFeature.NameOf, languageVersion47
+        LanguageFeature.NameOf, previewVersion
         LanguageFeature.ImplicitYield, languageVersion47
         LanguageFeature.OpenStaticClasses, languageVersion47
         |]

…ts/fsharp/core/nameof/version47/test.fsx tests/fsharp/core/nameof/preview/test.fsxtests/fsharp/core/nameof/version47/test.fsx renamed to tests/fsharp/core/nameof/preview/test.fsx tests/fsharp/core/nameof/version47/test.fsx renamed to tests/fsharp/core/nameof/preview/test.fsx

@@ -1821,13 +1821,13 @@ module VersionTests =
     let ``nameof-version4.6``() = singleTestBuildAndRunVersion "core/nameof/version46" FSC_BUILDONLY "4.6"
 
     [<Test>]
-    let ``nameof-version4.7``() = singleTestBuildAndRun "core/nameof/version47" FSC_BUILDONLY
+    let ``nameof-versionpreview``() = singleTestBuildAndRunVersion "core/nameof/preview" FSC_BUILDONLY "preview"
 
     [<Test>]
-    let ``nameof-execute``() = singleTestBuildAndRun "core/nameof/version47" FSC_BASIC
+    let ``nameof-execute``() = singleTestBuildAndRunVersion "core/nameof/preview" FSC_BASIC "preview"
 
     [<Test>]
-    let ``nameof-fsi``() = singleTestBuildAndRun "core/nameof/version47" FSI_BASIC
+    let ``nameof-fsi``() = singleTestBuildAndRunVersion "core/nameof/preview" FSI_BASIC "preview"
 
 #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS
 module ToolsTests = 

tests/fsharp/tests.fs

@@ -1,11 +1,11 @@
-  SOURCE=E_NameOfIntConst.fs                    # E_NameOfIntConst.fs
-  SOURCE=E_NameOfStringConst.fs                 # E_NameOfStringConst.fs
-  SOURCE=E_NameOfAppliedFunction.fs             # E_NameOfAppliedFunction.fs
-  SOURCE=E_NameOfIntegerAppliedFunction.fs      # E_NameOfIntegerAppliedFunction.fs
-  SOURCE=E_NameOfPartiallyAppliedFunction.fs    # E_NameOfPartiallyAppliedFunction.fs
-  SOURCE=E_NameOfDictLookup.fs                  # E_NameOfDictLookup.fs
-  SOURCE=E_NameOfAdditionExpr.fs                # E_NameOfAdditionExpr.fs
-  SOURCE=E_NameOfParameterAppliedFunction.fs    # E_NameOfParameterAppliedFunction.fs
-  SOURCE=E_NameOfAsAFunction.fs                 # E_NameOfAsAFunction.fs
-  SOURCE=E_NameOfWithPipe.fs                    # E_NameOfWithPipe.fs
-  SOURCE=E_NameOfUnresolvableName.fs            # E_NameOfUnresolvableName.fs
+  SOURCE=E_NameOfIntConst.fs                   SCFLAGS="--langversion:preview" # E_NameOfIntConst.fs
+  SOURCE=E_NameOfStringConst.fs                SCFLAGS="--langversion:preview" # E_NameOfStringConst.fs
+  SOURCE=E_NameOfAppliedFunction.fs            SCFLAGS="--langversion:preview" # E_NameOfAppliedFunction.fs
+  SOURCE=E_NameOfIntegerAppliedFunction.fs     SCFLAGS="--langversion:preview" # E_NameOfIntegerAppliedFunction.fs
+  SOURCE=E_NameOfPartiallyAppliedFunction.fs   SCFLAGS="--langversion:preview" # E_NameOfPartiallyAppliedFunction.fs
+  SOURCE=E_NameOfDictLookup.fs                 SCFLAGS="--langversion:preview" # E_NameOfDictLookup.fs
+  SOURCE=E_NameOfAdditionExpr.fs               SCFLAGS="--langversion:preview" # E_NameOfAdditionExpr.fs
+  SOURCE=E_NameOfParameterAppliedFunction.fs   SCFLAGS="--langversion:preview" # E_NameOfParameterAppliedFunction.fs
+  SOURCE=E_NameOfAsAFunction.fs                SCFLAGS="--langversion:preview" # E_NameOfAsAFunction.fs
+  SOURCE=E_NameOfWithPipe.fs                   SCFLAGS="--langversion:preview" # E_NameOfWithPipe.fs
+  SOURCE=E_NameOfUnresolvableName.fs           SCFLAGS="--langversion:preview" # E_NameOfUnresolvableName.fs