Skip to content

Commit 327fce4

Browse files
sideeffffectsideeffffect
committed
fix generate.fsx for documentation
1 parent 05d4dbc commit 327fce4

8 files changed

Lines changed: 82 additions & 65 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ packages/
4141
.paket/paket.exe
4242
*.userprefs
4343
.fake/*
44+
docs/output/*
4445

‎FSharpx.Extras.Tests/FSharpx.Extras.Tests.fsproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,18 @@
6060
<None Include="paket.references" />
6161
<None Include="app.config" />
6262
</ItemGroup>
63+
<PropertyGroup>
64+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
65+
</PropertyGroup>
66+
<ItemGroup>
67+
<ProjectReference Include="..\src\FSharpx.Extras\FSharpx.Extras.fsproj">
68+
<Name>FSharpx.Extras</Name>
69+
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
70+
<Private>False</Private>
71+
</ProjectReference>
72+
</ItemGroup>
6373
<Choose>
64-
<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')">
74+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
6575
<ItemGroup>
6676
<Reference Include="FSharp.Control.AsyncSeq">
6777
<HintPath>..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
@@ -81,7 +91,7 @@
8191
</Reference>
8292
</ItemGroup>
8393
</When>
84-
<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')">
94+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
8595
<ItemGroup>
8696
<Reference Include="FSharp.Core">
8797
<HintPath>..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -137,7 +147,7 @@
137147
</When>
138148
</Choose>
139149
<Choose>
140-
<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')">
150+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
141151
<ItemGroup>
142152
<Reference Include="FSharpx.Async">
143153
<HintPath>..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
@@ -148,7 +158,7 @@
148158
</When>
149159
</Choose>
150160
<Choose>
151-
<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')">
161+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
152162
<ItemGroup>
153163
<Reference Include="FSharpx.Collections">
154164
<HintPath>..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
@@ -177,7 +187,7 @@
177187
</When>
178188
</Choose>
179189
<Choose>
180-
<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')">
190+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
181191
<ItemGroup>
182192
<Reference Include="FsUnit.NUnit">
183193
<HintPath>..\packages\FsUnit\Lib\Net40\FsUnit.NUnit.dll</HintPath>
@@ -188,7 +198,7 @@
188198
</When>
189199
</Choose>
190200
<Choose>
191-
<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')">
201+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
192202
<ItemGroup>
193203
<Reference Include="nunit.framework">
194204
<HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
@@ -198,14 +208,4 @@
198208
</ItemGroup>
199209
</When>
200210
</Choose>
201-
<PropertyGroup>
202-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
203-
</PropertyGroup>
204-
<ItemGroup>
205-
<ProjectReference Include="..\src\FSharpx.Extras\FSharpx.Extras.fsproj">
206-
<Name>FSharpx.Extras</Name>
207-
<Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
208-
<Private>False</Private>
209-
</ProjectReference>
210-
</ItemGroup>
211-
</Project>
211+
</Project>

‎docs/tools/generate.fsx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ let info =
2222
// For typical project, no changes are needed below
2323
// --------------------------------------------------------------------------------------
2424

25-
#I "../../packages/FSharp.Formatting.2.4.25/lib/net40"
26-
#I "../../packages/RazorEngine.3.3.0/lib/net40"
27-
#I "../../packages/FSharp.Compiler.Service.0.0.59/lib/net40"
28-
#r "../../packages/Microsoft.AspNet.Razor.2.0.30506.0/lib/net40/System.Web.Razor.dll"
25+
#I "../../packages/FAKE/tools/"
26+
#I "../../packages/FSharp.Formatting/lib/net40"
27+
#I "../../packages/RazorEngine/lib/net40"
28+
#I "../../packages/FSharp.Compiler.Service/lib/net40"
29+
#r "../../packages/Microsoft.AspNet.Razor/lib/net40/System.Web.Razor.dll"
2930
#r "../../packages/FAKE/tools/FakeLib.dll"
3031
#r "RazorEngine.dll"
3132
#r "FSharp.Literate.dll"
@@ -51,7 +52,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
5152
let output = __SOURCE_DIRECTORY__ @@ "../output"
5253
let files = __SOURCE_DIRECTORY__ @@ "../files"
5354
let templates = __SOURCE_DIRECTORY__ @@ "templates"
54-
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting.2.4.25/"
55+
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
5556
let docTemplate = formatting @@ "templates/docpage.cshtml"
5657

5758
// Where to look for *.csproj templates (in this order)

‎paket.dependencies‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
source https://nuget.org/api/v2
22

3+
nuget FAKE
34
nuget FsCheck @= 0.9.1.0 framework: >= net40
5+
nuget FSharp.Compiler.Service @= 0.0.59
46
nuget FSharp.Control.AsyncSeq @= 1.15.0 framework: >= net40
7+
nuget FSharp.Formatting @= 2.4.25
58
nuget FSharpx.Async @= 1.12.0 framework: >= net40
69
nuget FSharpx.Collections @= 1.10.1
710
nuget FsUnit @= 1.2.1.0 framework: >= net40
811
nuget NUnit @= 2.6.2 framework: >= net40
9-
nuget FAKE
12+
nuget NUnit.Runners @= 2.6.2 framework: >= net40
13+
nuget Microsoft.AspNet.Razor @= 2.0.30506.0
14+
nuget RazorEngine @= 3.3.0
15+

‎paket.lock‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,21 @@ NUGET
33
specs:
44
FAKE (4.11.0)
55
FsCheck (0.9.1) - framework: >= net40
6+
FSharp.Compiler.Service (0.0.59)
67
FSharp.Control.AsyncSeq (1.15.0) - framework: >= net40
78
FSharp.Core (4.0.0.1)
9+
FSharp.Formatting (2.4.25)
10+
FSharp.Compiler.Service (>= 0.0.59)
11+
Microsoft.AspNet.Razor (2.0.30506.0)
12+
RazorEngine (3.3.0)
813
FSharpx.Async (1.12.0) - framework: >= net40
914
FSharp.Control.AsyncSeq
1015
FSharpx.Collections (1.10.1)
1116
FSharp.Core (>= 3.1.2.1)
1217
FsUnit (1.2.1) - framework: >= net40
1318
NUnit (>= 2.6.2)
19+
Microsoft.AspNet.Razor (2.0.30506)
1420
NUnit (2.6.2) - framework: >= net40
21+
NUnit.Runners (2.6.2) - framework: >= net40
22+
RazorEngine (3.3.0)
23+
Microsoft.AspNet.Razor (>= 2.0.30506.0)

‎src/FSharpx.Extras/FSharpx.Extras.fsproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,15 @@
7979
<Compile Include="Net.fs" />
8080
<Compile Include="Conneg.fs" />
8181
</ItemGroup>
82+
<ItemGroup>
83+
<Reference Include="mscorlib" />
84+
<Reference Include="System" />
85+
<Reference Include="System.Core" />
86+
<Reference Include="System.Xml" />
87+
<Reference Include="System.Xml.Linq" />
88+
</ItemGroup>
8289
<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' Or $(TargetFrameworkVersion) == 'v4.6')">
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' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1')">
8491
<ItemGroup>
8592
<Reference Include="FSharp.Control.AsyncSeq">
8693
<HintPath>..\..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
@@ -100,7 +107,7 @@
100107
</Reference>
101108
</ItemGroup>
102109
</When>
103-
<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')">
110+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
104111
<ItemGroup>
105112
<Reference Include="FSharp.Core">
106113
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -156,7 +163,7 @@
156163
</When>
157164
</Choose>
158165
<Choose>
159-
<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')">
166+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
160167
<ItemGroup>
161168
<Reference Include="FSharpx.Async">
162169
<HintPath>..\..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
@@ -167,7 +174,7 @@
167174
</When>
168175
</Choose>
169176
<Choose>
170-
<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')">
177+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
171178
<ItemGroup>
172179
<Reference Include="FSharpx.Collections">
173180
<HintPath>..\..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
@@ -195,11 +202,4 @@
195202
</ItemGroup>
196203
</When>
197204
</Choose>
198-
<ItemGroup>
199-
<Reference Include="mscorlib" />
200-
<Reference Include="System" />
201-
<Reference Include="System.Core" />
202-
<Reference Include="System.Xml" />
203-
<Reference Include="System.Xml.Linq" />
204-
</ItemGroup>
205205
</Project>

‎tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,15 @@
9191
<None Include="paket.references" />
9292
</ItemGroup>
9393
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
94+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
95+
Other similar extension points exist, see Microsoft.Common.targets.
96+
<Target Name="BeforeBuild">
97+
</Target>
98+
<Target Name="AfterBuild">
99+
</Target>
100+
-->
94101
<Choose>
95-
<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')">
102+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
96103
<ItemGroup>
97104
<Reference Include="FSharp.Control.AsyncSeq">
98105
<HintPath>..\..\packages\FSharp.Control.AsyncSeq\lib\net40\FSharp.Control.AsyncSeq.dll</HintPath>
@@ -112,7 +119,7 @@
112119
</Reference>
113120
</ItemGroup>
114121
</When>
115-
<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')">
122+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
116123
<ItemGroup>
117124
<Reference Include="FSharp.Core">
118125
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath>
@@ -168,7 +175,7 @@
168175
</When>
169176
</Choose>
170177
<Choose>
171-
<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')">
178+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
172179
<ItemGroup>
173180
<Reference Include="FSharpx.Async">
174181
<HintPath>..\..\packages\FSharpx.Async\lib\net40\FSharpx.Async.dll</HintPath>
@@ -179,7 +186,7 @@
179186
</When>
180187
</Choose>
181188
<Choose>
182-
<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')">
189+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
183190
<ItemGroup>
184191
<Reference Include="FSharpx.Collections">
185192
<HintPath>..\..\packages\FSharpx.Collections\lib\net40\FSharpx.Collections.dll</HintPath>
@@ -208,7 +215,7 @@
208215
</When>
209216
</Choose>
210217
<Choose>
211-
<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')">
218+
<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 $(TargetFrameworkVersion) == 'v4.6.1')">
212219
<ItemGroup>
213220
<Reference Include="nunit.framework">
214221
<HintPath>..\..\packages\NUnit\lib\nunit.framework.dll</HintPath>
@@ -218,11 +225,4 @@
218225
</ItemGroup>
219226
</When>
220227
</Choose>
221-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
222-
Other similar extension points exist, see Microsoft.Common.targets.
223-
<Target Name="BeforeBuild">
224-
</Target>
225-
<Target Name="AfterBuild">
226-
</Target>
227-
-->
228228
</Project>

0 commit comments

Comments
 (0)