Skip to content

Commit f9e1d91

Browse files
committed
Update references
1 parent a0254db commit f9e1d91

17 files changed

Lines changed: 509 additions & 130 deletions

File tree

FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj

Lines changed: 78 additions & 23 deletions
Large diffs are not rendered by default.

FSharpx.Extras.Tests/app.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
66
<dependentAssembly>
7+
<Paket>True</Paket>
78
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
89
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
910
</dependentAssembly>

paket.dependencies

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source https://nuget.org/api/v2
22

33
nuget FAKE
4-
nuget FsCheck @= 0.9.1.0 framework: >= net40
5-
nuget FSharp.Compiler.Service @= 0.0.59
6-
nuget FSharp.Control.AsyncSeq @= 1.15.0 framework: >= net40
7-
nuget FSharp.Formatting @= 2.4.25
8-
nuget FSharpx.Async @= 1.12.0 framework: >= net40
9-
nuget FSharpx.Collections @= 1.10.1
10-
nuget FsUnit @= 1.2.1.0 framework: >= net40
11-
nuget NUnit @= 2.6.2 framework: >= net40
12-
nuget NUnit.Runners @= 2.6.2 framework: >= net40
13-
nuget Microsoft.AspNet.Razor @= 2.0.30506.0
14-
nuget RazorEngine @= 3.3.0
15-
4+
nuget FsCheck
5+
nuget FSharp.Compiler.Service
6+
nuget FSharp.Control.AsyncSeq
7+
nuget FSharp.Formatting
8+
nuget FSharpx.Async
9+
nuget FSharpx.Collections
10+
nuget FsUnit
11+
nuget NUnit
12+
nuget NUnit.Runners
13+
nuget Microsoft.AspNet.Razor
14+
nuget RazorEngine
15+
nuget FSharp.Core redirects:force

paket.lock

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
11
NUGET
2-
remote: https://nuget.org/api/v2
3-
specs:
4-
FAKE (4.11.0)
5-
FsCheck (0.9.1) - framework: >= net40
2+
remote: https://www.nuget.org/api/v2
3+
FAKE (4.11)
4+
FsCheck (2.6)
5+
FSharp.Core (>= 3.1.2.5)
66
FSharp.Compiler.Service (0.0.59)
7-
FSharp.Control.AsyncSeq (1.15.0) - framework: >= net40
8-
FSharp.Core (4.0.0.1)
7+
FSharp.Control.AsyncSeq (2.0.9)
8+
FSharp.Core (4.0.0.1) - redirects: force
99
FSharp.Formatting (2.4.25)
1010
FSharp.Compiler.Service (>= 0.0.59)
11-
Microsoft.AspNet.Razor (2.0.30506.0)
12-
RazorEngine (3.3.0)
13-
FSharpx.Async (1.12.0) - framework: >= net40
11+
Microsoft.AspNet.Razor (2.0.30506)
12+
RazorEngine (3.3)
13+
FSharpx.Async (1.12)
1414
FSharp.Control.AsyncSeq
1515
FSharpx.Collections (1.10.1)
1616
FSharp.Core (>= 3.1.2.1)
17-
FsUnit (1.2.1) - framework: >= net40
18-
NUnit (>= 2.6.2)
17+
FsUnit (2.3.1)
18+
FSharp.Core (>= 3.1.2.5)
19+
NUnit (3.4.1)
1920
Microsoft.AspNet.Razor (2.0.30506)
20-
NUnit (2.6.2) - framework: >= net40
21-
NUnit.Runners (2.6.2) - framework: >= net40
22-
RazorEngine (3.3.0)
23-
Microsoft.AspNet.Razor (>= 2.0.30506.0)
21+
NUnit (3.4.1)
22+
NUnit.ConsoleRunner (3.4.1)
23+
NUnit.Extension.NUnitProjectLoader (3.4.1)
24+
NUnit.Extension.NUnitV2Driver (3.4.1)
25+
NUnit.Extension.NUnitV2ResultWriter (3.4.1)
26+
NUnit.Extension.TeamCityEventListener (1.0.1)
27+
NUnit.Extension.VSProjectLoader (3.4.1)
28+
NUnit.Runners (3.4.1)
29+
NUnit.ConsoleRunner (>= 3.4.1)
30+
NUnit.Extension.NUnitProjectLoader (>= 3.4.1)
31+
NUnit.Extension.NUnitV2Driver (>= 3.4.1)
32+
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
33+
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
34+
NUnit.Extension.VSProjectLoader (>= 3.4.1)
35+
RazorEngine (3.3)
36+
Microsoft.AspNet.Razor (>= 2.0.30506)

src/FSharpx.Extras/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ It currently implements:
3232

3333
[<assembly: AssemblyProduct ("FSharpx.Extras")>]
3434

35-
[<assembly: AssemblyVersion ("1.10.2")>]
35+
[<assembly: AssemblyVersion ("1.10.3")>]
3636

37-
[<assembly: AssemblyFileVersion ("1.10.2")>]
37+
[<assembly: AssemblyFileVersion ("1.10.3")>]
3838

3939
[<assembly: AssemblyDelaySign (false)>]
4040

