Skip to content

Commit

Permalink
temporary fix for #1601 by using private fork of FSharp.Data
Browse files Browse the repository at this point in the history
  • Loading branch information
haraldsteinlechner committed Apr 12, 2016
1 parent 4e4d643 commit acaafda
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ nuget FSharp.Core redirects: force
nuget Chessie

github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
github fsharp/FSharp.Data src/CommonProviderImplementation/AssemblyReader.fs
github haraldsteinlechner/FSharp.Data src/CommonProviderImplementation/AssemblyReader.fs

group Build

Expand Down
6 changes: 3 additions & 3 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ GITHUB
remote: fsharp/FAKE
specs:
src/app/FakeLib/Globbing/Globbing.fs (59dfade480c5f9107107f11af366aaae1f4a9157)
remote: fsharp/FSharp.Data
remote: haraldsteinlechner/FSharp.Data
specs:
src/CommonProviderImplementation/AssemblyReader.fs (f815de5e8108bb7de25dde75135707719afd8e09)
src/CommonProviderImplementation/AssemblyReader.fs (d4a30757dc5e5ef7096fffafc1ed377b6174771b)
GROUP Build
NUGET
remote: https://www.nuget.org/api/v2
Expand All @@ -32,7 +32,7 @@ NUGET
Microsoft.Bcl (>= 1.1.10)
Microsoft.Bcl.Build (>= 1.0.14)
Octokit (0.19)
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
Microsoft.Net.Http
GITHUB
remote: fsharp/FAKE
specs:
Expand Down
4 changes: 2 additions & 2 deletions src/Paket.Core/Paket.Core.fsproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -74,7 +74,7 @@
-->
<Import Project="$(SolutionDir)\.paket\paket.targets" />
<ItemGroup>
<Compile Include="..\..\paket-files\fsharp\FSharp.Data\src\CommonProviderImplementation\AssemblyReader.fs">
<Compile Include="..\..\paket-files\haraldsteinlechner\FSharp.Data\src\CommonProviderImplementation\AssemblyReader.fs">
<Paket>True</Paket>
<Link>AssemblyReader.fs</Link>
</Compile>
Expand Down

0 comments on commit acaafda

Please sign in to comment.