Fix broken script

fsprojects · Sep 11, 2015 · af30de4 · af30de4
1 parent 54cba7f
commit af30de4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+## 2.10.2 (12 September, 2015)
+ - Fix load script (wrap logging setup in try catch properly)
+
 ## 2.10.1 (12 September, 2015)
  - paket update && fix compilation (#338)
  - Wrap logging setup in try catch 

diff --git a/packages/FSharp.Formatting/FSharp.Formatting.fsx b/packages/FSharp.Formatting/FSharp.Formatting.fsx
@@ -27,13 +27,13 @@ if (typeof<System.Web.Razor.ParserResults>.Assembly.GetName().Version.Major <= 2
 #r "FSharp.MetadataFormat.dll"
 
 // Setup Logging for FSharp.Formatting and Yaaf.FSharp.Scripting
+module Logging = FSharp.Formatting.Common.Log
+type TraceOptions = System.Diagnostics.TraceOptions
 try
   let svclogFile = "FSharp.Formatting.svclog"
   let logFile = "FSharp.Formatting.log"
   [ svclogFile; logFile ] |> Seq.iter (fun f -> if System.IO.File.Exists f then System.IO.File.Delete f)
 
-  module Logging = FSharp.Formatting.Common.Log
-  type TraceOptions = System.Diagnostics.TraceOptions
   System.Diagnostics.Trace.AutoFlush <- true
   let allTraceOptions = TraceOptions.Callstack ||| TraceOptions.DateTime ||| TraceOptions.LogicalOperationStack |||
                         TraceOptions.ProcessId ||| TraceOptions.ThreadId ||| TraceOptions.Timestamp

diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -4,10 +4,10 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyProductAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
-[<assembly: AssemblyVersionAttribute("2.10.1")>]
-[<assembly: AssemblyFileVersionAttribute("2.10.1")>]
+[<assembly: AssemblyVersionAttribute("2.10.2")>]
+[<assembly: AssemblyFileVersionAttribute("2.10.2")>]
 [<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.10.1"
+    let [<Literal>] Version = "2.10.2"