Skip to content

Commit 163062f

Browse files
kurtschelfthoutkurtschelfthout
committed
Use FSharp.Core nuget package
Unfortunately installing the package does not seem to have done the right thing.
1 parent bd66f72 commit 163062f

18 files changed

Lines changed: 145 additions & 7 deletions

‎examples/FsCheck.Examples/FsCheck.Examples.fsproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,20 @@
7979
</Target>
8080
-->
8181
<Import Project="..\..\.paket\paket.targets" />
82+
<Choose>
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')">
84+
</When>
85+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
86+
</When>
87+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
88+
</When>
89+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
90+
</When>
91+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
92+
</When>
93+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
94+
</When>
95+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
96+
</When>
97+
</Choose>
8298
</Project>

‎examples/FsCheck.Examples/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FSharp.Core

‎examples/FsCheck.NUnit.Examples/FsCheck.NUnit.Examples.fsproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -95,6 +95,22 @@
9595
</Target>
9696
-->
9797
<Import Project="..\..\.paket\paket.targets" />
98+
<Choose>
99+
<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')">
100+
</When>
101+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
102+
</When>
103+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
104+
</When>
105+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
106+
</When>
107+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
108+
</When>
109+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
110+
</When>
111+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
112+
</When>
113+
</Choose>
98114
<ItemGroup>
99115
<Reference Include="nunit.framework">
100116
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>

‎examples/FsCheck.NUnit.Examples/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
NUnit
1+
NUnit
2+
FSharp.Core

‎paket.dependencies‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ nuget xunit.runner.visualstudio
99
nuget NuGet.CommandLine
1010
nuget SourceLink.Fake
1111
nuget FSharp.Formatting
12-
nuget xunit.runner.visualstudio
12+
nuget xunit.runner.visualstudio
13+
nuget FSharp.Core

‎paket.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ NUGET
33
specs:
44
FAKE (3.12.2)
55
FSharp.Compiler.Service (0.0.67)
6+
FSharp.Core (3.1.2.1)
67
FSharp.Formatting (2.4.37)
78
FSharp.Compiler.Service (0.0.67)
89
Microsoft.AspNet.Razor (2.0.30506)

‎src/FsCheck.MsTest/FsCheck.MsTest.fsproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,20 @@
7474
</Target>
7575
-->
7676
<Import Project="..\..\.paket\paket.targets" />
77+
<Choose>
78+
<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')">
79+
</When>
80+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
81+
</When>
82+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
83+
</When>
84+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
85+
</When>
86+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
87+
</When>
88+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
89+
</When>
90+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
91+
</When>
92+
</Choose>
7793
</Project>

‎src/FsCheck.MsTest/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FSharp.Core

‎src/FsCheck.NUnit.Addin/FsCheck.NUnit.Addin.fsproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@
8686
</Target>
8787
-->
8888
<Import Project="..\..\.paket\paket.targets" />
89+
<Choose>
90+
<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')">
91+
</When>
92+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoAndroid'">
93+
</When>
94+
<When Condition="$(TargetFrameworkIdentifier) == 'MonoTouch'">
95+
</When>
96+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44')">
97+
</When>
98+
<When Condition="($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile47')">
99+
</When>
100+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78')">
101+
</When>
102+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
103+
</When>
104+
</Choose>
89105
<ItemGroup>
90106
<Reference Include="nunit.framework">
91107
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>

‎src/FsCheck.NUnit.Addin/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
NUnit
1+
NUnit
2+
FSharp.Core

0 commit comments

Comments
 (0)