Skip to content

Commit 15ab19e

Browse files
forkiforki
committed
Update dependencies
1 parent 2c76cb1 commit 15ab19e

5 files changed

Lines changed: 121 additions & 82 deletions

File tree

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,6 @@
176176
</Reference>
177177
</ItemGroup>
178178
</When>
179-
<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')">
180-
<ItemGroup>
181-
<Reference Include="FSharpx.Collections">
182-
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
183-
<Private>True</Private>
184-
<Paket>True</Paket>
185-
</Reference>
186-
</ItemGroup>
187-
</When>
188-
<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')">
189-
<ItemGroup>
190-
<Reference Include="FSharpx.Collections">
191-
<HintPath>..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
192-
<Private>True</Private>
193-
<Paket>True</Paket>
194-
</Reference>
195-
</ItemGroup>
196-
</When>
197179
</Choose>
198180
<Choose>
199181
<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')">

‎paket.lock‎

Lines changed: 121 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,26 @@ NUGET
33
FAKE (4.38)
44
FsCheck (2.6)
55
FSharp.Core (>= 3.1.2.5)
6-
FSharp.Compiler.Service (0.0.59)
6+
FSharp.Compiler.Service (6.0.2)
7+
System.Collections.Immutable (>= 1.2)
8+
System.Reflection.Metadata (>= 1.4.1-beta-24227-04)
79
FSharp.Control.AsyncSeq (2.0.9)
810
FSharp.Core (4.0.0.1) - redirects: force
9-
FSharp.Formatting (2.4.25)
10-
FSharp.Compiler.Service (>= 0.0.59)
11-
Microsoft.AspNet.Razor (2.0.30506)
12-
RazorEngine (3.3)
11+
FSharp.Formatting (2.10)
12+
FSharp.Compiler.Service (>= 0.0.87)
13+
FSharpVSPowerTools.Core (1.8)
14+
FSharpVSPowerTools.Core (1.8)
15+
FSharp.Compiler.Service (>= 0.0.87)
1316
FSharpx.Async (1.12)
1417
FSharp.Control.AsyncSeq
15-
FSharpx.Collections (1.10.1)
16-
FSharp.Core (>= 3.1.2.1)
18+
FSharpx.Collections (1.15.1)
19+
FSharp.Core
1720
FsUnit (2.3.1)
1821
FSharp.Core (>= 3.1.2.5)
1922
NUnit (3.4.1)
20-
Microsoft.AspNet.Razor (2.0.30506)
23+
Microsoft.AspNet.Razor (3.2.3)
24+
Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10
25+
Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10
2126
NUnit (3.4.1)
2227
NUnit.ConsoleRunner (3.4.1)
2328
NUnit.Extension.NUnitProjectLoader (3.4.1)
@@ -32,5 +37,111 @@ NUGET
3237
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
3338
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
3439
NUnit.Extension.VSProjectLoader (>= 3.4.1)
35-
RazorEngine (3.3)
36-
Microsoft.AspNet.Razor (>= 2.0.30506)
40+
RazorEngine (3.9)
41+
Microsoft.AspNet.Razor (>= 3.0) - framework: >= net45
42+
Microsoft.AspNet.Razor (2.0.30506) - framework: net40
43+
System.Collections (4.0.11) - framework: >= netstandard10
44+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
45+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
46+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
47+
System.Collections.Immutable (1.2)
48+
System.Collections (>= 4.0.11) - framework: >= netstandard10
49+
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10
50+
System.Globalization (>= 4.0.11) - framework: >= netstandard10
51+
System.Linq (>= 4.1) - framework: >= netstandard10
52+
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10
53+
System.Runtime (>= 4.1) - framework: >= netstandard10
54+
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10
55+
System.Threading (>= 4.0.11) - framework: >= netstandard10
56+
System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10
57+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
58+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
59+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
60+
System.Globalization (4.0.11) - framework: >= netstandard10
61+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
62+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
63+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
64+
System.IO (4.1) - framework: >= netstandard10
65+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
66+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
67+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
68+
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
69+
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
70+
System.Linq (4.1) - framework: >= netstandard10
71+
System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16
72+
System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16
73+
System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16
74+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16
75+
System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16
76+
System.Reflection (4.1) - framework: >= netstandard10
77+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
78+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
79+
System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
80+
System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
81+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
82+
System.Reflection.Extensions (4.0.1) - framework: >= netstandard11
83+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
84+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
85+
System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10
86+
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
87+
System.Reflection.Metadata (1.4.1-beta-24227-04)
88+
System.Collections (>= 4.0.11) - framework: >= netstandard11
89+
System.Collections.Immutable (>= 1.1.37) - framework: portable-net45+win8
90+
System.Collections.Immutable (>= 1.2) - framework: >= net45, >= netstandard11, monoandroid, monotouch, xamarinios, xamarinmac, winv4.5, wpav8.1
91+
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard11
92+
System.IO (>= 4.1) - framework: >= netstandard11
93+
System.Linq (>= 4.1) - framework: >= netstandard11
94+
System.Reflection (>= 4.1) - framework: >= netstandard11
95+
System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard11
96+
System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard11
97+
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard11
98+
System.Runtime (>= 4.1) - framework: >= netstandard11
99+
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard11
100+
System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard11
101+
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard11
102+
System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard11
103+
System.Threading (>= 4.0.11) - framework: >= netstandard11
104+
System.Reflection.Primitives (4.0.1) - framework: >= netstandard10
105+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
106+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
107+
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
108+
System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10
109+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10
110+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10
111+
System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10
112+
System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10
113+
System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10
114+
System.Runtime (4.1) - framework: >= netstandard10
115+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
116+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15
117+
System.Runtime.Extensions (4.1) - framework: >= netstandard10
118+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
119+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
120+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
121+
System.Runtime.Handles (4.0.1) - framework: netstandard13, >= netstandard15
122+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13
123+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13
124+
System.Runtime (>= 4.1) - framework: >= netstandard13
125+
System.Runtime.InteropServices (4.1) - framework: >= netstandard11
126+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
127+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
128+
System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
129+
System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
130+
System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
131+
System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15
132+
System.Text.Encoding (4.0.11) - framework: >= netstandard10
133+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
134+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
135+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
136+
System.Text.Encoding.Extensions (4.0.11) - framework: >= netstandard11
137+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
138+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
139+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
140+
System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
141+
System.Threading (4.0.11) - framework: >= netstandard10
142+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13
143+
System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13
144+
System.Threading.Tasks (4.0.11) - framework: netstandard10, >= netstandard13
145+
Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
146+
Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13
147+
System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13

