Merge pull request #11605 from dotnet/merges/main-to-release/dev17.0

Merge main to release/dev17.0

Author: KevinRansom

src/fsharp/CheckFormatStrings.fs

@@ -366,7 +366,8 @@ let parseFormatStringInternal (m: range) (fragRanges: range list) (g: TcGlobals)
                   appendToDotnetFormatString "%"
                   parseLoop acc (i+1, fragLine, fragCol+1) fragments
 
-              | ('d' | 'i' | 'o' | 'u' | 'x' | 'X') ->
+              | ('d' | 'i' | 'u' | 'B' | 'o' | 'x' | 'X') ->
+                  if ch = 'B' then ErrorLogger.checkLanguageFeatureError g.langVersion Features.LanguageFeature.PrintfBinaryFormat m
                   if info.precision then failwithf "%s" <| FSComp.SR.forFormatDoesntSupportPrecision(ch.ToString())
                   collectSpecifierLocation fragLine fragCol 1
                   let i = skipPossibleInterpolationHole (i+1)

src/fsharp/CompilerConfig.fs

@@ -138,7 +138,7 @@ type VersionFlag =
              if not(FileSystem.FileExistsShim s) then
                  errorR(Error(FSComp.SR.buildInvalidVersionFile s, rangeStartup)); "0.0.0.0"
              else
-                 use fs = FileSystem.OpenFileForReadShim(s).AsReadOnlyStream()
+                 use fs = FileSystem.OpenFileForReadShim(s)
                  use is = new StreamReader(fs)
                  is.ReadLine()
          | VersionNone -> "0.0.0.0"
@@ -752,7 +752,7 @@ type TcConfigBuilder =
         let absolutePath = ComputeMakePathAbsolute pathIncludedFrom path
         let ok =
             let existsOpt =
-                try Some(Directory.Exists absolutePath)
+                try Some(FileSystem.DirectoryExistsShim absolutePath)
                 with e -> warning(Error(FSComp.SR.buildInvalidSearchDirectory path, m)); None
             match existsOpt with
             | Some exists ->
@@ -1065,7 +1065,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
                 let clrRoot = tcConfig.MakePathAbsolute x
                 yield clrRoot
                 let clrFacades = Path.Combine(clrRoot, "Facades")
-                if Directory.Exists(clrFacades) then yield clrFacades
+                if FileSystem.DirectoryExistsShim(clrFacades) then yield clrFacades
 
             | None ->
 // "there is no really good notion of runtime directory on .NETCore"
@@ -1084,13 +1084,13 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
                     //
                     // In the current way of doing things, F# Interactive refers to implementation assemblies.
                     yield runtimeRoot
-                    if Directory.Exists runtimeRootFacades then
+                    if FileSystem.DirectoryExistsShim runtimeRootFacades then
                         yield runtimeRootFacades // System.Runtime.dll is in /usr/lib/mono/4.5/Facades
-                    if Directory.Exists runtimeRootWPF then
+                    if FileSystem.DirectoryExistsShim runtimeRootWPF then
                         yield runtimeRootWPF // PresentationCore.dll is in C:\Windows\Microsoft.NET\Framework\v4.0.30319\WPF
 
                     match tcConfig.FxResolver.GetFrameworkRefsPackDirectory() with
-                    | Some path when Directory.Exists(path) ->
+                    | Some path when FileSystem.DirectoryExistsShim(path) ->
                         yield path
                     | _ -> ()
 
@@ -1102,16 +1102,16 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
                         // On Mono, the default references come from the implementation assemblies.
                         // This is because we have had trouble reliably using MSBuild APIs to compute DotNetFrameworkReferenceAssembliesRootDirectory on Mono.
                         yield runtimeRoot
-                        if Directory.Exists runtimeRootFacades then
+                        if FileSystem.DirectoryExistsShim runtimeRootFacades then
                             yield runtimeRootFacades // System.Runtime.dll is in /usr/lib/mono/4.5/Facades
-                        if Directory.Exists runtimeRootWPF then
+                        if FileSystem.DirectoryExistsShim runtimeRootWPF then
                             yield runtimeRootWPF // PresentationCore.dll is in C:\Windows\Microsoft.NET\Framework\v4.0.30319\WPF
                         // On Mono we also add a default reference to the 4.5-api and 4.5-api/Facades directories.
                         let runtimeRootApi = runtimeRootWithoutSlash + "-api"
                         let runtimeRootApiFacades = Path.Combine(runtimeRootApi, "Facades")
