Browse Source

Build: downgrade FsUnit to <1.4 since it dropped .Net 3.5 support

pull/362/head
Christoph Ruegg 11 years ago
parent
commit
5b60f6ba00
  1. 2
      paket.dependencies
  2. 3
      paket.lock
  3. 30
      src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj
  4. 1
      src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj.paket.references
  5. 28
      src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj
  6. 28
      src/FSharpUnitTests/FSharpUnitTests.fsproj
  7. 2
      src/UnitTests/UnitTests-Net35.csproj

2
paket.dependencies

@ -6,7 +6,7 @@ group Test
source http://www.nuget.org/api/v2
nuget FSharp.Core
nuget NUnit ~> 2.6
nuget FsUnit ~> 1.3
nuget FsUnit ~> 1.3.1
group Build
source http://www.nuget.org/api/v2

3
paket.lock

@ -36,7 +36,6 @@ NUGET
remote: http://www.nuget.org/api/v2
specs:
FSharp.Core (4.0.0.1)
FsUnit (1.4.1)
FSharp.Core (>= 3.1.2.5)
FsUnit (1.3.1)
NUnit (2.6.4)
NUnit (2.6.4)

30
src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj

@ -6,8 +6,6 @@
<RootNamespace>FSharpUnitTests</RootNamespace>
<OutputType>Library</OutputType>
<ProjectGuid>{8c96f2e9-681b-4201-8bdd-0aa901203725}</ProjectGuid>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
<TestProjectType>UnitTest</TestProjectType>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
@ -171,22 +169,18 @@
</ItemGroup>
</When>
</Choose>
<Choose>
<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')">
<ItemGroup>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="NHamcrest">
<HintPath>..\..\packages\test\FsUnit\lib\net45\NHamcrest.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="FsUnit.CustomMatchers">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.CustomMatchers.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\test\NUnit\lib\nunit.framework.dll</HintPath>

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

@ -2,3 +2,4 @@ TaskParallelLibrary
group Test
FsUnit
FSharp.Core

28
src/FSharpUnitTests/FSharpUnitTests-Portable47.fsproj

@ -151,22 +151,18 @@
</ItemGroup>
</When>
</Choose>
<Choose>
<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')">
<ItemGroup>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="NHamcrest">
<HintPath>..\..\packages\test\FsUnit\lib\net45\NHamcrest.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="FsUnit.CustomMatchers">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.CustomMatchers.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\test\NUnit\lib\nunit.framework.dll</HintPath>

28
src/FSharpUnitTests/FSharpUnitTests.fsproj

@ -160,22 +160,18 @@
</ItemGroup>
</When>
</Choose>
<Choose>
<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')">
<ItemGroup>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="NHamcrest">
<HintPath>..\..\packages\test\FsUnit\lib\net45\NHamcrest.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<ItemGroup>
<Reference Include="FsUnit.CustomMatchers">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.CustomMatchers.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
<Reference Include="FsUnit.NUnit">
<HintPath>..\..\packages\test\FsUnit\lib\FsUnit.NUnit.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\packages\test\NUnit\lib\nunit.framework.dll</HintPath>

2
src/UnitTests/UnitTests-Net35.csproj

@ -5,8 +5,6 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9014A0CE-725D-4718-918C-923C0CA19FEE}</ProjectGuid>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TestProjectType>UnitTest</TestProjectType>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MathNet.Numerics.UnitTests</RootNamespace>

Loading…
Cancel
Save