Skip to content

Commit

Permalink
Replaced FSharpx bin with NuGet package
Browse files Browse the repository at this point in the history
  • Loading branch information
mausch committed Jun 28, 2012
1 parent edb753e commit b84c6b3
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 2,128 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -2,4 +2,5 @@
*.user
*/bin/*
*/obj/*
_ReSharper.*
_ReSharper.*
packages/*
4 changes: 3 additions & 1 deletion Figment.Tests/Figment.Tests.fsproj
Expand Up @@ -40,10 +40,12 @@
</None>
<Compile Include="ExtensionsTests.fs" />
<Compile Include="ResultTests.fs" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="FSharpx.Core">
<HintPath>..\lib\FSharpx.Core.dll</HintPath>
<HintPath>..\packages\FSharpx.Core.1.6.4\lib\40\Fsharpx.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core" />
Expand Down
4 changes: 4 additions & 0 deletions Figment.Tests/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharpx.Core" version="1.6.4" targetFramework="net40" />
</packages>
6 changes: 4 additions & 2 deletions Figment/Figment.fsproj
Expand Up @@ -33,6 +33,7 @@
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildBinPath)\Microsoft.Build.Tasks.v4.0.dll')" />
<Import Project="../.nuget/BuildMagic.targets" />
<ItemGroup>
<Compile Include="Extensions.fs" />
<Compile Include="Helpers.fs" />
Expand All @@ -45,10 +46,12 @@
<Compile Include="Testing.fs" />
<Compile Include="Server.fs" />
<EmbeddedResource Include="web.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="FSharpx.Core">
<HintPath>..\lib\FSharpx.Core.dll</HintPath>
<HintPath>..\packages\FSharpx.Core.1.6.4\lib\40\Fsharpx.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core" />
Expand All @@ -62,7 +65,6 @@
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml" />
</ItemGroup>
<Import Project="../.nuget/BuildMagic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
4 changes: 4 additions & 0 deletions Figment/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharpx.Core" version="1.6.4" targetFramework="net40" />
</packages>

0 comments on commit b84c6b3

Please sign in to comment.