Skip to content

Commit 39302ed

Browse files
cgravillcgravill
committed
Force an earlier version of System.Net.Http due to Mono interaction. Note this only manifests if you build on e.g. Windows with .NET then transfer to e.g. macOS and try to use Mono.
1 parent b5c542e commit 39302ed

File tree

5 files changed

+96
-2
lines changed

5 files changed

+96
-2
lines changed

Diff for: ‎paket.dependencies

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ nuget FAKE >= 4.58.6
1414
nuget xunit 2.1
1515
nuget xunit.runner.console 2.1
1616
nuget Paket.Core ~> 5.174.2
17-
nuget Trinet.Core.IO.Ntfs
17+
nuget Trinet.Core.IO.Ntfs
18+
nuget System.Net.Http 4.3.1

Diff for: ‎paket.lock

+12
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ NUGET
5454
System.Globalization (4.3)
5555
System.IO (4.3)
5656
System.Linq (4.3)
57+
System.Net.Http (4.3.1)
58+
System.Security.Cryptography.X509Certificates (>= 4.3)
5759
System.Reflection (4.3)
5860
System.Reflection.Metadata (1.6)
5961
System.Collections.Immutable (>= 1.5)
@@ -62,6 +64,16 @@ NUGET
6264
System.Runtime.Extensions (4.3)
6365
System.Runtime.InteropServices (4.3)
6466
System.Runtime (>= 4.3)
67+
System.Security.Cryptography.Algorithms (4.3.1)
68+
System.IO (>= 4.3)
69+
System.Runtime (>= 4.3)
70+
System.Security.Cryptography.Encoding (>= 4.3)
71+
System.Security.Cryptography.Primitives (>= 4.3)
72+
System.Security.Cryptography.Encoding (4.3)
73+
System.Security.Cryptography.Primitives (4.3)
74+
System.Security.Cryptography.X509Certificates (4.3.2)
75+
System.Security.Cryptography.Algorithms (>= 4.3)
76+
System.Security.Cryptography.Encoding (>= 4.3)
6577
System.Text.Encoding (4.3)
6678
System.Threading (4.3)
6779
System.ValueTuple (4.5)

Diff for: ‎src/IfSharp/App.config

+25
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@
7171
<assemblyIdentity name="System.Linq" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7272
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
7373
</dependentAssembly>
74+
<dependentAssembly>
75+
<Paket>True</Paket>
76+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
77+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
78+
</dependentAssembly>
7479
<dependentAssembly>
7580
<Paket>True</Paket>
7681
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -96,6 +101,26 @@
96101
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
97102
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.0" />
98103
</dependentAssembly>
104+
<dependentAssembly>
105+
<Paket>True</Paket>
106+
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
107+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.2.1.0" />
108+
</dependentAssembly>
109+
<dependentAssembly>
110+
<Paket>True</Paket>
111+
<assemblyIdentity name="System.Security.Cryptography.Encoding" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
112+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.1.0" />
113+
</dependentAssembly>
114+
<dependentAssembly>
115+
<Paket>True</Paket>
116+
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
117+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.0.1.0" />
118+
</dependentAssembly>
119+
<dependentAssembly>
120+
<Paket>True</Paket>
121+
<assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
122+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.1.1.2" />
123+
</dependentAssembly>
99124
<dependentAssembly>
100125
<Paket>True</Paket>
101126
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

Diff for: ‎src/IfSharp/IfSharp.fsproj

+55
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,17 @@
244244
</ItemGroup>
245245
</When>
246246
</Choose>
247+
<Choose>
248+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
249+
<ItemGroup>
250+
<Reference Include="System.Net.Http">
251+
<HintPath>..\..\packages\System.Net.Http\lib\net46\System.Net.Http.dll</HintPath>
252+
<Private>True</Private>
253+
<Paket>True</Paket>
254+
</Reference>
255+
</ItemGroup>
256+
</When>
257+
</Choose>
247258
<Choose>
248259
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
249260
<ItemGroup>
@@ -302,6 +313,50 @@
302313
</ItemGroup>
303314
</When>
304315
</Choose>
316+
<Choose>
317+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
318+
<ItemGroup>
319+
<Reference Include="System.Security.Cryptography.Algorithms">
320+
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
321+
<Private>True</Private>
322+
<Paket>True</Paket>
323+
</Reference>
324+
</ItemGroup>
325+
</When>
326+
</Choose>
327+
<Choose>
328+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
329+
<ItemGroup>
330+
<Reference Include="System.Security.Cryptography.Encoding">
331+
<HintPath>..\..\packages\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
332+
<Private>True</Private>
333+
<Paket>True</Paket>
334+
</Reference>
335+
</ItemGroup>
336+
</When>
337+
</Choose>
338+
<Choose>
339+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
340+
<ItemGroup>
341+
<Reference Include="System.Security.Cryptography.Primitives">
342+
<HintPath>..\..\packages\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
343+
<Private>True</Private>
344+
<Paket>True</Paket>
345+
</Reference>
346+
</ItemGroup>
347+
</When>
348+
</Choose>
349+
<Choose>
350+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
351+
<ItemGroup>
352+
<Reference Include="System.Security.Cryptography.X509Certificates">
353+
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
354+
<Private>True</Private>
355+
<Paket>True</Paket>
356+
</Reference>
357+
</ItemGroup>
358+
</When>
359+
</Choose>
305360
<Choose>
306361
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
307362
<ItemGroup>

Diff for: ‎src/IfSharp/paket.references

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
NetMQ
33
Trinet.Core.IO.Ntfs
44
FSharp.Core
5-
AsyncIO
5+
AsyncIO
6+
System.Net.Http

0 commit comments

Comments
 (0)