‎src/FSharpx.Extras/FSharpx.Extras.fsproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -191,23 +191,5 @@
191191
</Reference>
192192
</ItemGroup>
193193
</When>
194-
<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')">
195-
<ItemGroup>
196-
<Reference Include="FSharpx.Collections">
197-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
198-
<Private>True</Private>
199-
<Paket>True</Paket>
200-
</Reference>
201-
</ItemGroup>
202-
</When>
203-
<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')">
204-
<ItemGroup>
205-
<Reference Include="FSharpx.Collections">
206-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
207-
<Private>True</Private>
208-
<Paket>True</Paket>
209-
</Reference>
210-
</ItemGroup>
211-
</When>
212194
</Choose>
213195
</Project>

‎tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -205,24 +205,6 @@
205205
</Reference>
206206
</ItemGroup>
207207
</When>
208-
<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')">
209-
<ItemGroup>
210-
<Reference Include="FSharpx.Collections">
211-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
212-
<Private>True</Private>
213-
<Paket>True</Paket>
214-
</Reference>
215-
</ItemGroup>
216-
</When>
217-
<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')">
218-
<ItemGroup>
219-
<Reference Include="FSharpx.Collections">
220-
<HintPath>..\..\packages\FSharpx.Collections\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharpx.Collections.dll</HintPath>
221-
<Private>True</Private>
222-
<Paket>True</Paket>
223-
</Reference>
224-
</ItemGroup>
225-
</When>
226208
</Choose>
227209
<Choose>
228210
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v3.0')">

0 commit comments

Comments
 (0)