Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 2aafef7

Browse files
dotnet-botKevinRansom
authored andcommitted
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]>
1 parent 93104e3 commit 2aafef7

File tree

6 files changed

+616
-5
lines changed

6 files changed

+616
-5
lines changed

src/absil/ilsign.fs

Lines changed: 579 additions & 0 deletions
Large diffs are not rendered by default.

src/absil/ilsign.fsi

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
/// Functions associated with signing il assemblies which
4+
/// vary between supported implementations of the CLI Common Language
5+
/// Runtime, e.g. between the SSCLI, Mono and the Microsoft CLR.
6+
///
7+
8+
module internal FSharp.Compiler.AbstractIL.Internal.StrongNameSign
9+
10+
//---------------------------------------------------------------------
11+
// Strong name signing
12+
//---------------------------------------------------------------------
13+
[<Sealed>]
14+
type ILStrongNameSigner =
15+
member PublicKey: byte[]
16+
static member OpenPublicKeyOptions: string -> bool -> ILStrongNameSigner
17+
static member OpenPublicKey: byte[] -> ILStrongNameSigner
18+
static member OpenKeyPairFile: string -> ILStrongNameSigner
19+
static member OpenKeyContainer: string -> ILStrongNameSigner
20+
member Close: unit -> unit
21+
member IsFullySigned: bool
22+
member PublicKey: byte[]
23+
member SignatureSize: int
24+
member SignFile: string -> unit

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,10 @@
242242
<Link>AbsIL\ilsign.fsi</Link>
243243
</Compile>
244244
<Compile Include="..\absil\ilsign.fs">
245+
<Compile Include="..\..\absil\ilsign.fsi">
246+
<Link>AbsIL\ilsign.fsi</Link>
247+
</Compile>
248+
<Compile Include="..\..\absil\ilsign.fs">
245249
<Link>AbsIL\ilsign.fs</Link>
246250
</Compile>
247251
<Compile Include="..\absil\ilnativeres.fsi">

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@
232232
<Link>AbsIL\ilsign.fsi</Link>
233233
</Compile>
234234
<Compile Include="..\absil\ilsign.fs">
235+
<Compile Include="..\..\absil\ilsign.fsi">
236+
<Link>AbsIL\ilsign.fsi</Link>
237+
</Compile>
238+
<Compile Include="..\..\absil\ilsign.fs">
235239
<Link>AbsIL\ilsign.fs</Link>
236240
</Compile>
237241
<Compile Include="..\absil\ilnativeres.fsi">

src/fsharp/fsc.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ open Microsoft.DotNet.DependencyManager
6060

6161
open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
6262

63+
open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
64+
6365
#if !NO_EXTENSIONTYPING
6466
open FSharp.Compiler.ExtensionTyping
6567
#endif

src/fsharp/fsc.fsi

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
module internal FSharp.Compiler.Driver
44

5+
open FSharp.Compiler.AbstractIL
56
open FSharp.Compiler.AbstractIL.IL
67
open FSharp.Compiler.AbstractIL.ILBinaryReader
78
open FSharp.Compiler.AbstractIL.Internal.Library
89
open FSharp.Compiler.AbstractIL.Internal.StrongNameSign
9-
open FSharp.Compiler.CheckExpressions
10-
open FSharp.Compiler.CheckDeclarations
11-
open FSharp.Compiler.CompilerConfig
12-
open FSharp.Compiler.CompilerDiagnostics
13-
open FSharp.Compiler.CompilerImports
10+
open FSharp.Compiler.CompileOps
1411
open FSharp.Compiler.ErrorLogger
1512
open FSharp.Compiler.SyntaxTree
1613
open FSharp.Compiler.TcGlobals
14+
open FSharp.Compiler.TypeChecker
1715
open FSharp.Compiler.TypedTree
1816
open FSharp.Compiler.TypedTreeOps
1917

0 commit comments

Comments
 (0)