Skip to content

Commit 9c80416

Browse files
dsymedsyme
committedOct 29, 2015
Update paket and fix 33
1 parent 0aa00be commit 9c80416

8 files changed

+74
-73
lines changed
 

‎RELEASE_NOTES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#### 0.90.13 - 29.10.2015
2+
* Fix problem https://github.com/fslaborg/FSharp.Charting/issues/33
3+
14
#### 0.90.12 - 07.07.2015
25
* Fix problem with Gtk by removing use of Gtk nuget package
36

‎docs/content/LiveChartSamples.fsx

+13-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*Summary:* This example shows a collection of LiveCharts, which update as data changes.
77
88
The input data comes from `IObservable` (or `IEvent`) sources.
9-
The data can be created using Rx, F# Event combinators or F# Observable combinators.
9+
The data can be created using F# AsyncSeq, Rx, F# Event combinators or F# Observable combinators.
1010
1111
The samples are not yet individually documented.
1212
@@ -20,10 +20,12 @@ The `EventEx-0.1.fsx` file can be found
2020
#I "packages/FSharp.Charting"
2121
#load "FSharp.Charting.fsx"
2222
#load "EventEx-0.1.fsx"
23+
#r "../../packages/FSharp.Control.AsyncSeq/lib/net45/FSharp.Control.AsyncSeq.dll"
2324

24-
open FSharp.Charting
2525
open System
2626
open System.Drawing
27+
open FSharp.Charting
28+
open FSharp.Control
2729

