tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Build: for F# on net35 use traditional FSharp.Core reference instead of NuGet 

For C# and also for all non-net35 F# targets we still use the proper NuGet package.
This allows us to use one FSharp.Core NuGet package only (instead of two
with platform-groups), resolving quite a few issues.
pull/268/head
Christoph Ruegg 12 years ago
parent
b9a646377f
commit
226e1e07a1
17 changed files with 36 additions and 303 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      README.md
  2. 3
      build.fsx
  3. 1
      docs/content/index.fsx
  4. 1
      paket.dependencies
  5. 3
      paket.lock
  6. 2
      src/Data/Matlab/Matlab.csproj
  7. 2
      src/Data/Text/Text.csproj
  8. 2
      src/DataUnitTests/UnitTests.csproj
  9. 131
      src/FSharp/FSharp-Net35.fsproj
  10. 1
      src/FSharp/FSharp-Net35.fsproj.paket.references
  11. 2
      src/FSharp/FSharp-Portable47.fsproj
  12. 2
      src/FSharp/FSharp.fsproj
  13. 182
      src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj
  14. 1
      src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references
  15. 2
      src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj
  16. 2
      src/FSharpUnitTests/FSharpUnitTests.fsproj
  17. 1
      src/UnitTests/UnitTests.csproj

1
README.md
View File

@ -65,7 +65,6 @@ Package Dependencies:
- .Net 4.0 and higher, Mono, PCL Profiles: None - .Net 4.0 and higher, Mono, PCL Profiles: None
- .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary) - .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary)
- F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed) - F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed)
- F# on .Net 3.5: additionally [FSharp.Core.4.3.0.0.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.4.3.0.0.Microsoft.Signed)
Framework Dependencies (part of the .NET Framework): Framework Dependencies (part of the .NET Framework):

3
build.fsx
View File

@ -130,8 +130,7 @@ let fsharpPack =
Tags = "fsharp F# " + tags Tags = "fsharp F# " + tags
Dependencies = Dependencies =
[ { FrameworkVersion="net35" [ { FrameworkVersion="net35"
Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion Dependencies=[ ] }
"FSharp.Core.4.3.0.0.Microsoft.Signed", GetPackageVersion "packages" "FSharp.Core.4.3.0.0.Microsoft.Signed" ] }
{ FrameworkVersion="net40" { FrameworkVersion="net40"
Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion Dependencies=[ "MathNet.Numerics", RequireExactly packageVersion
"FSharp.Core.Microsoft.Signed", GetPackageVersion "packages" "FSharp.Core.Microsoft.Signed" ] } "FSharp.Core.Microsoft.Signed", GetPackageVersion "packages" "FSharp.Core.Microsoft.Signed" ] }

1
docs/content/index.fsx
View File

@ -49,7 +49,6 @@ Package Dependencies:
- .Net 4.0 and higher, Mono, PCL Profiles: None - .Net 4.0 and higher, Mono, PCL Profiles: None
- .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary) - .Net 3.5: [Task Parallel Library for .NET 3.5](http://www.nuget.org/packages/TaskParallelLibrary)
- F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed) - F# on .Net 4.0 an higher, Mono, PCL Profiles: additionally [FSharp.Core.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.Microsoft.Signed)
- F# on .Net 3.5: additionally [FSharp.Core.4.3.0.0.Microsoft.Signed](http://www.nuget.org/packages/FSharp.Core.4.3.0.0.Microsoft.Signed)
Framework Dependencies (part of the .NET Framework): Framework Dependencies (part of the .NET Framework):

1
paket.dependencies
View File

@ -2,7 +2,6 @@ source http://nuget.org/api/v2
# Core Dependencies # Core Dependencies
nuget FSharp.Core.Microsoft.Signed ~> 3.1.1 nuget FSharp.Core.Microsoft.Signed ~> 3.1.1
nuget FSharp.Core.4.3.0.0.Microsoft.Signed ~> 3.0.0
nuget TaskParallelLibrary 1.0.2856.0 nuget TaskParallelLibrary 1.0.2856.0
# Data Dependencies # Data Dependencies

3
paket.lock
View File

@ -3,9 +3,8 @@ NUGET
specs: specs:
BenchShark (1.0.0) BenchShark (1.0.0)
ConsoleDump (0.6.0.1) ConsoleDump (0.6.0.1)
FAKE (3.7.5) FAKE (3.9.9)
FSharp.Compiler.Service (0.0.67) 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.Core.Microsoft.Signed (3.1.1.1)
FSharp.Formatting (2.4.36) FSharp.Formatting (2.4.36)
FSharp.Compiler.Service (0.0.67) FSharp.Compiler.Service (0.0.67)

