Skip to content

Commit 10a26f7

Browse files
author
Timo Mühlhaus
committed
Fix dependancy
1 parent 9df0d26 commit 10a26f7

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

src/FSharp.Plotly.WPF/FSharp.Plotly.WPF.fsproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
</Otherwise>
5050
</Choose>
5151
<Import Project="$(FSharpTargetsPath)" />
52+
<PropertyGroup>
53+
<PostBuildEvent>xcopy /Y "$(TargetDir)*.dll" "$(SolutionDir)bin\"
54+
xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
55+
</PropertyGroup>
5256
<ItemGroup>
5357
<Compile Include="AssemblyInfo.fs" />
5458
<Compile Include="ViewContainer.fs" />
@@ -62,7 +66,7 @@
6266
<Private>True</Private>
6367
</Reference>
6468
<Reference Include="Newtonsoft.Json">
65-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6670
<Private>True</Private>
6771
</Reference>
6872
<Reference Include="PresentationCore" />
@@ -73,18 +77,12 @@
7377
<Reference Include="System.Xaml" />
7478
<Reference Include="UIAutomationTypes" />
7579
<Reference Include="WindowsBase" />
76-
</ItemGroup>
77-
<ItemGroup>
7880
<ProjectReference Include="..\FSharp.Plotly\FSharp.Plotly.fsproj">
7981
<Name>FSharp.Plotly</Name>
8082
<Project>{8a8d5b08-bfd1-4953-8624-f1520a342232}</Project>
8183
<Private>True</Private>
8284
</ProjectReference>
8385
</ItemGroup>
84-
<PropertyGroup>
85-
<PostBuildEvent>xcopy /Y "$(TargetDir)*.dll" "$(SolutionDir)bin\"
86-
xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
87-
</PropertyGroup>
8886
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8987
Other similar extension points exist, see Microsoft.Common.targets.
9088
<Target Name="BeforeBuild">

src/FSharp.Plotly.WPF/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
44
</packages>

src/FSharp.Plotly/FSharp.Plotly.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</Reference>
8484
<Reference Include="mscorlib" />
8585
<Reference Include="Newtonsoft.Json">
86-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
86+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System" />

src/FSharp.Plotly/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
44
</packages>

src/FSharp.Plotly/paket.references

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
FSharp.Core
1+
source https://nuget.org/api/v2
2+
3+
nuget FSharp.Core
4+
nuget Newtonsoft.Json

tests/FSharp.Plotly.Tests/FSharp.Plotly.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<ItemGroup>
7272
<Reference Include="mscorlib" />
7373
<Reference Include="Newtonsoft.Json">
74-
<HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
74+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="System" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
44
</packages>

0 commit comments

Comments
 (0)