Fix link to dll in FSharp projects

mbrit · Apr 3, 2012 · 7b44b94 · 7b44b94
1 parent b8192cf
commit 7b44b94
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/Raven.Client.Lightweight.FSharp/packages.config b/Raven.Client.Lightweight.FSharp/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FsLinqFixed" version="2.1.1" />
-  <package id="Newtonsoft.Json" version="4.0.5" />
   <package id="Newtonsoft.Json" version="4.0.8" />
 </packages>
diff --git a/Raven.Tests.FSharp/Raven.Tests.FSharp.fsproj b/Raven.Tests.FSharp/Raven.Tests.FSharp.fsproj
@@ -53,6 +53,7 @@
     <Reference Include="FSharp.Core" />
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Raven.Tests.FSharp/packages.config b/Raven.Tests.FSharp/packages.config
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="1.9.0.1566" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="4.0.8" />
+  <package id="xunit" version="1.9.0.1566" />
 </packages>
diff --git a/Samples/Raven.Sample.FSharp/Raven.Sample.FSharp.fsproj b/Samples/Raven.Sample.FSharp/Raven.Sample.FSharp.fsproj
@@ -34,20 +34,22 @@
     <PlatformTarget>x86</PlatformTarget>
     <DocumentationFile>bin\Release\Raven.Sample.FSharp.XML</DocumentationFile>
   </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')" />
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\SharedLibs\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.fs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\Raven.Client.Lightweight.FSharp\Raven.Client.Lightweight.FSharp.fsproj">
       <Name>Raven.Client.Lightweight.FSharp</Name>
       <Project>{6996133d-ee21-4cc8-b29b-f6222ee476bb}</Project>
@@ -59,8 +61,6 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <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')" />
   <!-- 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">

diff --git a/packages/repositories.config b/packages/repositories.config
@@ -32,5 +32,6 @@
   <repository path="..\Raven.Tryouts\packages.config" />
   <repository path="..\Raven.Web\packages.config" />
   <repository path="..\Samples\Raven.Sample.EventSourcing\packages.config" />
+  <repository path="..\Samples\Raven.Sample.FSharp\packages.config" />
   <repository path="..\Samples\Raven.Samples.IndexReplication\packages.config" />
 </repositories>