update latest FSharpLint (pulls a bunch of stuff / changes proj files…

… due to appearance of framework 463)
fsprojects-archive · Feb 14, 2017 · 7168790 · 7168790
1 parent 1919a70
commit 7168790
Show file tree

Hide file tree

Showing 11 changed files with 345 additions and 89 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -8,7 +8,7 @@ nuget FSharp.Core
 nuget FSharp.Data
 nuget FSharp.Management
 nuget FSharp.ViewModule.Core
-nuget FSharpLint.Core
+nuget FSharpLint.Core prerelease
 nuget FsPickler
 nuget FsXaml.Wpf
 nuget SourceLink.SymbolStore 0.5.0

diff --git a/paket.lock b/paket.lock
@@ -9,22 +9,90 @@ NUGET
     FSharp.Compiler.Service (10.0.1)
       System.Collections.Immutable (>= 1.2)
       System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
-    FSharp.Compiler.Service.ProjectCracker (8.0)
+    FSharp.Compiler.Service.ProjectCracker (10.0.1)
+      FSharp.Compiler.Service (>= 10.0.1) - framework: >= net463
+      Microsoft.Build (>= 14.3) - framework: >= net463
+      Microsoft.Build.Framework (>= 14.3) - framework: >= net463
+      Microsoft.Build.Tasks.Core (>= 14.3) - framework: >= net463
+      Microsoft.Build.Utilities.Core (>= 14.3) - framework: >= net463
+      Microsoft.FSharp.Core.netcore (>= 1.0.0-alpha-161205) - framework: >= net463
+      System.Runtime.Serialization.Json (>= 4.0.2) - framework: >= net463
     FSharp.Core (4.0.0.1)
     FSharp.Data (2.3.2)
     FSharp.Management (0.4.2)
     FSharp.ViewModule.Core (1.0.5)
       FSharp.Core
-    FSharpLint.Core (0.4.10)
+    FSharpLint.Core (0.7.0-beta)
       FParsec (>= 1.0.2)
-      FSharp.Compiler.Service (>= 8.0)
-      FSharp.Compiler.Service.ProjectCracker (>= 8.0)
+      FSharp.Compiler.Service (>= 10.0.1)
+      FSharp.Compiler.Service.ProjectCracker (>= 10.0.1)
     FsPickler (3.2)
     FsXaml.Wpf (3.1.2)
+    Microsoft.Build (14.3) - framework: >= net463
+      Microsoft.Build.Framework (14.3) - framework: >= net45
+    Microsoft.Build.Framework (14.3)
+      System.Collections (>= 4.0.11) - framework: >= net46
+      System.Runtime (>= 4.1) - framework: >= net46
+      System.Runtime.InteropServices (>= 4.1) - framework: >= net46
+    Microsoft.Build.Tasks.Core (14.3) - framework: >= net463
+      Microsoft.Build.Framework (14.3) - framework: >= net45
+      Microsoft.Build.Utilities.Core (14.3) - framework: >= net45
+    Microsoft.Build.Utilities.Core (14.3)
+      Microsoft.Build.Framework (14.3) - framework: >= net45
+    Microsoft.FSharp.Core.netcore (1.0.0-rc-170122) - framework: >= net463
+      System.Collections (>= 4.0.11)
+      System.Console (>= 4.0)
+      System.Diagnostics.Debug (>= 4.0.11)
+      System.Diagnostics.Tools (>= 4.0.1)
+      System.Globalization (>= 4.0.11)
+      System.IO (>= 4.1)
+      System.Linq (>= 4.1)
+      System.Linq.Expressions (>= 4.1)
+      System.Linq.Queryable (>= 4.0.1)
+      System.Net.Requests (>= 4.0.11)
+      System.Reflection (>= 4.1)
+      System.Reflection.Extensions (>= 4.0.1)
+      System.Resources.ResourceManager (>= 4.0.1)
+      System.Runtime (>= 4.1)
+      System.Runtime.Extensions (>= 4.1)
+      System.Runtime.Numerics (>= 4.0.1)
+      System.Text.RegularExpressions (>= 4.1)
+      System.Threading (>= 4.0.11)
+      System.Threading.Tasks (>= 4.0.11)
+      System.Threading.Tasks.Parallel (>= 4.0.1)
+      System.Threading.Thread (>= 4.0)
+      System.Threading.ThreadPool (>= 4.0.10)
+      System.Threading.Timer (>= 4.0.1)
     SourceLink.SymbolStore (0.5)
+    System.Collections (4.3)
     System.Collections.Immutable (1.2)
+    System.Console (4.3) - framework: >= net463
+    System.Diagnostics.Debug (4.3) - framework: >= net463
+    System.Diagnostics.Tools (4.3) - framework: >= net463
+    System.Globalization (4.3) - framework: >= net463
+    System.IO (4.3) - framework: >= net463
+    System.Linq (4.3) - framework: >= net463
+    System.Linq.Expressions (4.3) - framework: >= net463
+    System.Linq.Queryable (4.3) - framework: >= net463
+    System.Net.Requests (4.3) - framework: >= net463
+    System.Reflection (4.3) - framework: >= net463
+    System.Reflection.Extensions (4.3) - framework: >= net463
     System.Reflection.Metadata (1.4.1-beta-24430-01)
       System.Collections.Immutable (>= 1.2) - framework: >= net45
+    System.Resources.ResourceManager (4.3) - framework: >= net463
+    System.Runtime (4.3)
+    System.Runtime.Extensions (4.3) - framework: >= net463
+    System.Runtime.InteropServices (4.3)
+      System.Runtime (>= 4.3) - framework: >= net462
+    System.Runtime.Numerics (4.3) - framework: >= net463
+    System.Runtime.Serialization.Json (4.3) - framework: >= net463
+    System.Text.RegularExpressions (4.3) - framework: >= net463
+    System.Threading (4.3) - framework: >= net463
+    System.Threading.Tasks (4.3) - framework: >= net463
+    System.Threading.Tasks.Parallel (4.3) - framework: >= net463
+    System.Threading.Thread (4.3) - framework: >= net463
+    System.Threading.ThreadPool (4.3) - framework: >= net463
+    System.Threading.Timer (4.3) - framework: >= net463
 
 GROUP Build
 NUGET

diff --git a/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj b/src/FSharp.Editing.VisualStudio.v2015/FSharp.Editing.VisualStudio.v2015.fsproj
@@ -93,13 +93,13 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="FSharp.Compiler.Service.MSBuild.v12">
-          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
+        <Reference Include="FSharp.Compiler.Service">
+          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="FSharp.Compiler.Service">
-          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll</HintPath>
+        <Reference Include="FSharp.Compiler.Service.MSBuild.v12">
+          <HintPath>..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -131,16 +131,6 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="FsXaml.Wpf.TypeProvider">
-          <HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-        <Reference Include="FsXaml.Wpf">
-          <HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
         <Reference Include="PresentationFramework">
           <Paket>True</Paket>
         </Reference>
@@ -156,6 +146,16 @@
         <Reference Include="WindowsBase">
           <Paket>True</Paket>
         </Reference>
+        <Reference Include="FsXaml.Wpf">
+          <HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+        <Reference Include="FsXaml.Wpf.TypeProvider">
+          <HintPath>..\..\packages\FsXaml.Wpf\lib\net45\FsXaml.Wpf.TypeProvider.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
       </ItemGroup>
     </When>
   </Choose>