Skip to content
This repository has been archived by the owner on Oct 31, 2021. It is now read-only.

Commit

Permalink
changes to get solution to compile with FCS 10
Browse files Browse the repository at this point in the history
notes:

* I've fixed framework >= net40 in paket, this pulls less things and keep project files tidier
* new FCS made IsResultObsolete internal, it was used once but oddly we don't seem to use the callback we are giving there anywhere else
* call to ParseAndCheckFileInProject changed, I haven't checked what was the null parameter we were passing, using explicit parameter names for this call now
  • Loading branch information
smoothdeveloper committed Feb 11, 2017
1 parent 64b4070 commit 46313b5
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 3,005 deletions.
6 changes: 3 additions & 3 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source http://nuget.org/api/v2
redirects: on
strategy: max

framework >= net40
nuget Fantomas
nuget FSharp.Compiler.Service
nuget FSharp.Core
Expand Down Expand Up @@ -42,7 +42,7 @@ group vssdk

group Test
source http://nuget.org/api/v2

framework >= net40
nuget Foq
nuget FsCheck
nuget FSharp.Compiler.Service.ProjectCracker
Expand All @@ -51,7 +51,7 @@ group Test

group Build
source http://nuget.org/api/v2

framework >= net40
nuget canopy
nuget FAKE
nuget FSharp.Formatting
Expand Down
135 changes: 4 additions & 131 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
REDIRECTS: ON
STRATEGY: MAX
FRAMEWORK: >= NET40
NUGET
remote: http://www.nuget.org/api/v2
Fantomas (2.4)
FSharp.Compiler.Service (>= 8.0)
FParsec (1.0.2)
FSharp.Compiler.Service (8.0)
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.Core (4.0.0.1)
FSharp.Data (2.3.2)
Zlib.Portable (>= 1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
FSharp.Management (0.4.2)
FSharp.ViewModule.Core (1.0.5)
FSharp.Core
Expand All @@ -21,137 +21,10 @@ NUGET
FSharp.Compiler.Service.ProjectCracker (>= 8.0)
FsPickler (3.2)
FsXaml.Wpf (3.1.2)
Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10
Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10
runtime.native.System (4.0) - framework: >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1)
Microsoft.NETCore.Targets (>= 1.0.1)
runtime.native.System.IO.Compression (4.1) - framework: >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1)
Microsoft.NETCore.Targets (>= 1.0.1)
SourceLink.SymbolStore (0.5)
System.Collections (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Collections.Immutable (1.2)
System.Collections (>= 4.0.11) - framework: >= netstandard10
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10
System.Globalization (>= 4.0.11) - framework: >= netstandard10
System.Linq (>= 4.1) - framework: >= netstandard10
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10
System.Runtime (>= 4.1) - framework: >= netstandard10
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10
System.Threading (>= 4.0.11) - framework: >= netstandard10
System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Globalization (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.IO (4.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.IO.Compression (4.1) - framework: >= netstandard11
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13
runtime.native.System (>= 4.0) - framework: >= netstandard13
runtime.native.System.IO.Compression (>= 4.1) - framework: >= netstandard13
System.Collections (>= 4.0.11) - framework: >= netstandard13
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard13
System.IO (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard11, >= netstandard13
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard13
System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13
System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard11, >= netstandard13
System.Threading (>= 4.0.11) - framework: >= netstandard13
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, >= netstandard13
System.Linq (4.1) - framework: >= netstandard10
System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16
System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16
System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16
System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
System.Reflection (4.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Reflection.Extensions (4.0.1) - framework: >= netstandard11
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Reflection.Metadata (1.4.1-beta-24430-01)
System.Collections (>= 4.0.11) - framework: >= netstandard11
System.Collections.Immutable (>= 1.1.37) - framework: portable-net45+win8
System.Collections.Immutable (>= 1.2) - framework: >= net45, >= netstandard11, monoandroid, monotouch, xamarinios, xamarinmac, winv4.5, wpav8.1
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard11
System.IO (>= 4.1) - framework: >= netstandard11
System.IO.Compression (>= 4.1) - framework: >= netstandard11
System.Linq (>= 4.1) - framework: >= netstandard11
System.Reflection (>= 4.1) - framework: >= netstandard11
System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard11
System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard11
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard11
System.Runtime (>= 4.1) - framework: >= netstandard11
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard11
System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard11
System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard11
System.Threading (>= 4.0.11) - framework: >= netstandard11
System.Reflection.Primitives (4.0.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10
System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
System.Runtime (4.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
System.Runtime.Extensions (4.1) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
System.Runtime.Handles (4.0.1) - framework: >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13
System.Runtime (>= 4.1) - framework: >= netstandard13
System.Runtime.InteropServices (4.1) - framework: >= netstandard11
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15
System.Text.Encoding (4.0.11) - framework: >= netstandard10
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Text.Encoding.Extensions (4.0.11) - framework: >= netstandard11
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
System.Threading (4.0.11) - framework: >= netstandard10
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
System.Threading.Tasks (4.0.11) - framework: netstandard10, >= netstandard13
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
Zlib.Portable (1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81
System.Collections.Immutable (>= 1.2) - framework: >= net45

GROUP Build
NUGET
Expand Down Expand Up @@ -181,7 +54,7 @@ NUGET
GITHUB
remote: fsharp/FAKE
modules/Octokit/Octokit.fsx (4e4428bfe931a5f720e32f9d69289d25eb16d467)
Octokit (>= 0.20)
Octokit
GROUP Test
NUGET
remote: http://www.nuget.org/api/v2
Expand Down
Loading

0 comments on commit 46313b5

Please sign in to comment.