2
src/Data/Matlab/Matlab.csproj
View File

@ -137,7 +137,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="MathNet.Numerics"> <Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath> <HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

2
src/Data/Text/Text.csproj
View File

@ -137,7 +137,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="MathNet.Numerics"> <Reference Include="MathNet.Numerics">
<HintPath>..\..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath> <HintPath>..\..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

2
src/DataUnitTests/UnitTests.csproj
View File

@ -192,7 +192,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="MathNet.Numerics"> <Reference Include="MathNet.Numerics">
<HintPath>..\..\packages\MathNet.Numerics\lib\net40\MathNet.Numerics.dll</HintPath> <HintPath>..\..\packages\MathNet.Numerics\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\MathNet.Numerics.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

131
src/FSharp/FSharp-Net35.fsproj
View File

@ -66,55 +66,8 @@
</When> </When>
<When Condition="$(TargetFrameworkVersion) == 'v2.0'"> <When Condition="$(TargetFrameworkVersion) == 'v2.0'">
</When> </When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise> <Otherwise>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -124,22 +77,17 @@
</Otherwise> </Otherwise>
</Choose> </Choose>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'"> <When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="System.Threading">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'"> <When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -147,13 +95,8 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'"> <When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -161,59 +104,8 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<Choose>
<When Condition="$(SilverlightVersion) == 'v3.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(SilverlightVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -223,11 +115,6 @@
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'"> <When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -237,11 +124,6 @@
</When> </When>
<Otherwise> <Otherwise>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading"> <Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath> <HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -269,6 +151,9 @@
<None Include="MathNet.Numerics.fsx" /> <None Include="MathNet.Numerics.fsx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core, Version=2.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
</Reference>
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

1
src/FSharp/FSharp-Net35.fsproj.paket.references
View File

@ -1,2 +1 @@
FSharp.Core.4.3.0.0.Microsoft.Signed
TaskParallelLibrary TaskParallelLibrary

2
src/FSharp/FSharp-Portable47.fsproj
View File

@ -177,7 +177,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

2
src/FSharp/FSharp.fsproj
View File

@ -189,7 +189,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

182
src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj
View File

@ -92,11 +92,6 @@
</When> </When>
<When Condition="$(TargetFrameworkVersion) == 'v3.5'"> <When Condition="$(TargetFrameworkVersion) == 'v3.5'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net35\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net20\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net20\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -114,61 +109,8 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0' And $(TargetFrameworkProfile) == 'Client'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net40\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise> <Otherwise>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -188,22 +130,27 @@
</Otherwise> </Otherwise>
</Choose> </Choose>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETPortable'"> <When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>
</ItemGroup> <Reference Include="nunit.framework">
</When> <HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
<ItemGroup>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -221,13 +168,8 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'"> <When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -245,89 +187,8 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'Silverlight'">
<Choose>
<When Condition="$(SilverlightVersion) == 'v3.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<When Condition="$(SilverlightVersion) == 'v4.0'">
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="System.Threading">
<HintPath>..\..\packages\TaskParallelLibrary\lib\Net35\System.Threading.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</Otherwise>
</Choose>
</When>
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -347,11 +208,6 @@
</When> </When>
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'"> <When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -371,11 +227,6 @@
</When> </When>
<Otherwise> <Otherwise>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.3.0.0.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit"> <Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath> <HintPath>..\..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
<Private>True</Private> <Private>True</Private>
@ -411,6 +262,9 @@
<None Include="paket.references" /> <None Include="paket.references" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core, Version=2.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>False</Private>
</Reference>
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

1
src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references
View File

@ -1,3 +1,2 @@
FSharp.Core.4.3.0.0.Microsoft.Signed
FsUnit FsUnit
TaskParallelLibrary TaskParallelLibrary

2
src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj
View File

@ -289,7 +289,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

2
src/FSharpUnitTests/FSharpUnitTests.fsproj
View File

@ -298,7 +298,7 @@
<When Condition="$(TargetFrameworkIdentifier) == 'Windows'"> <When Condition="$(TargetFrameworkIdentifier) == 'Windows'">
<ItemGroup> <ItemGroup>
<Reference Include="FSharp.Core"> <Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\net45\FSharp.Core.dll</HintPath> <HintPath>..\..\packages\FSharp.Core.Microsoft.Signed\lib\portable-net45+netcore45+MonoAndroid1+MonoTouch1\FSharp.Core.dll</HintPath>
<Private>True</Private> <Private>True</Private>
<Paket>True</Paket> <Paket>True</Paket>
</Reference> </Reference>

1
src/UnitTests/UnitTests.csproj
View File

@ -676,6 +676,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
Write Preview
Loading…
Cancel
Save