Merge main to release/dev16.8 (dotnet#10120)

* Bloody mutable fields (dotnet#10116) * Fix 9150 --- #i nuget on desktop witout net48 ref assemblies fails. (dotnet#10114) * signing (dotnet#10108) Co-authored-by: Kevin Ransom (msft) <[email protected]>
xamarin · Feb 22, 2021 · 2aafef7 · 2aafef7
1 parent 93104e3
commit 2aafef7
Show file tree

Hide file tree

Showing 6 changed files with 616 additions and 5 deletions.
diff --git a/src/absil/ilsign.fs b/src/absil/ilsign.fs
diff --git a/src/absil/ilsign.fsi b/src/absil/ilsign.fsi
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+/// Functions associated with signing il assemblies which
+/// vary between supported implementations of the CLI Common Language
+/// Runtime, e.g. between the SSCLI, Mono and the Microsoft CLR.
+///
+
+module internal FSharp.Compiler.AbstractIL.Internal.StrongNameSign
+
+//---------------------------------------------------------------------
+// Strong name signing
+//---------------------------------------------------------------------
+[<Sealed>]
+type ILStrongNameSigner =
+    member PublicKey: byte[]
+    static member OpenPublicKeyOptions: string -> bool -> ILStrongNameSigner
+    static member OpenPublicKey: byte[] -> ILStrongNameSigner
+    static member OpenKeyPairFile: string -> ILStrongNameSigner
+    static member OpenKeyContainer: string -> ILStrongNameSigner
+    member Close: unit -> unit
+    member IsFullySigned: bool
+    member PublicKey: byte[]
+    member SignatureSize: int
+    member SignFile: string -> unit
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -242,6 +242,10 @@
       <Link>AbsIL\ilsign.fsi</Link>
     </Compile>
     <Compile Include="..\absil\ilsign.fs">
+    <Compile Include="..\..\absil\ilsign.fsi">
+      <Link>AbsIL\ilsign.fsi</Link>
+    </Compile>
+    <Compile Include="..\..\absil\ilsign.fs">
       <Link>AbsIL\ilsign.fs</Link>
     </Compile>
     <Compile Include="..\absil\ilnativeres.fsi">

diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -232,6 +232,10 @@
       <Link>AbsIL\ilsign.fsi</Link>
     </Compile>
     <Compile Include="..\absil\ilsign.fs">
+    <Compile Include="..\..\absil\ilsign.fsi">
+      <Link>AbsIL\ilsign.fsi</Link>
+    </Compile>
+    <Compile Include="..\..\absil\ilsign.fs">
       <Link>AbsIL\ilsign.fs</Link>
     </Compile>
     <Compile Include="..\absil\ilnativeres.fsi">

diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs
@@ -60,6 +60,8 @@ open Microsoft.DotNet.DependencyManager
 
 open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
 
+open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
+
 #if !NO_EXTENSIONTYPING
 open FSharp.Compiler.ExtensionTyping
 #endif

diff --git a/src/fsharp/fsc.fsi b/src/fsharp/fsc.fsi
@@ -2,18 +2,16 @@
 
 module internal FSharp.Compiler.Driver 
 
+open FSharp.Compiler.AbstractIL
 open FSharp.Compiler.AbstractIL.IL
 open FSharp.Compiler.AbstractIL.ILBinaryReader
 open FSharp.Compiler.AbstractIL.Internal.Library
 open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
-open FSharp.Compiler.CheckExpressions
-open FSharp.Compiler.CheckDeclarations
-open FSharp.Compiler.CompilerConfig
-open FSharp.Compiler.CompilerDiagnostics
-open FSharp.Compiler.CompilerImports
+open FSharp.Compiler.CompileOps
 open FSharp.Compiler.ErrorLogger
 open FSharp.Compiler.SyntaxTree
 open FSharp.Compiler.TcGlobals
+open FSharp.Compiler.TypeChecker
 open FSharp.Compiler.TypedTree
 open FSharp.Compiler.TypedTreeOps