Skip to content

Commit fa40d3c

Browse files
committed
Merge pull request #290 from IanSpratt/master
fixed build errors relating to previously removed DataStructures project
2 parents b084e73 + 10b9a52 commit fa40d3c

4 files changed

Lines changed: 2 additions & 148 deletions

File tree

FSharpx.sln

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.21005.1
4-
MinimumVisualStudioVersion = 10.0.40219.1
2+
# Visual Studio 2012
53
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{722621A6-FA45-4129-8B8D-94880DCD7971}"
64
ProjectSection(SolutionItems) = preProject
75
build.fsx = build.fsx
@@ -48,8 +46,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UndoSample", "samples\UndoS
4846
EndProject
4947
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DiningPhilosophers", "samples\DiningPhilosophers\DiningPhilosophers.fsproj", "{330FD61A-B9FE-4AA7-9595-F7BDAB3DDC44}"
5048
EndProject
51-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DataStructures", "samples\DataStructures\DataStructures.fsproj", "{C6835309-26A4-4718-931F-FD533E08E1D6}"
52-
EndProject
5349
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{04FE33E9-D53A-4703-B86B-C84B64958D19}"
5450
ProjectSection(SolutionItems) = preProject
5551
.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -232,21 +228,6 @@ Global
232228
{330FD61A-B9FE-4AA7-9595-F7BDAB3DDC44}.Release|Mixed Platforms.Build.0 = Release|x86
233229
{330FD61A-B9FE-4AA7-9595-F7BDAB3DDC44}.Release|x86.ActiveCfg = Release|x86
234230
{330FD61A-B9FE-4AA7-9595-F7BDAB3DDC44}.Release|x86.Build.0 = Release|x86
235-
{C6835309-26A4-4718-931F-FD533E08E1D6}.DataStructures|Any CPU.ActiveCfg = DataStructures|Any CPU
236-
{C6835309-26A4-4718-931F-FD533E08E1D6}.DataStructures|Any CPU.Build.0 = DataStructures|Any CPU
237-
{C6835309-26A4-4718-931F-FD533E08E1D6}.DataStructures|Mixed Platforms.ActiveCfg = DataStructures|Any CPU
238-
{C6835309-26A4-4718-931F-FD533E08E1D6}.DataStructures|Mixed Platforms.Build.0 = DataStructures|Any CPU
239-
{C6835309-26A4-4718-931F-FD533E08E1D6}.DataStructures|x86.ActiveCfg = DataStructures|Any CPU
240-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
241-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
242-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
243-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
244-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Debug|x86.ActiveCfg = Debug|Any CPU
245-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
246-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Release|Any CPU.Build.0 = Release|Any CPU
247-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
248-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
249-
{C6835309-26A4-4718-931F-FD533E08E1D6}.Release|x86.ActiveCfg = Release|Any CPU
250231
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.ActiveCfg = Debug|Any CPU
251232
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Any CPU.Build.0 = Debug|Any CPU
252233
{AD500A06-96ED-408C-9472-262CDC2A119B}.DataStructures|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -301,6 +282,5 @@ Global
301282
{EC2F35C2-6DC7-437B-9BD1-44DC1B6F7136} = {EFB3F0C2-10B4-4EF5-8FA7-CC39880067A1}
302283
{3939EBF0-264F-480B-BFC4-25B21C8EEB1C} = {EFB3F0C2-10B4-4EF5-8FA7-CC39880067A1}
303284
{330FD61A-B9FE-4AA7-9595-F7BDAB3DDC44} = {EFB3F0C2-10B4-4EF5-8FA7-CC39880067A1}
304-
{C6835309-26A4-4718-931F-FD533E08E1D6} = {EFB3F0C2-10B4-4EF5-8FA7-CC39880067A1}
305285
EndGlobalSection
306286
EndGlobal

src/FSharpx.Core/CSharpCompat.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Runtime.CompilerServices
88
open Microsoft.FSharp.Control.StreamReaderExtensions
99
open Microsoft.FSharp.Control.WebExtensions
1010
open FSharpx.Collections
11-
open FSharpx.DataStructures
11+
1212

1313
[<assembly:Extension>]
1414
do()

tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<Compile Include="IOTests.cs" />
7676
<Compile Include="LazyTests.cs" />
7777
<Compile Include="NonEmptyListTests.cs" />
78-
<Compile Include="RoseTreeTests.cs" />
7978
<Compile Include="StringsTests.cs" />
8079
<Compile Include="Customer.cs" />
8180
<Compile Include="DictionaryTests.cs" />

tests/FSharpx.CSharpTests/RoseTreeTests.cs

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)