Skip to content

Commit 9355c21

Browse files
muehlmuehl
muehl
authored and
muehl
committed
Bump version to 1.0.3
1 parent 2efdf50 commit 9355c21

File tree

9 files changed

+727
-203
lines changed

9 files changed

+727
-203
lines changed

‎paket.lock

Lines changed: 642 additions & 154 deletions
Large diffs are not rendered by default.

‎src/FSharp.Plotly.WPF/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Plotly.WPF")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Plotly")>]
77
[<assembly: AssemblyDescriptionAttribute("A F# interactive charting library using plotly.js")>]
8-
[<assembly: AssemblyVersionAttribute("1.0.2")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.0.2")>]
8+
[<assembly: AssemblyVersionAttribute("1.0.3")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.0.3")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Plotly.WPF"
1414
let [<Literal>] AssemblyProduct = "FSharp.Plotly"
1515
let [<Literal>] AssemblyDescription = "A F# interactive charting library using plotly.js"
16-
let [<Literal>] AssemblyVersion = "1.0.2"
17-
let [<Literal>] AssemblyFileVersion = "1.0.2"
16+
let [<Literal>] AssemblyVersion = "1.0.3"
17+
let [<Literal>] AssemblyFileVersion = "1.0.3"

‎src/FSharp.Plotly/App.config

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,11 @@
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
55
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<Paket>True</Paket>
10-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11-
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
12-
<bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
13-
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
14-
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
15-
<bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
16-
<bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
17-
<bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
18-
<bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
19-
<bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
20-
<bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
21-
<bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
22-
<bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
23-
<bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
24-
</dependentAssembly>
25-
</assemblyBinding>
26-
</runtime>
27-
</configuration>
6+
7+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<Paket>True</Paket>
10+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
12+
</dependentAssembly>
13+
</assemblyBinding></runtime></configuration>

‎src/FSharp.Plotly/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ open System.Reflection
55
[<assembly: AssemblyTitleAttribute("FSharp.Plotly")>]
66
[<assembly: AssemblyProductAttribute("FSharp.Plotly")>]
77
[<assembly: AssemblyDescriptionAttribute("A F# interactive charting library using plotly.js")>]
8-
[<assembly: AssemblyVersionAttribute("1.0.2")>]
9-
[<assembly: AssemblyFileVersionAttribute("1.0.2")>]
8+
[<assembly: AssemblyVersionAttribute("1.0.3")>]
9+
[<assembly: AssemblyFileVersionAttribute("1.0.3")>]
1010
do ()
1111

1212
module internal AssemblyVersionInformation =
1313
let [<Literal>] AssemblyTitle = "FSharp.Plotly"
1414
let [<Literal>] AssemblyProduct = "FSharp.Plotly"
1515
let [<Literal>] AssemblyDescription = "A F# interactive charting library using plotly.js"
16-
let [<Literal>] AssemblyVersion = "1.0.2"
17-
let [<Literal>] AssemblyFileVersion = "1.0.2"
16+
let [<Literal>] AssemblyVersion = "1.0.3"
17+
let [<Literal>] AssemblyFileVersion = "1.0.3"

‎src/FSharp.Plotly/FSharp.Plotly.fsproj

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@
9595
</ItemGroup>
9696
<ItemGroup>
9797
<Reference Include="mscorlib" />
98-
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
99-
<Private>True</Private>
100-
</Reference>
10198
<Reference Include="System" />
10299
<Reference Include="System.Core" />
103100
<Reference Include="System.Numerics" />
@@ -107,7 +104,7 @@
107104
xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
108105
</PropertyGroup>
109106
<Choose>
110-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
107+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
111108
<ItemGroup>
112109
<Reference Include="FSharp.Core">
113110
<HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
@@ -238,7 +235,7 @@ xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
238235
</Reference>
239236
</ItemGroup>
240237
</When>
241-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
238+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v5.0')">
242239
<ItemGroup>
243240
<Reference Include="Newtonsoft.Json">
244241
<HintPath>..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -274,7 +271,7 @@ xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
274271
</Reference>
275272
</ItemGroup>
276273
</When>
277-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v2.2' Or $(TargetFrameworkVersion) == 'v2.3' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.1' Or $(TargetFrameworkVersion) == 'v4.2' Or $(TargetFrameworkVersion) == 'v4.3' Or $(TargetFrameworkVersion) == 'v4.4' Or $(TargetFrameworkVersion) == 'v4.4W' Or $(TargetFrameworkVersion) == 'v5.0' Or $(TargetFrameworkVersion) == 'v5.1' Or $(TargetFrameworkVersion) == 'v6.0')) Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
274+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v2.2' Or $(TargetFrameworkVersion) == 'v2.3' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.1' Or $(TargetFrameworkVersion) == 'v4.2' Or $(TargetFrameworkVersion) == 'v4.3' Or $(TargetFrameworkVersion) == 'v4.4' Or $(TargetFrameworkVersion) == 'v5.0' Or $(TargetFrameworkVersion) == 'v5.1' Or $(TargetFrameworkVersion) == 'v6.0')) Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
278275
<ItemGroup>
279276
<Reference Include="Newtonsoft.Json">
280277
<HintPath>..\..\packages\Newtonsoft.Json\lib\portable-net45+win8+wp8+wpa81\Newtonsoft.Json.dll</HintPath>
@@ -1492,7 +1489,16 @@ xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
14921489
</When>
14931490
</Choose>
14941491
<Choose>
1495-
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1'))">
1492+
<When Condition="$(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v2.0'">
1493+
<ItemGroup>
1494+
<Reference Include="System.Security.Cryptography.OpenSsl">
1495+
<HintPath>..\..\packages\System.Security.Cryptography.OpenSsl\ref\netcoreapp2.0\System.Security.Cryptography.OpenSsl.dll</HintPath>
1496+
<Private>False</Private>
1497+
<Paket>True</Paket>
1498+
</Reference>
1499+
</ItemGroup>
1500+
</When>
1501+
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1'))">
14961502
<ItemGroup>
14971503
<Reference Include="System.Security.Cryptography.OpenSsl">
14981504
<HintPath>..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll</HintPath>
@@ -1501,7 +1507,7 @@ xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
15011507
</Reference>
15021508
</ItemGroup>
15031509
</When>
1504-
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0'))">
1510+
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.6') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1'))">
15051511
<ItemGroup>
15061512
<Reference Include="System.Security.Cryptography.OpenSsl">
15071513
<HintPath>..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll</HintPath>
@@ -1510,6 +1516,24 @@ xcopy /Y "$(TargetDir)*.xml" "$(SolutionDir)bin\"</PostBuildEvent>
15101516
</Reference>
15111517
</ItemGroup>
15121518
</When>
1519+
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0') Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v2.0')">
1520+
<ItemGroup>
1521+
<Reference Include="System.Security.Cryptography.OpenSsl">
1522+
<HintPath>..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard2.0\System.Security.Cryptography.OpenSsl.dll</HintPath>
1523+
<Private>True</Private>
1524+
<Paket>True</Paket>
1525+
</Reference>
1526+
</ItemGroup>
1527+
</When>
1528+
<When Condition="$(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v2.0'">
1529+
<ItemGroup>
1530+
<Reference Include="System.Security.Cryptography.OpenSsl">
1531+
<HintPath>..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard2.0\System.Security.Cryptography.OpenSsl.dll</HintPath>
1532+
<Private>False</Private>
1533+
<Paket>True</Paket>
1534+
</Reference>
1535+
</ItemGroup>
1536+
</When>
15131537
</Choose>
15141538
<Choose>
15151539
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1'))">

‎src/FSharp.Plotly/paket.template

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ summary
2121
A F# interactive charting library using plotly.js
2222
description
2323
A F# interactive charting library using plotly.js
24-
files
25-
../../bin/FSharp.Care.dll ==> lib/net40
24+
files
2625
../../bin/Newtonsoft.Json.dll ==> lib/net40
2726

‎tests/FSharp.Plotly.Tests/App.config

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33

4+
<startup>
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
6+
</startup>
47
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
58
<dependentAssembly>
69
<Paket>True</Paket>
710
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
811
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
912
</dependentAssembly>
10-
</assemblyBinding></runtime></configuration>
13+
</assemblyBinding></runtime></configuration>

0 commit comments

Comments
 (0)