-                        if Directory.Exists runtimeRootApi then
+                        if FileSystem.DirectoryExistsShim runtimeRootApi then
                             yield runtimeRootApi
-                        if Directory.Exists runtimeRootApiFacades then
+                        if FileSystem.DirectoryExistsShim runtimeRootApiFacades then
                              yield runtimeRootApiFacades
                     else
 #endif
@@ -1122,10 +1122,10 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
                         let frameworkRootVersion = Path.Combine(frameworkRoot, tcConfig.targetFrameworkVersion)
                         yield frameworkRootVersion
                         let facades = Path.Combine(frameworkRootVersion, "Facades")
-                        if Directory.Exists facades then
+                        if FileSystem.DirectoryExistsShim facades then
                             yield facades
                         match tcConfig.FxResolver.GetFrameworkRefsPackDirectory() with
-                        | Some path when Directory.Exists(path) ->
+                        | Some path when FileSystem.DirectoryExistsShim(path) ->
                             yield path
                         | _ -> ()
                   ]

src/fsharp/CompilerImports.fs

@@ -690,7 +690,7 @@ type RawFSharpAssemblyDataBackedByFileOnDisk (ilModule: ILModuleDef, ilAssemblyR
                     let sigFileName = Path.ChangeExtension(filename, "sigdata")
                     if not (FileSystem.FileExistsShim sigFileName) then
                         error(Error(FSComp.SR.buildExpectedSigdataFile (FileSystem.GetFullPathShim sigFileName), m))
-                    [ (ilShortAssemName, fun () -> FileSystem.OpenFileForReadShim(sigFileName, shouldShadowCopy=true).AsReadOnly())]
+                    [ (ilShortAssemName, fun () -> FileSystem.OpenFileForReadShim(sigFileName, useMemoryMappedFile=true, shouldShadowCopy=true).AsByteMemory().AsReadOnly())]
                 else
                     sigDataReaders
             sigDataReaders
@@ -706,7 +706,7 @@ type RawFSharpAssemblyDataBackedByFileOnDisk (ilModule: ILModuleDef, ilAssemblyR
                     let optDataFile = Path.ChangeExtension(filename, "optdata")
                     if not (FileSystem.FileExistsShim optDataFile) then
                         error(Error(FSComp.SR.buildExpectedFileAlongSideFSharpCore(optDataFile, FileSystem.GetFullPathShim optDataFile), m))
-                    [ (ilShortAssemName, (fun () -> FileSystem.OpenFileForReadShim(optDataFile, shouldShadowCopy=true).AsReadOnly()))]
+                    [ (ilShortAssemName, (fun () -> FileSystem.OpenFileForReadShim(optDataFile, useMemoryMappedFile=true, shouldShadowCopy=true).AsByteMemory().AsReadOnly()))]
                 else
                     optDataReaders
             optDataReaders

src/fsharp/CompilerOptions.fs

@@ -183,7 +183,7 @@ module ResponseFile =
             | s -> Some (ResponseFileLine.CompilerOptionSpec (s.Trim()))
 
         try
-            use stream = FileSystem.OpenFileForReadShim(path).AsReadOnlyStream()
+            use stream = FileSystem.OpenFileForReadShim(path)
             use reader = new StreamReader(stream, true)
             let data =
                 seq { while not reader.EndOfStream do yield reader.ReadLine () }

src/fsharp/FSComp.txt

@@ -1230,6 +1230,7 @@ invalidFullNameForProvidedType,"invalid full name for provided type"
 3087,tcCustomOperationMayNotBeOverloaded,"The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded."
 featureOverloadsForCustomOperations,"overloads for custom operations"
 featureExpandedMeasurables,"more types support units of measure"
+featurePrintfBinaryFormat,"binary formatting for integers"
 3090,tcIfThenElseMayNotBeUsedWithinQueries,"An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead."
 3091,ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen,"Invalid argument to 'methodhandleof' during codegen"
 3092,etProvidedTypeReferenceMissingArgument,"A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies."
@@ -1558,4 +1559,4 @@ forFormatInvalidForInterpolated4,"Interpolated strings used as type IFormattable
 3390,xmlDocMissingParameter,"This XML comment is incomplete: no documentation for parameter '%s'"
 3391,tcLiteralAttributeCannotUseActivePattern,"A [<Literal>] declaration cannot use an active pattern for its identifier"
 3392,containerDeprecated,"The 'AssemblyKeyNameAttribute' has been deprecated. Use 'AssemblyKeyFileAttribute' instead."
-3393,containerSigningUnsupportedOnThisPlatform,"Key container signing is not supported on this platform."
+3393,containerSigningUnsupportedOnThisPlatform,"Key container signing is not supported on this platform."

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -153,6 +153,9 @@
     <Compile Include="..\absil\illib.fs">
       <Link>Utilities\illib.fs</Link>
     </Compile>
+    <Compile Include="..\utils\FileSystem.fsi">
+      <Link>Utilities\FileSystem.fsi</Link>
+    </Compile>
     <Compile Include="..\utils\FileSystem.fs">
       <Link>Utilities\FileSystem.fs</Link>
     </Compile>

src/fsharp/FSharp.Core/printf.fs

@@ -724,7 +724,7 @@ module internal PrintfImpl =
             else 
                 fun (v: obj) -> noJustificationCore (f v) true (isPositive v) prefix
 
-    /// contains functions to handle left\right and no justification case for numbers
+    /// contains functions to handle left/right and no justification case for numbers
     module Integer =
 
         let eliminateNative (v: obj) = 
@@ -821,21 +821,27 @@ module internal PrintfImpl =
                 (rightJustify f prefix padChar isUnsigned)
 
         let getValueConverter (spec: FormatSpecifier) : ValueConverter =
-            let c = spec.TypeChar
-            if c = 'd' || c = 'i' then
+            match spec.TypeChar with
+            | 'd' | 'i' ->
                 withPadding spec false toString
-            elif c = 'u' then
+            | 'u' ->
                 withPadding spec true  (toUnsigned >> toString) 
-            elif c = 'x' then
+            | 'x' ->
                 withPadding spec true (toFormattedString "x")
-            elif c = 'X' then
+            | 'X' ->
                 withPadding spec true (toFormattedString "X")
-            elif c = 'o' then
+            | 'o' ->
                 withPadding spec true (fun (v: obj) ->
+                    // Convert.ToInt64 throws for uint64 with values above int64 range so cast directly
                     match toUnsigned v with 
                     | :? uint64 as u -> Convert.ToString(int64 u, 8)
                     | u -> Convert.ToString(Convert.ToInt64 u, 8))
-            else raise (ArgumentException())    
+            | 'B' ->
+                withPadding spec true (fun (v: obj) ->
+                    match toUnsigned v with 
+                    | :? uint64 as u -> Convert.ToString(int64 u, 2)
+                    | u -> Convert.ToString(Convert.ToInt64 u, 2))
+            | _ -> invalidArg (nameof spec) "Invalid integer format"
 
     module FloatAndDecimal = 
 
@@ -982,7 +988,7 @@ module internal PrintfImpl =
             Basic.withPadding spec (fun (c: obj) -> (unbox<char> c).ToString())
         | 'M'  ->
             FloatAndDecimal.withPadding spec (fun _ -> "G") "G" // %M ignores precision
-        | 'd' | 'i' | 'x' | 'X' | 'u' | 'o'-> 
+        | 'd' | 'i' | 'u' | 'B' | 'o' | 'x' | 'X' -> 
             Integer.getValueConverter spec
         | 'e' | 'E' 
         | 'f' | 'F' 

src/fsharp/FxResolver.fs

@@ -88,7 +88,7 @@ type internal FxResolver(assumeDotNetFramework: bool, projectDir: string, useSdk
             | Some dotnetHostPath ->
                 try
                     let workingDir =
-                        if Directory.Exists(projectDir) then
+                        if FileSystem.DirectoryExistsShim(projectDir) then
                             Some projectDir
                         else
                             None
@@ -131,8 +131,8 @@ type internal FxResolver(assumeDotNetFramework: bool, projectDir: string, useSdk
             let sdksDir = 
                 match getDotnetHostDirectory() with
                 | Some dotnetDir ->
-                    let candidate = Path.GetFullPath(Path.Combine(dotnetDir, "sdk"))
-                    if Directory.Exists(candidate) then Some candidate else None
+                    let candidate = FileSystem.GetFullPathShim(Path.Combine(dotnetDir, "sdk"))
+                    if FileSystem.DirectoryExistsShim(candidate) then Some candidate else None
                 | None -> None
 
             match sdksDir with
@@ -177,13 +177,14 @@ type internal FxResolver(assumeDotNetFramework: bool, projectDir: string, useSdk
             | Some dir ->
                 try
                     let dotnetConfigFile = Path.Combine(dir, "dotnet.runtimeconfig.json")
-                    let dotnetConfig = FileSystem.OpenFileForReadShim(dotnetConfigFile).AsStream().ReadAllText()
+                    use stream = FileSystem.OpenFileForReadShim(dotnetConfigFile)
+                    let dotnetConfig = stream.ReadAllText()
                     let pattern = "\"version\": \""
                     let startPos = dotnetConfig.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) + pattern.Length
                     let endPos = dotnetConfig.IndexOf("\"", startPos)
                     let ver = dotnetConfig.[startPos..endPos-1]
-                    let path = Path.GetFullPath(Path.Combine(dir, "..", "..", "shared", "Microsoft.NETCore.App", ver))
-                    if Directory.Exists(path) then
+                    let path = FileSystem.GetFullPathShim(Path.Combine(dir, "..", "..", "shared", "Microsoft.NETCore.App", ver))
+                    if FileSystem.DirectoryExistsShim(path) then
                         path, warnings
                     else
                         getRunningImplementationAssemblyDir(), warnings
@@ -322,7 +323,8 @@ type internal FxResolver(assumeDotNetFramework: bool, projectDir: string, useSdk
                 | asm ->
                     let depsJsonPath = Path.ChangeExtension(asm.Location, "deps.json")
                     if FileSystem.FileExistsShim(depsJsonPath) then
-                        FileSystem.OpenFileForReadShim(depsJsonPath).AsReadOnlyStream().ReadAllText()
+                        use stream = FileSystem.OpenFileForReadShim(depsJsonPath)
+                        stream.ReadAllText()
                     else
                         ""
             with _ ->
@@ -783,7 +785,8 @@ type internal FxResolver(assumeDotNetFramework: bool, projectDir: string, useSdk
                 match sdkDir with
                 | Some dir ->
                     let dotnetConfigFile = Path.Combine(dir, "dotnet.runtimeconfig.json")
-                    let dotnetConfig = FileSystem.OpenFileForReadShim(dotnetConfigFile).AsReadOnlyStream().ReadAllText()
+                    use stream = FileSystem.OpenFileForReadShim(dotnetConfigFile)
+                    let dotnetConfig = stream.ReadAllText()
                     let pattern = "\"tfm\": \""
                     let startPos = dotnetConfig.IndexOf(pattern, StringComparison.OrdinalIgnoreCase) + pattern.Length
                     let endPos = dotnetConfig.IndexOf("\"", startPos)

src/fsharp/LanguageFeatures.fs

@@ -36,6 +36,7 @@ type LanguageFeature =
     | StringInterpolation
     | OverloadsForCustomOperations
     | ExpandedMeasurables
+    | PrintfBinaryFormat
 
 /// LanguageVersion management
 type LanguageVersion (specifiedVersionAsString) =
@@ -77,6 +78,7 @@ type LanguageVersion (specifiedVersionAsString) =
             LanguageFeature.OverloadsForCustomOperations, previewVersion
             LanguageFeature.ExpandedMeasurables, previewVersion
             LanguageFeature.FromEndSlicing, previewVersion
+            LanguageFeature.PrintfBinaryFormat, previewVersion
         ]
 
     let specified =
@@ -150,6 +152,7 @@ type LanguageVersion (specifiedVersionAsString) =
         | LanguageFeature.StringInterpolation -> FSComp.SR.featureStringInterpolation()
         | LanguageFeature.OverloadsForCustomOperations -> FSComp.SR.featureOverloadsForCustomOperations()
         | LanguageFeature.ExpandedMeasurables -> FSComp.SR.featureExpandedMeasurables()
+        | LanguageFeature.PrintfBinaryFormat -> FSComp.SR.featurePrintfBinaryFormat()
 
     /// Get a version string associated with the given feature.
     member _.GetFeatureVersionString feature =

src/fsharp/LanguageFeatures.fsi

@@ -24,6 +24,7 @@ type LanguageFeature =
     | StringInterpolation
     | OverloadsForCustomOperations
     | ExpandedMeasurables
+    | PrintfBinaryFormat
 
 /// LanguageVersion management
 type LanguageVersion =