2830
(**
2931
The following code generates sample data - both as a list of values
@@ -105,3 +107,12 @@ LiveChart.Line(evData2).WithTitle("A")
105107
LiveChart.Line(evData,Name="MouseMove")
106108

107109
LiveChart.Line(constantLiveTimeSeriesData)
110+
111+
asyncSeq {
112+
yield (1,10)
113+
for i in 0 .. 100 do
114+
do! Async.Sleep 100
115+
yield (i,i*i)
116+
}
117+
|> AsyncSeq.toObservable
118+
|> LiveChart.LineIncremental

‎paket.dependencies

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ nuget NUnit.Runners
66
nuget OxyPlot.GtkSharp 2014.1.546
77
nuget OxyPlot.Core 2014.1.546
88
nuget Nuget.CommandLine
9-
nuget FAKE
9+
nuget FAKE
10+
nuget FSharp.Control.AsyncSeq

‎paket.lock

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
NUGET
22
remote: https://nuget.org/api/v2
33
specs:
4-
FAKE (3.35.5)
5-
FSharp.Compiler.Service (0.0.90)
6-
FSharp.Formatting (2.9.10)
7-
FSharp.Compiler.Service (>= 0.0.87)
8-
FSharpVSPowerTools.Core (1.8.0)
9-
FSharpVSPowerTools.Core (1.8.0)
10-
FSharp.Compiler.Service (>= 0.0.87)
11-
NuGet.CommandLine (2.8.5)
4+
FAKE (4.7.2)
5+
FSharp.Compiler.Service (1.4.0.6)
6+
FSharp.Control.AsyncSeq (2.0.2)
7+
FSharp.Formatting (2.12.0)
8+
FSharp.Compiler.Service (1.4.0.6)
9+
FSharpVSPowerTools.Core (2.1.0)
10+
FSharpVSPowerTools.Core (2.1.0)
11+
FSharp.Compiler.Service (>= 1.4.0.6)
12+
NuGet.CommandLine (2.8.6)
1213
NUnit (2.6.4)
1314
NUnit.Runners (2.6.4)
1415
OxyPlot.Core (2014.1.546)

‎src/FSharp.Charting.Gtk.fs

+15-12
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ namespace FSharp.Charting
765765
/// <param name="XTitle">The title of the X-axis.</param>
766766
/// <param name="YTitle">The title of the Y-axis.</param>
767767
static member Area(data:seq<('key :> key) * #value>,?Name,?Title,?Labels, ?Color,?XTitle,?YTitle) =
768-
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((k,v),labelOpt) -> AreaChartItem(k, v)), AreaSeries(DataFieldX="X",DataFieldY="Y",Fill=AreaSeries().ActualColor))
768+
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((k,v),_labelOpt) -> AreaChartItem(k, v)), AreaSeries(DataFieldX="X",DataFieldY="Y",Fill=AreaSeries().ActualColor))
769769
|> Helpers.ApplyStaticAxis(typeof<'key>, Axes.AxisPosition.Bottom)
770770
|> Helpers.ApplyStyles(?Name=Name,?Title=Title,?Color=Color,?AxisXTitle=XTitle,?AxisYTitle=YTitle)
771771

@@ -789,7 +789,7 @@ namespace FSharp.Charting
789789
/// <param name="XTitle">The title of the X-axis.</param>
790790
/// <param name="YTitle">The title of the Y-axis.</param>
791791
static member Bar(data:seq<('key :> key)*#value>,?Name,?Title,?Labels, ?Color,?XTitle,?YTitle) =
792-
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((k,v),labelOpt) -> BarItem(valueToDouble v)), BarSeries(ValueField="Value"))
792+
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((_k,v),_labelOpt) -> BarItem(valueToDouble v)), BarSeries(ValueField="Value"))
793793
|> Helpers.ApplyStaticAxis(typeof<'key>, Axes.AxisPosition.Left)
794794
|> Helpers.ApplyStyles(?Name=Name,?Title=Title,?Color=Color,?AxisXTitle=XTitle,?AxisYTitle=YTitle)
795795

@@ -934,7 +934,7 @@ namespace FSharp.Charting
934934
let gap = match ColumnWidth with
935935
| Some columnWidth -> Some (1.0 - columnWidth)
936936
| _ -> None
937-
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((k,v),labelOpt) -> ColumnItem(valueToDouble v)), ColumnSeries(ValueField="Value"))
937+
GenericChart.Create(data |> listen |> mergeLabels Labels |> makeItems (fun ((_k,v),_labelOpt) -> ColumnItem(valueToDouble v)), ColumnSeries(ValueField="Value"))
938938
|> Helpers.ApplyStaticAxis(typeof<'key>, Axes.AxisPosition.Bottom, ?gap = gap)
939939
|> Helpers.ApplyStyles(?Name=Name,?Title=Title,?Color=Color,?AxisXTitle=XTitle,?AxisYTitle=YTitle)
940940

@@ -963,15 +963,18 @@ namespace FSharp.Charting
963963
/// <param name="Intervals">The number of intervals in the histogram.</param>
964964
static member Histogram(data:seq<#value>,?Name,?Title,?Color,?XTitle,?YTitle, ?LowerBound, ?UpperBound, ?Intervals) =
965965
let data' = data |> Seq.map valueToDouble
966-
let lowerBound = match LowerBound with
967-
| Some lowerBound -> lowerBound
968-
| _ -> Seq.min data
969-
let upperBound = match UpperBound with
970-
| Some upperBound -> upperBound
971-
| _ -> Seq.max data
972-
let intervals = match Intervals with
973-
| Some intervals -> intervals
974-
| _ -> 30. // corresponds to what ggplot does
966+
let lowerBound =
967+
match LowerBound with
968+
| Some lowerBound -> lowerBound
969+
| _ -> Seq.min data'
970+
let upperBound =
971+
match UpperBound with
972+
| Some upperBound -> upperBound
973+
| _ -> Seq.max data'
974+
let intervals =
975+
match Intervals with
976+
| Some intervals -> intervals
977+
| _ -> 30. // corresponds to what ggplot does
975978
let bins = binData data' lowerBound upperBound intervals
976979
let data'' = bins |> Seq.map (fun b -> ( sprintf "%.2f" b.LowerBound), b.Count)
977980
Chart.Column(data'',?Name=Name,?Title=Title,?Color=Color,?XTitle=XTitle,?YTitle=YTitle, ?ColumnWidth=Some 0.95)

‎src/FSharp.Charting.Gtk.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</Target>
111111
<Import Project="..\.paket\paket.targets" />
112112
<Choose>
113-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v5.0')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkProfile) == 'Profile3') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile18') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile23') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile36') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile41') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile46') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile88') Or ($(TargetFrameworkProfile) == 'Profile96') Or ($(TargetFrameworkProfile) == 'Profile104') Or ($(TargetFrameworkProfile) == 'Profile143') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile154') Or ($(TargetFrameworkProfile) == 'Profile158')">
113+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v5.0')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile3') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile18') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile23') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile36') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile41') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile46') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile88') Or ($(TargetFrameworkProfile) == 'Profile96') Or ($(TargetFrameworkProfile) == 'Profile104') Or ($(TargetFrameworkProfile) == 'Profile143') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile154') Or ($(TargetFrameworkProfile) == 'Profile158')">
114114
<ItemGroup>
115115
<Reference Include="OxyPlot">
116116
<HintPath>..\packages\OxyPlot.Core\lib\portable-net4+sl4+wp71+win8\OxyPlot.dll</HintPath>
@@ -121,7 +121,7 @@
121121
</When>
122122
</Choose>
123123
<Choose>
124-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
124+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
125125
<ItemGroup>
126126
<Reference Include="OxyPlot.GtkSharp">
127127
<HintPath>..\packages\OxyPlot.GtkSharp\lib\net40\OxyPlot.GtkSharp.dll</HintPath>
@@ -131,4 +131,4 @@
131131
</ItemGroup>
132132
</When>
133133
</Choose>
134-
</Project>
134+
</Project>

