Skip to content

Commit db01cbf

Browse files
auduchinokauduchinok
committed
Remove DotParser sources, clean up Paket dependencies
1 parent 0fdf341 commit db01cbf

File tree

86 files changed

+254
-19381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+254
-19381
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ publish/
150150
!**/packages/build/
151151
# If using the old MSBuild-Integrated Package Restore, uncomment this:
152152
#!**/packages/repositories.config
153+
!lib/**
153154

154155
# Windows Azure Build Output
155156
csx/

‎QuickGraph.sln

-48
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickGraph.Tests", "tests\Q
5555
EndProject
5656
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickGraph.Perf", "tests\QuickGraph.Perf\QuickGraph.Perf.csproj", "{2C35D329-D1F8-4862-8DA2-F2D27E8D4DB7}"
5757
EndProject
58-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotParser", "src\DotParser\DotParser.fsproj", "{8826810A-DC59-46E6-8978-21E273DB1236}"
59-
EndProject
60-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DotParser", "DotParser", "{278F278F-6F15-4CAE-9665-A068A795A222}"
61-
EndProject
6258
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "YC.FST", "YC.FST", "{2E664E5C-14E3-4AA2-A336-7209544C78F0}"
6359
EndProject
6460
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "QuickGraph.FSA", "src\QuickGraph.FSA\QuickGraph.FSA.fsproj", "{BD5D18DE-1C9D-4314-A777-21AA683EEACE}"
@@ -69,8 +65,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "QuickGraph.FST.Tests", "tes
6965
EndProject
7066
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "QuickGraph.FST", "src\QuickGraph.FST\QuickGraph.FST.fsproj", "{4B220E23-A7E0-4222-83F5-C785F7C66B33}"
7167
EndProject
72-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "DotParser.Tests", "tests\DotParser.Tests\DotParser.Tests.fsproj", "{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}"
73-
EndProject
7468
Global
7569
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7670
Debug|Any CPU = Debug|Any CPU
@@ -285,26 +279,6 @@ Global
285279
{2C35D329-D1F8-4862-8DA2-F2D27E8D4DB7}.ReleaseContractsReferences|Any CPU.Build.0 = Release|Any CPU
286280
{2C35D329-D1F8-4862-8DA2-F2D27E8D4DB7}.ReleaseContractsReferences|x86.ActiveCfg = Release|Any CPU
287281
{2C35D329-D1F8-4862-8DA2-F2D27E8D4DB7}.ReleaseContractsReferences|x86.Build.0 = Release|Any CPU
288-
{8826810A-DC59-46E6-8978-21E273DB1236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
289-
{8826810A-DC59-46E6-8978-21E273DB1236}.Debug|Any CPU.Build.0 = Debug|Any CPU
290-
{8826810A-DC59-46E6-8978-21E273DB1236}.Debug|x86.ActiveCfg = Debug|Any CPU
291-
{8826810A-DC59-46E6-8978-21E273DB1236}.Debug|x86.Build.0 = Debug|Any CPU
292-
{8826810A-DC59-46E6-8978-21E273DB1236}.DebugContracts|Any CPU.ActiveCfg = Debug|Any CPU
293-
{8826810A-DC59-46E6-8978-21E273DB1236}.DebugContracts|Any CPU.Build.0 = Debug|Any CPU
294-
{8826810A-DC59-46E6-8978-21E273DB1236}.DebugContracts|x86.ActiveCfg = Debug|Any CPU
295-
{8826810A-DC59-46E6-8978-21E273DB1236}.DebugContracts|x86.Build.0 = Debug|Any CPU
296-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release|Any CPU.ActiveCfg = Release|Any CPU
297-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release|Any CPU.Build.0 = Release|Any CPU
298-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release|x86.ActiveCfg = Release|Any CPU
299-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release|x86.Build.0 = Release|Any CPU
300-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release20|Any CPU.ActiveCfg = Release|Any CPU
301-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release20|Any CPU.Build.0 = Release|Any CPU
302-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release20|x86.ActiveCfg = Release|Any CPU
303-
{8826810A-DC59-46E6-8978-21E273DB1236}.Release20|x86.Build.0 = Release|Any CPU
304-
{8826810A-DC59-46E6-8978-21E273DB1236}.ReleaseContractsReferences|Any CPU.ActiveCfg = Release|Any CPU
305-
{8826810A-DC59-46E6-8978-21E273DB1236}.ReleaseContractsReferences|Any CPU.Build.0 = Release|Any CPU
306-
{8826810A-DC59-46E6-8978-21E273DB1236}.ReleaseContractsReferences|x86.ActiveCfg = Release|Any CPU
307-
{8826810A-DC59-46E6-8978-21E273DB1236}.ReleaseContractsReferences|x86.Build.0 = Release|Any CPU
308282
{BD5D18DE-1C9D-4314-A777-21AA683EEACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
309283
{BD5D18DE-1C9D-4314-A777-21AA683EEACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
310284
{BD5D18DE-1C9D-4314-A777-21AA683EEACE}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -385,26 +359,6 @@ Global
385359
{4B220E23-A7E0-4222-83F5-C785F7C66B33}.ReleaseContractsReferences|Any CPU.Build.0 = Release|Any CPU
386360
{4B220E23-A7E0-4222-83F5-C785F7C66B33}.ReleaseContractsReferences|x86.ActiveCfg = Release|Any CPU
387361
{4B220E23-A7E0-4222-83F5-C785F7C66B33}.ReleaseContractsReferences|x86.Build.0 = Release|Any CPU
388-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
389-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
390-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Debug|x86.ActiveCfg = Debug|Any CPU
391-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Debug|x86.Build.0 = Debug|Any CPU
392-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.DebugContracts|Any CPU.ActiveCfg = Debug|Any CPU
393-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.DebugContracts|Any CPU.Build.0 = Debug|Any CPU
394-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.DebugContracts|x86.ActiveCfg = Debug|Any CPU
395-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.DebugContracts|x86.Build.0 = Debug|Any CPU
396-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
397-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release|Any CPU.Build.0 = Release|Any CPU
398-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release|x86.ActiveCfg = Release|Any CPU
399-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release|x86.Build.0 = Release|Any CPU
400-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release20|Any CPU.ActiveCfg = Release|Any CPU
401-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release20|Any CPU.Build.0 = Release|Any CPU
402-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release20|x86.ActiveCfg = Release|Any CPU
403-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.Release20|x86.Build.0 = Release|Any CPU
404-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.ReleaseContractsReferences|Any CPU.ActiveCfg = Release|Any CPU
405-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.ReleaseContractsReferences|Any CPU.Build.0 = Release|Any CPU
406-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.ReleaseContractsReferences|x86.ActiveCfg = Release|Any CPU
407-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4}.ReleaseContractsReferences|x86.Build.0 = Release|Any CPU
408362
EndGlobalSection
409363
GlobalSection(SolutionProperties) = preSolution
410364
HideSolutionNode = FALSE
@@ -420,12 +374,10 @@ Global
420374
{1CCAFD2C-4A61-4F7F-986C-A2F575086344} = {DD28733B-860A-4FE6-8D68-119EB179F90E}
421375
{61DF76E1-DE2B-4DF1-AD5F-89939AB06693} = {22937B93-4129-4F68-AB14-F7AFE020BA8F}
422376
{2C35D329-D1F8-4862-8DA2-F2D27E8D4DB7} = {22937B93-4129-4F68-AB14-F7AFE020BA8F}
423-
{8826810A-DC59-46E6-8978-21E273DB1236} = {278F278F-6F15-4CAE-9665-A068A795A222}
424377
{BD5D18DE-1C9D-4314-A777-21AA683EEACE} = {2E664E5C-14E3-4AA2-A336-7209544C78F0}
425378
{3BF3542B-4034-429F-9105-197A60625CA3} = {22937B93-4129-4F68-AB14-F7AFE020BA8F}
426379
{6B141FDE-F5DF-4DFD-B21F-C076BC87CCAF} = {22937B93-4129-4F68-AB14-F7AFE020BA8F}
427380
{4B220E23-A7E0-4222-83F5-C785F7C66B33} = {2E664E5C-14E3-4AA2-A336-7209544C78F0}
428-
{C2F89DE1-B429-4B5D-AF22-3A075D00BAA4} = {278F278F-6F15-4CAE-9665-A068A795A222}
429381
EndGlobalSection
430382
GlobalSection(TestCaseManagementSettings) = postSolution
431383
CategoryFile = QuickGraph1.vsmdi

‎build.fsx

+5-8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ let gitName = "QuickGraph"
6666
// The url for the raw files hosted
6767
let gitRaw = environVarOrDefault "gitRaw" "https://raw.github.com/YaccConstructor"
6868

69+
let MSBuild12 = (ProgramFilesX86 @@ @"\MSBuild\12.0\Bin")
70+
let MSBuild14 = (ProgramFilesX86 @@ @"\MSBuild\14.0\Bin")
71+
do setEnvironVar "MSBuild" (if (Directory.Exists(MSBuild12)) then MSBuild12 else MSBuild14)
72+
6973
// --------------------------------------------------------------------------------------
7074
// END TODO: The rest of the file includes standard build steps
7175
// --------------------------------------------------------------------------------------
@@ -159,12 +163,6 @@ Target "RunNUnitTests" (fun _ ->
159163
ProcessModel = SeparateProcessModel })
160164
)
161165

162-
Target "RunDotParserTests" (fun _ ->
163-
!! "tests/DotParser.Tests/bin/Release/DotParser.Tests.dll"
164-
|> NUnit3 (fun p -> NUnit3Defaults)
165-
)
166-
167-
168166
#if MONO
169167
#else
170168
// --------------------------------------------------------------------------------------
@@ -344,10 +342,9 @@ Target "All" DoNothing
344342
"Clean"
345343
==> "AssemblyInfo"
346344
==> "Build"
347-
//==> "CopyBinaries"
345+
==> "CopyBinaries"
348346
==> "RunMSTests"
349347
==> "RunNUnitTests"
350-
==> "RunDotParserTests"
351348
==> "GenerateReferenceDocs"
352349
==> "GenerateDocs"
353350
==> "All"

‎paket.dependencies

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
source https://nuget.org/api/v2
22

3-
nuget Accordion 1.0.0 framework: >= net40
4-
nuget AvalonEdit
3+
nuget DotNet.Contracts 1.10.10126.4
4+
nuget DotParser
55
nuget FSharp.Formatting
6-
nuget FsLexYacc 6.1.0
6+
nuget FSharpx.Collections
77
nuget FSPowerPack.Core.Community 3.0.0.0 framework: >= net45
8-
nuget FSharpx.Core 1.8.41
98
nuget Microsoft.Net.Compilers
10-
nuget Mono.Addins 1.2 framework: >= net452
11-
nuget Nuget.CommandLine
129
nuget FAKE
1310
nuget NUnit
1411
nuget NUnit.Runners
15-
nuget QuickGraphPCL 3.6.61114.2
1612
nuget SourceLink.Fake
17-
nuget YAXLib 2.13 framework: >= net40
18-
nuget YC.FsYARD 0.1.5033.0 framework: >= net45
1913

20-
github fsharp/FAKE modules/Octokit/Octokit.fsx
21-
github fsprojects/FsUnit src/FsUnit.NUnit/FsUnit.fs
14+
github fsharp/FAKE modules/Octokit/Octokit.fsx

‎paket.lock

+28-35
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,45 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
3-
specs:
4-
Accordion (1.0) - framework: >= net40
5-
AvalonEdit (5.0.2)
6-
FAKE (4.25.5)
3+
DotNet.Contracts (1.10.10126.4)
4+
DotParser (1.0.2)
5+
FSharp.Core
6+
FSPowerPack.Core.Community
7+
FAKE (4.29.2)
78
FSharp.Compiler.Service (2.0.0.6)
8-
FSharp.Formatting (2.14.2)
9+
FSharp.Core (4.0.0.1)
10+
FSharp.Formatting (2.14.4)
911
FSharp.Compiler.Service (2.0.0.6)
1012
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
1113
FSharpVSPowerTools.Core (2.3)
1214
FSharp.Compiler.Service (>= 2.0.0.3)
13-
FSharpx.Core (1.8.41)
14-
FsLexYacc (6.1)
15-
FsLexYacc.Runtime (>= 6.1)
16-
FsLexYacc.Runtime (6.1)
17-
FSPowerPack.Core.Community (3.0) - framework: >= net45
15+
FSharpx.Collections (1.15.1)
16+
FSharp.Core
17+
FSPowerPack.Core.Community (3.0)
1818
Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
1919
Microsoft.Bcl.Build (>= 1.0.14)
2020
Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
21-
Microsoft.Net.Compilers (1.2.1)
21+
Microsoft.Net.Compilers (1.3.2)
2222
Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
2323
Microsoft.Bcl (>= 1.1.10)
2424
Microsoft.Bcl.Build (>= 1.0.14)
25-
Mono.Addins (1.2) - framework: >= net452
26-
NuGet.CommandLine (3.4.3)
27-
NUnit (3.2.1)
28-
NUnit.ConsoleRunner (3.2.1)
29-
NUnit.Extension.NUnitProjectLoader (3.2.1)
30-
NUnit.Extension.NUnitV2Driver (3.2.1)
31-
NUnit.Extension.NUnitV2ResultWriter (3.2.1)
32-
NUnit.Extension.VSProjectLoader (3.2.1)
33-
NUnit.Runners (3.2.1)
34-
NUnit.ConsoleRunner (3.2.1)
35-
NUnit.Extension.NUnitProjectLoader (3.2.1)
36-
NUnit.Extension.NUnitV2Driver (3.2.1)
37-
NUnit.Extension.NUnitV2ResultWriter (3.2.1)
38-
NUnit.Extension.VSProjectLoader (3.2.1)
39-
Octokit (0.19)
25+
NUnit (3.4.1)
26+
NUnit.ConsoleRunner (3.4.1)
27+
NUnit.Extension.NUnitProjectLoader (3.4.1)
28+
NUnit.Extension.NUnitV2Driver (3.4.1)
29+
NUnit.Extension.NUnitV2ResultWriter (3.4.1)
30+
NUnit.Extension.TeamCityEventListener (1.0.1)
31+
NUnit.Extension.VSProjectLoader (3.4.1)
32+
NUnit.Runners (3.4.1)
33+
NUnit.ConsoleRunner (>= 3.4.1)
34+
NUnit.Extension.NUnitProjectLoader (>= 3.4.1)
35+
NUnit.Extension.NUnitV2Driver (>= 3.4.1)
36+
NUnit.Extension.NUnitV2ResultWriter (>= 3.4.1)
37+
NUnit.Extension.TeamCityEventListener (>= 1.0.1)
38+
NUnit.Extension.VSProjectLoader (>= 3.4.1)
39+
Octokit (0.20)
4040
Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
41-
QuickGraphPCL (3.6.61114.2)
4241
SourceLink.Fake (1.1)
43-
YAXLib (2.13) - framework: >= net40
44-
YC.FsYARD (0.1.5033) - framework: >= net45
4542
GITHUB
4643
remote: fsharp/FAKE
47-
specs:
48-
modules/Octokit/Octokit.fsx (32e262c11174b196dc8af16a577c8c3aa0ab0b2b)
49-
Octokit
50-
remote: fsprojects/FsUnit
51-
specs:
52-
src/FsUnit.NUnit/FsUnit.fs (43086ca8981c7642c1067ad5e9de80caf73ba4ec)
44+
modules/Octokit/Octokit.fsx (c56456abac6b744c3bb95b217687db19fd19b367)
45+
Octokit (>= 0.20)

‎src/DotParser/AssemblyInfo.fs

-13
This file was deleted.

‎src/DotParser/DotGrammar.yrd

-74
This file was deleted.

‎src/DotParser/DotLexer.fsl

-51
This file was deleted.

0 commit comments

Comments
 (0)