Permalink
Browse files

Merge pull request #66 from ovatsus/master

Fix StructuredJSON type provider
  • Loading branch information...
2 parents ed28663 + 0b27596 commit 74d8db1833bb3b751861287d80d1e517957194ac @forki forki committed May 27, 2012
Showing with 1 addition and 8 deletions.
  1. +1 −5 build.fsx
  2. +0 −3 tests/FSharpx.TypeProviders.Tests/FSharpx.TypeProviders.Tests.fsproj
View
@@ -33,10 +33,6 @@ let nugetDocsDir package = nugetDir package @@ "docs"
let packages = ["Core"; "Http"; "Observable"; "TypeProviders"]
-let nugetDirHttp = "./nuget/Http/"
-let nugetLibDirHttp = nugetDirHttp @@ "lib"
-let nugetDocsDirHttp = nugetDirHttp @@ "docs"
-
let projectDesc = "FSharpx is a library for the .NET platform implementing general functional constructs on top of the F# core library. Its main target is F# but it aims to be compatible with all .NET languages wherever possible."
let rec getPackageDesc = function
@@ -215,7 +211,7 @@ let nugetTarget = TargetTemplate (fun package ->
ToolPath = nugetPath
AccessKey = getBuildParamOrDefault "nugetkey" ""
Dependencies =
- if package = "Core" || package = "TypeProviders" then p.Dependencies else
+ if package = "Core" then p.Dependencies else
[projectName + ".Core", RequireExactly (NormalizeVersion version)]
Publish = hasBuildParam "nugetkey" && package <> "TypeProviders" })
"FSharpx.Core.nuspec"
@@ -106,9 +106,6 @@
<HintPath>..\..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="nunit.framework, Version=2.6.0.12054, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
- <Private>True</Private>
- </Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />

0 comments on commit 74d8db1

Please sign in to comment.