remove multi-emit - internal restriction (#14478)

* remove internal restriction * fantomas * Oops * Update src/Compiler/Interactive/fsi.fs Co-authored-by: Tomas Grosup <[email protected]> * Update src/Compiler/Interactive/fsi.fs Co-authored-by: Tomas Grosup <[email protected]> * make desktop fsi default to multi-emit * fix some issues * ushort * commented out code * Correct size for maxvalue * tweak * No longer a compile error under fsi with multiemit * Cambridge Co-authored-by: Tomas Grosup <[email protected]>
dotnet · Jan 3, 2023 · cd09ee2 · cd09ee2
1 parent a9c194a
commit cd09ee2
Show file tree

Hide file tree

Showing 29 changed files with 162 additions and 316 deletions.
diff --git a/a b/a
diff --git a/src/Compiler/AbstractIL/ilsign.fs b/src/Compiler/AbstractIL/ilsign.fs
@@ -349,11 +349,10 @@ type ILStrongNameSigner =
     | KeyPair of keyPair
     | KeyContainer of keyContainerName
 
-    static member OpenPublicKeyOptions s p =
-        PublicKeyOptionsSigner((signerOpenPublicKeyFile s), p)
+    static member OpenPublicKeyOptions kp p = PublicKeyOptionsSigner(kp, p)
 
-    static member OpenPublicKey pubkey = PublicKeySigner pubkey
-    static member OpenKeyPairFile s = KeyPair(signerOpenKeyPairFile s)
+    static member OpenPublicKey bytes = PublicKeySigner bytes
+    static member OpenKeyPairFile bytes = KeyPair(bytes)
     static member OpenKeyContainer s = KeyContainer s
 
     member s.IsFullySigned =

diff --git a/src/Compiler/AbstractIL/ilsign.fsi b/src/Compiler/AbstractIL/ilsign.fsi
@@ -16,9 +16,9 @@ open System.IO
 [<Sealed>]
 type ILStrongNameSigner =
     member PublicKey: byte[]
-    static member OpenPublicKeyOptions: string -> bool -> ILStrongNameSigner
+    static member OpenPublicKeyOptions: byte array -> bool -> ILStrongNameSigner
     static member OpenPublicKey: byte[] -> ILStrongNameSigner
-    static member OpenKeyPairFile: string -> ILStrongNameSigner
+    static member OpenKeyPairFile: byte[] -> ILStrongNameSigner
     static member OpenKeyContainer: string -> ILStrongNameSigner
     member IsFullySigned: bool
     member PublicKey: byte[]

diff --git a/src/Compiler/Driver/CreateILModule.fs b/src/Compiler/Driver/CreateILModule.fs
@@ -65,7 +65,11 @@ module AttributeHelpers =
 //----------------------------------------------------------------------------
 
 /// Represents the configuration settings used to perform strong-name signing
-type StrongNameSigningInfo = StrongNameSigningInfo of delaysign: bool * publicsign: bool * signer: string option * container: string option
+type StrongNameSigningInfo =
+    | StrongNameSigningInfo of delaysign: bool * publicsign: bool * signer: byte array option * container: string option
+
+let GetStrongNameSigningInfo (delaysign, publicsign, signer, container) =
+    StrongNameSigningInfo(delaysign, publicsign, signer, container)
 
 /// Validate the attributes and configuration settings used to perform strong-name signing
 let ValidateKeySigningAttributes (tcConfig: TcConfig, tcGlobals, topAttrs) =
@@ -91,14 +95,24 @@ let ValidateKeySigningAttributes (tcConfig: TcConfig, tcGlobals, topAttrs) =
 
     // if signer is set via an attribute, validate that it wasn't set via an option
     let signer =
-        match signerAttrib with
-        | Some signer ->
-            if tcConfig.signer.IsSome && tcConfig.signer <> Some signer then
-                warning (Error(FSComp.SR.fscKeyFileWarning (), rangeCmdArgs))
-                tcConfig.signer
-            else
-                Some signer
-        | None -> tcConfig.signer
+        let signerFile =
+            match signerAttrib with
+            | Some signer ->
+                if tcConfig.signer.IsSome && tcConfig.signer <> Some signer then
+                    warning (Error(FSComp.SR.fscKeyFileWarning (), rangeCmdArgs))
+                    tcConfig.signer
+                else
+                    Some signer
+            | None -> tcConfig.signer
+
+        match signerFile with
+        | Some signerPath ->
+            try
+                Some(FileSystem.OpenFileForReadShim(signerPath).ReadAllBytes())
+            with _ ->
+                // Note :: don't use errorR here since we really want to fail and not produce a binary
+                error (Error(FSComp.SR.fscKeyFileCouldNotBeOpened signerPath, rangeCmdArgs))
+        | None -> None
 
     // if container is set via an attribute, validate that it wasn't set via an option, and that they keyfile wasn't set
     // if keyfile was set, use that instead (silently)
@@ -127,15 +141,11 @@ let GetStrongNameSigner signingInfo =
     | None ->
         match signer with
         | None -> None
-        | Some s ->
-            try
-                if publicsign || delaysign then
-                    Some(ILStrongNameSigner.OpenPublicKeyOptions s publicsign)
-                else
-                    Some(ILStrongNameSigner.OpenKeyPairFile s)
-            with _ ->
-                // Note :: don't use errorR here since we really want to fail and not produce a binary
-                error (Error(FSComp.SR.fscKeyFileCouldNotBeOpened s, rangeCmdArgs))
+        | Some bytes ->
+            if publicsign || delaysign then
+                Some(ILStrongNameSigner.OpenPublicKeyOptions bytes publicsign)
+            else
+                Some(ILStrongNameSigner.OpenKeyPairFile bytes)
 
 //----------------------------------------------------------------------------
 // Building the contents of the finalized IL module

diff --git a/src/Compiler/Driver/CreateILModule.fsi b/src/Compiler/Driver/CreateILModule.fsi
@@ -15,6 +15,10 @@ open FSharp.Compiler.TypedTree
 /// Represents the configuration settings used to perform strong-name signing
 type StrongNameSigningInfo
 
+/// Get the SigningInfo for specific values(delaysign, tcConfig.publicsign, signer, container)
+val GetStrongNameSigningInfo:
+    delaysign: bool * publicsign: bool * signer: byte array option * container: string option -> StrongNameSigningInfo
+
 /// Validate the attributes and configuration settings used to perform strong-name signing
 val ValidateKeySigningAttributes: tcConfig: TcConfig * tcGlobals: TcGlobals * TopAttribs -> StrongNameSigningInfo
 

diff --git a/src/Compiler/Interactive/FSIstrings.txt b/src/Compiler/Interactive/FSIstrings.txt
@@ -56,6 +56,4 @@ shadowCopyReferences,"Prevents references from being locked by the F# Interactiv
 fsiOperationCouldNotBeCompleted,"Operation could not be completed due to earlier error"
 fsiOperationFailed,"Operation failed. The error text has been printed in the error stream. To return the corresponding FSharpDiagnostic use the EvalInteractionNonThrowing, EvalScriptNonThrowing or EvalExpressionNonThrowing"
 fsiMultiAssemblyEmitOption,"Emit multiple assemblies (on by default)"
-fsiMultiAssemblyEmitOptionOffByDefault,"Emit multiple assemblies (off by default for .NET Framework)"
-2303,fsiInternalAccess,"Accessing the internal type, method or field '%s' from a previous evaluation in F# Interactive is deprecated and may cause subsequent access errors. To enable the legacy generation of a single dynamic assembly that can access internals, use the '--multiemit-' option."
 2304,fsiEntryPointWontBeInvoked,"Functions with [<EntryPoint>] are not invoked in FSI. '%s' was not invoked. Execute '%s <args>' in order to invoke '%s' with the appropriate string array of command line arguments."