Skip to content

Commit

Permalink
Paket upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdrnet
cdrnet committed Oct 25, 2014
1 parent 4a56894 commit 2eb400b
Show file tree
Hide file tree
Showing 25 changed files with 1,239 additions and 493 deletions.
2 changes: 2 additions & 0 deletions build.fsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ Target "Clean" (fun _ ->
CleanDirs [ "out/api"; "out/docs"; "out/packages" ]
CleanDirs [ "out/lib/Net35"; "out/lib/Net40"; "out/lib/Profile47"; "out/lib/Profile259"; "out/lib/Profile328" ]
CleanDirs [ "out/test/Net35"; "out/test/Net40"; "out/test/Profile47"; "out/test/Profile259"; "out/test/Profile328" ]
CleanDirs [ "out/lib-debug/Net35"; "out/lib-debug/Net40"; "out/lib-debug/Profile47"; "out/lib-debug/Profile259"; "out/lib-debug/Profile328" ]
CleanDirs [ "out/test-debug/Net35"; "out/test-debug/Net40"; "out/test-debug/Profile47"; "out/test-debug/Profile259"; "out/test-debug/Profile328" ]
CleanDirs [ "out/lib-signed/Net40"; "out/test-signed/Net40" ] // Signed Build
CleanDirs [ "out/MKL"; "out/ATLAS" ] // Native Providers
CleanDirs [ "out/Data" ]) // Data Extensions
Expand Down
8 changes: 4 additions & 4 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ NUGET
specs:
BenchShark (1.0.0)
ConsoleDump (0.6.0.1)
FAKE (3.7.1)
FSharp.Compiler.Service (0.0.62)
FAKE (3.7.5)
FSharp.Compiler.Service (0.0.67)
FSharp.Core.4.3.0.0.Microsoft.Signed (3.0.0.1)
FSharp.Core.Microsoft.Signed (3.1.1.1)
FSharp.Formatting (2.4.33)
FSharp.Compiler.Service (>= 0.0.62)
FSharp.Formatting (2.4.36)
FSharp.Compiler.Service (0.0.67)
Microsoft.AspNet.Razor (2.0.30506.0)
RazorEngine (3.3.0)
FsUnit (1.3.0.1)
Expand Down
89 changes: 0 additions & 89 deletions src/Data/Matlab/Matlab.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,93 +63,4 @@
<Target Name="AfterBuild">
</Target>
-->
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<Choose>
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'">
<Choose>
<When Condition="$(TargetFrameworkProfile) == 'Profile47' And $(TargetPlatformIdentifier) == 'Portable' And $(TargetPlatformVersion) == '7.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>
89 changes: 0 additions & 89 deletions src/Data/Text/Text.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,93 +59,4 @@
<Target Name="AfterBuild">
</Target>
-->
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<Choose>
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'">
<Choose>
<When Condition="$(TargetFrameworkProfile) == 'Profile47' And $(TargetPlatformIdentifier) == 'Portable' And $(TargetPlatformVersion) == '7.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>
107 changes: 7 additions & 100 deletions src/DataUnitTests/UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,104 +108,11 @@
<Target Name="AfterBuild">
</Target>
-->
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<Choose>
<When Condition="$(TargetFrameworkVersion) == 'v1.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v1.1'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v2.0'">
</When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\net35\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="System.Numerics">
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'">
<Choose>
<When Condition="$(TargetFrameworkProfile) == 'Profile47' And $(TargetPlatformIdentifier) == 'Portable' And $(TargetPlatformVersion) == '7.0'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup>
<Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework'">
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Project>
Loading

0 comments on commit 2eb400b

Please sign in to comment.