src/FSharpx.Extras/FSharpx.Extras.fsproj

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,19 @@
8787
<Reference Include="System.Xml.Linq" />
8888
</ItemGroup>
8989
<Choose>
90-
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
90+
<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')">
9191
<ItemGroup>
9292
<Reference Include="FSharp.Control.AsyncSeq">
93-
<HintPath>..\..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
93+
<HintPath>..\..\packages\FSharp.Control.AsyncSeq\lib\net45\FSharp.Control.AsyncSeq.dll</HintPath>
94+
<Private>True</Private>
95+
<Paket>True</Paket>
96+
</Reference>
97+
</ItemGroup>
98+
</When>
99+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
100+
<ItemGroup>
101+
<Reference Include="FSharp.Control.AsyncSeq">
102+
<HintPath>..\..\packages\FSharp.Control.AsyncSeq\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Control.AsyncSeq.dll</HintPath>
94103
<Private>True</Private>
95104
<Paket>True</Paket>
96105
</Reference>
@@ -107,7 +116,7 @@
107116
</Reference>
108117
</ItemGroup>
109118
</When>
110-
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
119+
<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 $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
111120
<ItemGroup>
112121
<Reference Include="FSharp.Core">
113122
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -116,54 +125,54 @@
116125
</Reference>
117126
</ItemGroup>
118127
</When>
119-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
128+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
120129
<ItemGroup>
121130
<Reference Include="FSharp.Core">
122-
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
131+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
123132
<Private>True</Private>
124133
<Paket>True</Paket>
125134
</Reference>
126135
</ItemGroup>
127136
</When>
128-
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
137+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
129138
<ItemGroup>
130139
<Reference Include="FSharp.Core">
131-
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
140+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
132141
<Private>True</Private>
133142
<Paket>True</Paket>
134143
</Reference>
135144
</ItemGroup>
136145
</When>
137-
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
146+
<When Condition="($(TargetFrameworkIdentifier) == '.NETStandard' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
138147
<ItemGroup>
139148
<Reference Include="FSharp.Core">
140-
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
149+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
141150
<Private>True</Private>
142151
<Paket>True</Paket>
143152
</Reference>
144153
</ItemGroup>
145154
</When>
146-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
155+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
147156
<ItemGroup>
148157
<Reference Include="FSharp.Core">
149-
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll</HintPath>
158+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
150159
<Private>True</Private>
151160
<Paket>True</Paket>
152161
</Reference>
153162
</ItemGroup>
154163
</When>
155-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
164+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
156165
<ItemGroup>
157166
<Reference Include="FSharp.Core">
158-
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll</HintPath>
167+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll</HintPath>
159168
<Private>True</Private>
160169
<Paket>True</Paket>
161170
</Reference>
162171
</ItemGroup>
163172
</When>
164173
</Choose>
165174
<Choose>
166-
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
175+
<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 $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
167176
<ItemGroup>
168177
<Reference Include="FSharpx.Async">
169178
<HintPath>..\..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
@@ -174,7 +183,7 @@
174183
</When>
175184
</Choose>
176185
<Choose>
177-
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
186+
<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 $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
178187
<ItemGroup>
179188
<Reference Include="FSharpx.Collections">
180189
<HintPath>..\..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
@@ -183,19 +192,19 @@
183192
</Reference>
184193
</ItemGroup>
185194
</When>
186-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
195+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And $(TargetFrameworkVersion) == 'v1.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
187196
<ItemGroup>
188197
<Reference Include="FSharpx.Collections">
189-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
198+
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
190199
<Private>True</Private>
191200
<Paket>True</Paket>
192201
</Reference>
193202
</ItemGroup>
194203
</When>
195-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
204+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
196205
<ItemGroup>
197206
<Reference Include="FSharpx.Collections">
198-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
207+
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
199208
<Private>True</Private>
200209
<Paket>True</Paket>
201210
</Reference>

src/FSharpx.Extras/app.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
66
<dependentAssembly>
7+
<Paket>True</Paket>
78
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
89
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="4.4.0.0" />
910
</dependentAssembly>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
FSharp.Control.AsyncSeq
22
FSharpx.Async
3-
FSharpx.Collections
3+
FSharpx.Collections
4+
FSharp.Core

src/FSharpx.Text.StructuredFormat/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ This library provides data structures and functoins for pretty printers.")>]
2626

2727
[<assembly: AssemblyProduct ("FSharpx.Text.StructuredFormat")>]
2828

29-
[<assembly: AssemblyVersion ("1.10.2")>]
29+
[<assembly: AssemblyVersion ("1.10.3")>]
3030

31-
[<assembly: AssemblyFileVersion ("1.10.2")>]
31+
[<assembly: AssemblyFileVersion ("1.10.3")>]
3232

3333
[<assembly: AssemblyDelaySign (false)>]
3434

src/FSharpx.Text.StructuredFormat/FSharpx.Text.StructuredFormat.fsproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition="'$(TargetFrameworkProfile)' == ''">
6363
<Private>False</Private>
6464
</Reference>
65-
<Reference Include="FSharp.Core" Condition="'$(TargetFrameworkProfile)' == 'Profile47'">
66-
<Private>False</Private>
67-
<Name>FSharp.Core</Name>
68-
<AssemblyName>FSharp.Core.dll</AssemblyName>
69-
<HintPath>$(MSBuildExtensionsPath32)\..\Reference Assemblies\Microsoft\FSharp\.NETPortable\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
70-
</Reference>
7165
<Reference Include="mscorlib" />
7266
<Reference Include="System" />
7367
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)