Skip to content

Commit 53dc96e

Browse files
cdrnetcdrnet
committed
Tooling: reinstall dependencies with current paket release
1 parent 8fa850b commit 53dc96e

File tree

19 files changed

+883
-186
lines changed

19 files changed

+883
-186
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ coverage.*
2323
*.vsp
2424
*.vspx
2525
*.lnt
26+
*.svclog
2627

2728
# Caches
2829
_ReSharper*

‎packages/FSharp.Core/license.html

Lines changed: 106 additions & 107 deletions
Large diffs are not rendered by default.

‎packages/NUnit/license.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<h2>NUnit License</h2>
2+
3+
<p><b>
4+
Copyright &copy; 2002-2015 Charlie Poole<br>
5+
Copyright &copy; 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov<br>
6+
Copyright &copy; 2000-2002 Philip A. Craig</b>
7+
8+
<p>This software is provided 'as-is', without any express or implied warranty. In
9+
no event will the authors be held liable for any damages arising from the use
10+
of this software.
11+
12+
<p>Permission is granted to anyone to use this software for any purpose, including
13+
commercial applications, and to alter it and redistribute it freely, subject to
14+
the following restrictions:
15+
16+
<ol>
17+
<li>The origin of this software must not be misrepresented; you must not claim
18+
that you wrote the original software. If you use this software in a product, an
19+
acknowledgment (see the following) in the product documentation is required.
20+
<br><br>
21+
<b>Portions Copyright &copy; 2002-2012 Charlie Poole or
22+
Copyright&nbsp;&copy; 2002-2004 James W. Newkirk, Michael C. Two, Alexei A.
23+
Vorontsov or Copyright&nbsp;&copy; 2000-2002 Philip A. Craig</b>
24+
<br><br>
25+
<li>Altered source versions must be plainly marked as such, and must not be
26+
misrepresented as being the original software.
27+
<br><br>
28+
<li>This notice may not be removed or altered from any source distribution.
29+
</ol>
30+
31+
<h4>License Note</h4>
32+
<p>This license is based on <A href="http://www.opensource.org/licenses/zlib-license.html">
33+
the open source zlib/libpng license</A>. The idea was to keep the license
34+
as simple as possible to encourage use of NUnit in free and commercial
35+
applications and libraries, but to keep the source code together and to give
36+
credit to the NUnit contributors for their efforts. While this license allows
37+
shipping NUnit in source and binary form, if shipping a NUnit variant is the
38+
sole purpose of your product, please <a href="mailto:cpoole@pooleconsulting.com">let
39+
us know</a>.</p>

‎packages/TaskParallelLibrary/license.html

Lines changed: 622 additions & 0 deletions
Large diffs are not rendered by default.

‎paket.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
if test "$OS" = "Windows_NT"
33
then
44
# use .Net
5-
[ ! -f tools/paket/paket.exe ] && tools/paket/paket.bootstrapper.exe
6-
tools/paket/paket.exe $@
5+
[ ! -f .paket/paket.exe ] && .paket/paket.bootstrapper.exe
6+
.paket/paket.exe $@
77
else
88
# use mono
9-
[ ! -f tools/paket/paket.exe ] && mono --runtime=v4.0 tools/paket/paket.bootstrapper.exe
10-
mono --runtime=v4.0 tools/paket/paket.exe $@
9+
[ ! -f .paket/paket.exe ] && mono --runtime=v4.0 .paket/paket.bootstrapper.exe
10+
mono --runtime=v4.0 .paket/paket.exe $@
1111
fi

‎src/Data/Matlab/Matlab.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@
7373
</Reference>
7474
</ItemGroup>
7575
</When>
76-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
76+
<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')">
7777
<ItemGroup>
7878
<Reference Include="MathNet.Numerics">
79-
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
79+
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
8080
<Private>True</Private>
8181
<Paket>True</Paket>
8282
</Reference>
8383
</ItemGroup>
8484
</When>
85-
<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')">
85+
<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')">
8686
<ItemGroup>
8787
<Reference Include="MathNet.Numerics">
88-
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
88+
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
8989
<Private>True</Private>
9090
<Paket>True</Paket>
9191
</Reference>

‎src/Data/Text/Text.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@
6969
</Reference>
7070
</ItemGroup>
7171
</When>
72-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
72+
<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')">
7373
<ItemGroup>
7474
<Reference Include="MathNet.Numerics">
75-
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
75+
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
7676
<Private>True</Private>
7777
<Paket>True</Paket>
7878
</Reference>
7979
</ItemGroup>
8080
</When>
81-
<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')">
81+
<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')">
8282
<ItemGroup>
8383
<Reference Include="MathNet.Numerics">
84-
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
84+
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
8585
<Private>True</Private>
8686
<Paket>True</Paket>
8787
</Reference>

‎src/DataUnitTests/UnitTests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@
8686
</Reference>
8787
</ItemGroup>
8888
</When>
89-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47')">
89+
<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')">
9090
<ItemGroup>
9191
<Reference Include="MathNet.Numerics">
92-
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
92+
<HintPath>..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
9393
<Private>True</Private>
9494
<Paket>True</Paket>
9595
</Reference>
9696
</ItemGroup>
9797
</When>
98-
<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')">
98+
<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')">
9999
<ItemGroup>
100100
<Reference Include="MathNet.Numerics">
101-
<HintPath>..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
101+
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
102102
<Private>True</Private>
103103
<Paket>True</Paket>
104104
</Reference>

‎src/FSharp/FSharp-Net35.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</ProjectReference>
9393
</ItemGroup>
9494
<Choose>
95-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(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')">
95+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(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')">
9696
<ItemGroup>
9797
<Reference Include="System.Threading">
9898
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>

‎src/FSharp/FSharp-Portable47.fsproj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,16 @@
8080
</Reference>
8181
</ItemGroup>
8282
</When>
83-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
83+
<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')">
84+
<ItemGroup>
85+
<Reference Include="FSharp.Core">
86+
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
87+
<Private>True</Private>
88+
<Paket>True</Paket>
89+
</Reference>
90+
</ItemGroup>
91+
</When>
92+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
8493
<ItemGroup>
8594
<Reference Include="FSharp.Core">
8695
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll</HintPath>
@@ -89,10 +98,10 @@
8998
</Reference>
9099
</ItemGroup>
91100
</When>
92-
<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')">
101+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS')">
93102
<ItemGroup>
94103
<Reference Include="FSharp.Core">
95-
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
104+
<HintPath>..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll</HintPath>
96105
<Private>True</Private>
97106
<Paket>True</Paket>
98107
</Reference>

0 commit comments

Comments
 (0)