#1082 fix loading key container file

dotnet-websharper · Dec 7, 2019 · b039f8b · b039f8b
1 parent ebb8f47
commit b039f8b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/compiler/WebSharper.CSharp/Program.fs b/src/compiler/WebSharper.CSharp/Program.fs
@@ -157,7 +157,7 @@ let Compile config =
 
             TimedStage "Erasing assembly content for Proxy project"
 
-            assem.Write config.KeyFile config.AssemblyFile
+            assem.Write (config.KeyFile |> Option.map File.ReadAllBytes) config.AssemblyFile
 
             TimedStage "Writing resources into assembly"
             js, currentMeta, sources, extraBundles

diff --git a/src/compiler/WebSharper.Compiler/CommandTools.fs b/src/compiler/WebSharper.Compiler/CommandTools.fs
@@ -342,7 +342,7 @@ let RunInterfaceGenerator (aR: AssemblyResolver) snk config =
                     EmbeddedResources = config.Resources |> Seq.map fst
                     ProjectDir = config.ProjectDir
                     ReferencePaths = config.References
-                    StrongNameKey = snk
+                    StrongNameKeyPath = snk
             }
 
         let cmp = InterfaceGenerator.Compiler.Create()

diff --git a/src/compiler/WebSharper.Compiler/WIGCompile.fs b/src/compiler/WebSharper.Compiler/WIGCompile.fs
@@ -703,7 +703,7 @@ type CompilerOptions =
         OutputPath : option<string>
         ProjectDir : string
         ReferencePaths : seq<string>
-        StrongNameKey : option<string>
+        StrongNameKeyPath : option<string>
     }
 
     static member Default(name) =
@@ -717,7 +717,7 @@ type CompilerOptions =
             OutputPath = None
             ProjectDir = "."
             ReferencePaths = Seq.empty
-            StrongNameKey = None
+            StrongNameKeyPath = None
         }
 
     static member Parse args =
@@ -731,7 +731,7 @@ type CompilerOptions =
             | S "-v:" ver ->
                 { opts with AssemblyVersion = Version.Parse ver }
             | S "-snk:" path ->
-                { opts with StrongNameKey = Some path }
+                { opts with StrongNameKeyPath = Some path }
             | S "-embed:" path ->
                 { opts with EmbeddedResources = Seq.append opts.EmbeddedResources [path] }
             | S "-o:" out ->
@@ -1258,10 +1258,10 @@ type XmlDocGenerator(assembly: AssemblyDefinition, comments: Comments) =
 type CompiledAssembly(def: AssemblyDefinition, doc: XmlDocGenerator, options: CompilerOptions, tB: TypeBuilder) =
 
     let writerParams =
-        match options.StrongNameKey with
+        match options.StrongNameKeyPath with
         | None -> WriterParameters()
         | Some p ->
-            WriterParameters(StrongNameKeyContainer = p)
+            WriterParameters(StrongNameKeyBlob = File.ReadAllBytes p)
 
     member a.GetBytes() =
         use out = new MemoryStream()

diff --git a/src/compiler/WebSharper.Compiler/WIGCompile.fsi b/src/compiler/WebSharper.Compiler/WIGCompile.fsi
@@ -42,7 +42,7 @@ type CompilerOptions =
         OutputPath : option<string>
         ProjectDir : string
         ReferencePaths : seq<string>
-        StrongNameKey : option<string>
+        StrongNameKeyPath : option<string>
     }
 
     static member Default : assemblyName: string -> CompilerOptions

diff --git a/src/compiler/WebSharper.Compiler/api/Assembly.fs b/src/compiler/WebSharper.Compiler/api/Assembly.fs
@@ -111,18 +111,18 @@ type Assembly =
     member this.OutputParameters(keyPair) =
         let par = Mono.Cecil.WriterParameters()
         match keyPair with
-        | Some kp -> par.StrongNameKeyContainer <- kp
+        | Some kp -> par.StrongNameKeyBlob <- kp
         | None -> ()
         par
 
-    member this.RawBytes(kP: option<string>) =
+    member this.RawBytes(kP: option<byte[]>) =
         use s = new System.IO.MemoryStream(16 * 1024)
         this.Definition.Write(s, this.OutputParameters kP)
         s.ToArray()
 
     member this.Symbols = this.Debug
 
-    member this.Write(kP: option<string>)(path: string) =
+    member this.Write(kP: option<byte[]>)(path: string) =
         let par = this.OutputParameters kP
         match this.Debug with
         | Some (Mdb _) ->

diff --git a/src/compiler/WebSharper.Compiler/api/Assembly.fsi b/src/compiler/WebSharper.Compiler/api/Assembly.fsi
@@ -31,10 +31,10 @@ type Assembly =
     member GetScripts : unit -> seq<EmbeddedFile>
 
     /// Returns the raw assembly data.
-    member RawBytes : option<string> -> byte []
+    member RawBytes : option<byte[]> -> byte[]
 
     /// Writes the assembly to the given path.
-    member Write : option<string> -> path: string -> unit
+    member Write : option<byte[]> -> path: string -> unit
 
     /// Reads the embedded JavaScript.
     member CompressedJavaScript : option<string>

diff --git a/src/compiler/WebSharper.FSharp/Program.fs b/src/compiler/WebSharper.FSharp/Program.fs
@@ -245,7 +245,7 @@ let Compile (config : WsConfig) (warnSettings: WarnSettings) =
 
             TimedStage "Erasing assembly content for Proxy project"
 
-            assem.Write config.KeyFile config.AssemblyFile
+            assem.Write (config.KeyFile |> Option.map File.ReadAllBytes) config.AssemblyFile
 
             TimedStage "Writing resources into assembly"
             js, currentMeta, sources, extraBundles