don't copy FSharp.Core into the output directory for the tests (becau…

…se sigdata and optdata will be missing)
fsprojects · Dec 24, 2015 · 25b9dec · 25b9dec
1 parent afe9ba1
commit 25b9dec
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,11 +1,6 @@
-## 2.12.1-alpha3
+## 2.12.1 (24 December, 2015)
  - update dependencies
-
-## 2.12.1-alpha2 (19 December, 2015)
- - strengthen the VFSPT version.
  - Upgrade the CommandTool to F# 4 and bundle FSharp.Core with sigdata and optdata.
-
-## 2.12.1-alpha1 (18 December, 2015)
  - Fix crash when a fenced code block starts with an empty line (https://github.com/tpetricek/FSharp.Formatting/pull/361)
  - Support for all known xml elements (https://github.com/tpetricek/FSharp.Formatting/pull/331)
 

diff --git a/src/Common/AssemblyInfo.cs b/src/Common/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 [assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")]
 [assembly: AssemblyVersionAttribute("2.12.1")]
 [assembly: AssemblyFileVersionAttribute("2.12.1")]
-[assembly: AssemblyInformationalVersionAttribute("2.12.1-alpha3")]
+[assembly: AssemblyInformationalVersionAttribute("2.12.1")]
 [assembly: AssemblyCopyrightAttribute("Apache 2.0 License")]
 namespace System {
     internal static class AssemblyVersionInformation {

diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -6,7 +6,7 @@ open System.Reflection
 [<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
 [<assembly: AssemblyVersionAttribute("2.12.1")>]
 [<assembly: AssemblyFileVersionAttribute("2.12.1")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.12.1-alpha3")>]
+[<assembly: AssemblyInformationalVersionAttribute("2.12.1")>]
 [<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
 do ()
 

diff --git a/src/FSharp.CodeFormat/CodeFormatAgent.fs b/src/FSharp.CodeFormat/CodeFormatAgent.fs
@@ -247,7 +247,9 @@ type CodeFormatAgent() =
 
   // Create an instance of an InteractiveChecker (which does background analysis
   // in a typical IntelliSense editor integration for F#)
-  let languageService = LanguageService() 
+  let languageService = LanguageService()
+  do languageService.SetCriticalErrorHandler(fun exn str1 str2 opts ->
+      FSharp.Formatting.Common.Log.errorf "Language Service Error (%s, %s, %A): %O" str1 str2 opts exn)
 
   /// Type-checking takes some time and doesn't return information on the
   /// first call, so this function creates workflow that tries repeatedly

diff --git a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj
@@ -89,7 +89,7 @@
       <HintPath>..\..\bin\FSharp.CodeFormat.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj
@@ -97,7 +97,7 @@
       <HintPath>..\..\bin\FSharp.CodeFormat.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj
@@ -79,7 +79,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj b/tests/FSharp.MetadataFormat.Tests/FSharp.MetadataFormat.Tests.fsproj
@@ -43,7 +43,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>True</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="System" />