‎src/FSharp.Charting.fs

+26-39
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,10 @@ namespace FSharp.Charting
3131
open System.Drawing
3232
open System.Reflection
3333
open System.Runtime.InteropServices
34-
#if WEB
35-
open System.Web.UI
36-
open System.Web.UI.DataVisualization
37-
open System.Web.UI.DataVisualization.Charting
38-
#else
34+
open System.Threading
3935
open System.Windows.Forms
4036
open System.Windows.Forms.DataVisualization
4137
open System.Windows.Forms.DataVisualization.Charting
42-
#endif
4338

4439
module private ClipboardMetafileHelper =
4540
[<DllImport("user32.dll")>]
@@ -222,16 +217,27 @@ namespace FSharp.Charting
222217
curr := elems; ev.Trigger(curr,evArgs)
223218
coll, update
224219

220+
type IObservable<'T> with
221+
member source.ObserveOn(ctxt: SynchronizationContext) =
222+
{ new IObservable<_> with
223+
member x.Subscribe(observer) =
224+
source.Subscribe
225+
({ new IObserver<_> with
226+
member x.OnNext(v) = ctxt.Post(SendOrPostCallback(fun _ -> observer.OnNext(v)), null)
227+
member x.OnCompleted() = ctxt.Post(SendOrPostCallback(fun _ -> observer.OnCompleted()),null)
228+
member x.OnError(e) = ctxt.Post(SendOrPostCallback(fun _ -> observer.OnError(e)),null) }) }
229+
230+
225231
// TODO: only start on connect + proper replay + disconnect, OR use weak connection to source
226232
let ofObservableIncremental (source:IObservable<'T>) : INotifyEnumerableInternal<'T> =
227233
let obs = new ObservableCollection<'T>()
228-
source |> Observable.add (fun x -> obs.Add(x))
234+
source.ObserveOn(SynchronizationContext.Current) |> Observable.add (fun x -> obs.Add(x))
229235
ofObservableCollection obs
230236

231237
// TODO: only start on connect + proper replay + disconnect, OR use weak connection to source
232238
let ofObservableReplacing (source:IObservable<#seq<'T>>) : INotifyEnumerableInternal<'T> =
233239
let coll, update = replacing ()
234-
source |> Observable.add (fun elems -> update (Seq.toArray elems))
240+
source.ObserveOn(SynchronizationContext.Current) |> Observable.add (fun elems -> update (Seq.toArray elems))
235241
coll
236242

237243

@@ -771,10 +777,7 @@ namespace FSharp.Charting
771777
typeof<Charting.TickMark>
772778
typeof<Charting.ElementPosition>;
773779
typeof<Charting.AxisScaleView>;
774-
#if WEB
775-
#else
776780
typeof<Charting.AxisScrollBar>;
777-
#endif
778781
]
779782

780783
let internal typesToCopy = [ typeof<Font>; typeof<String> ]
@@ -1223,8 +1226,6 @@ namespace FSharp.Charting
12231226
ms.Seek(0L, IO.SeekOrigin.Begin) |> ignore
12241227
Bitmap.FromStream ms
12251228

1226-
#if WEB
1227-
#else
12281229
/// Copy the contents of the chart to the clipboard
12291230
member public x.CopyChartToClipboard() =
12301231
Clipboard.SetImage(x.CopyAsBitmap())
@@ -1236,7 +1237,6 @@ namespace FSharp.Charting
12361237
ms.Seek(0L, IO.SeekOrigin.Begin) |> ignore
12371238
use emf = new System.Drawing.Imaging.Metafile(ms)
12381239
ClipboardMetafileHelper.PutEnhMetafileOnClipboard(control.Handle, emf) |> ignore
1239-
#endif
12401240

12411241
/// Save the chart as an image in the specified image format
12421242
member public x.SaveChartAs(filename : string, format : ChartImageFormat) =
@@ -1728,12 +1728,6 @@ namespace FSharp.Charting
17281728

17291729
member x.Charts = charts
17301730

1731-
#if WEB
1732-
type internal Orientation =
1733-
| Horizontal = 0
1734-
| Vertical = 1
1735-
#endif
1736-
17371731
type internal SubplotChart(charts:GenericChart list, orientation:Orientation) =
17381732
inherit GenericChart(enum<SeriesChartType> -1)
17391733
let r = 1.0 / (charts |> Seq.length |> float)
@@ -2012,14 +2006,9 @@ namespace FSharp.Charting
20122006
let (dl,dt,dr,db) = computeExtraDefaultMargins (0,0,0,0) srcChart
20132007
layoutSubCharts srcChart (0.0f + float32 dl, 0.0f + float32 dt, 100.0f - float32 dr, 100.0f - float32 db)
20142008
srcChart.TryChart |> Option.iter (applyProperties chart)
2015-
#if WEB
2016-
#else
20172009
chart.Dock <- DockStyle.Fill
2018-
#endif
20192010
srcChart.Chart <- chart
20202011

2021-
#if WEB
2022-
#else
20232012
let props = new PropertyGrid(Width = 250, Dock = DockStyle.Right, SelectedObject = chart, Visible = false)
20242013

20252014
do
@@ -2061,8 +2050,6 @@ namespace FSharp.Charting
20612050
menu.MenuItems.AddRange [| miCopy; miCopyEmf; miSave; miEdit |]
20622051
self.ContextMenu <- menu
20632052

2064-
#endif
2065-
20662053
open ChartTypes
20672054

20682055
type private Helpers() =
@@ -2564,15 +2551,18 @@ namespace FSharp.Charting
25642551
/// <param name="Intervals">The number of intervals in the histogram.</param>
25652552
static member Histogram(data:seq<#value>,?Name,?Title,?Color,?XTitle,?YTitle, ?LowerBound, ?UpperBound, ?Intervals) =
25662553
let data' = data |> Seq.map valueToDouble
2567-
let lowerBound = match LowerBound with
2568-
| Some lowerBound -> lowerBound
2569-
| _ -> Seq.min data
2570-
let upperBound = match UpperBound with
2571-
| Some upperBound -> upperBound
2572-
| _ -> Seq.max data
2573-
let intervals = match Intervals with
2574-
| Some intervals -> intervals
2575-
| _ -> 30. // corresponds to what ggplot does
2554+
let lowerBound =
2555+
match LowerBound with
2556+
| Some lowerBound -> lowerBound
2557+
| _ -> Seq.min data'
2558+
let upperBound =
2559+
match UpperBound with
2560+
| Some upperBound -> upperBound
2561+
| _ -> Seq.max data'
2562+
let intervals =
2563+
match Intervals with
2564+
| Some intervals -> intervals
2565+
| _ -> 30. // corresponds to what ggplot does
25762566
let bins = binData data' lowerBound upperBound intervals
25772567
let data'' = bins |> Seq.map (fun b -> ( sprintf "%.2f" b.LowerBound), b.Count)
25782568
Chart.Column(data'',?Name=Name,?Title=Title,?Color=Color,?XTitle=XTitle,?YTitle=YTitle,?ColumnWidth=Some 0.95)
@@ -3953,8 +3943,6 @@ namespace FSharp.Charting
39533943
and set(v) = x.SetCustomProperty<EmptyPointValue>("EmptyPointValue", v)
39543944
*)
39553945

3956-
#if WEB
3957-
#else
39583946
/// Display the chart in a new ChartControl in a new Form()
39593947
member ch.ShowChart () =
39603948
let frm = new Form(Visible = true, TopMost = true, Width = 700, Height = 500)
@@ -3964,7 +3952,6 @@ namespace FSharp.Charting
39643952
frm.Show()
39653953
ctl.Focus() |> ignore
39663954
frm
3967-
#endif
39683955

39693956
[<Obsolete("This type is now obsolete. Use the '.WithXYZ(...)' fluent methods or the 'Chart.WithXYZ(...)' pipeline methods instead.")>]
39703957
type AreaProperties() =

‎src/FSharp.Charting.fsproj

+3-8
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</Target>
8787
<Import Project="..\.paket\paket.targets" />
8888
<Choose>
89-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v5.0')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkProfile) == 'Profile3') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile18') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile23') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile36') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile41') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile46') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile88') Or ($(TargetFrameworkProfile) == 'Profile96') Or ($(TargetFrameworkProfile) == 'Profile104') Or ($(TargetFrameworkProfile) == 'Profile143') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile154') Or ($(TargetFrameworkProfile) == 'Profile158')">
89+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'Silverlight' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v5.0')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile3') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile18') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile23') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile36') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile41') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile46') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile88') Or ($(TargetFrameworkProfile) == 'Profile96') Or ($(TargetFrameworkProfile) == 'Profile104') Or ($(TargetFrameworkProfile) == 'Profile143') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile154') Or ($(TargetFrameworkProfile) == 'Profile158')">
9090
<ItemGroup>
9191
<Reference Include="OxyPlot">
9292
<HintPath>..\packages\OxyPlot.Core\lib\portable-net4+sl4+wp71+win8\OxyPlot.dll</HintPath>
@@ -97,15 +97,10 @@
9797
</When>
9898
</Choose>
9999
<Choose>
100-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
100+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
101101
<ItemGroup>
102102
<Reference Include="OxyPlot.GtkSharp">
103-
<HintPath>..\packages\OxyPlot.GtkSharp\lib\NET40\OxyPlot.GtkSharp.dll</HintPath>
104-
<Private>True</Private>
105-
<Paket>True</Paket>
106-
</Reference>
107-
<Reference Include="OxyPlot">
108-
<HintPath>..\packages\OxyPlot.GtkSharp\lib\NET40\OxyPlot.dll</HintPath>
103+
<HintPath>..\packages\OxyPlot.GtkSharp\lib\net40\OxyPlot.GtkSharp.dll</HintPath>
109104
<Private>True</Private>
110105
<Paket>True</Paket>
111106
</Reference>

0 commit comments

Comments
 (0)
Please sign in to comment.