Skip to content

Commit 1f9e3b0

Browse files
committed
remove Tests.Profiling (#3498)
* remove Tests.Profiling * clean up build dependencies (cherry picked from commit 806afa3)
1 parent 5cb6a78 commit 1f9e3b0

File tree

12 files changed

+160
-330
lines changed

12 files changed

+160
-330
lines changed

build/scripts/Building.fsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#I @"../../packages/build/FAKE/tools"
22
#I @"../../packages/build/FSharp.Data/lib/net45"
3-
#I @"../../packages/build/Mono.Cecil/lib/net40"
43
#r @"FakeLib.dll"
5-
#r @"Mono.Cecil.dll"
64
#r @"FSharp.Data.dll"
75
#nowarn "0044" //TODO sort out FAKE 5
86

build/scripts/Documentation.fsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#load @"Paths.fsx"
66
#load @"Commandline.fsx"
77

8-
open System
98
open System.IO
109

1110
open Fake

build/scripts/Profiling.fsx

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

build/scripts/Projects.fsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
#I @"../../packages/build/FAKE/tools"
2-
#r @"FakeLib.dll"
3-
#r @"System.IO.Compression.FileSystem.dll"
4-
5-
open System
6-
open System.IO
7-
open System.Diagnostics
8-
open System.Net
9-
10-
open Fake
11-
12-
[<AutoOpen>]
1+
[<AutoOpen>]
132
module Projects =
143
type DotNetFrameworkIdentifier = { MSBuild: string; Nuget: string; DefineConstants: string; }
154

build/scripts/Targets.fsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#load @"Documentation.fsx"
99
#load @"Releasing.fsx"
1010
#load @"Benchmarking.fsx"
11-
#load @"Profiling.fsx"
1211
#load @"XmlDocPatcher.fsx"
1312
#load @"Differ.fsx"
1413
#nowarn "0044" //TODO sort out FAKE 5
@@ -23,13 +22,10 @@ open Testing
2322
open Versioning
2423
open Documentation
2524
open Releasing
26-
open Profiling
2725
open Benchmarking
2826
open XmlDocPatcher
29-
open Documentation
3027
open Commandline
3128
open Differ
32-
open Differ.Differ
3329
open Fake.IO
3430

3531
Commandline.parse()
@@ -49,11 +45,6 @@ Target "FullBuild" <| fun _ -> Build.Compile Commandline.needsFullBuild
4945

5046
Target "Test" Tests.RunUnitTests
5147

52-
Target "Profile" <| fun _ ->
53-
Profiler.Run()
54-
let url = getBuildParam "elasticsearch"
55-
Profiler.IndexResults url
56-
5748
Target "Integrate" Tests.RunIntegrationTests
5849

5950
Target "Benchmark" Benchmarker.Run
@@ -124,11 +115,6 @@ Target "GenerateReleaseNotes" Release.GenerateNotes
124115
=?> ("Documentation", (not Commandline.skipDocs))
125116
==> "Build"
126117

127-
"Start"
128-
=?> ("Clean", Commandline.needsClean )
129-
=?> ("FullBuild", Commandline.needsFullBuild)
130-
==> "Profile"
131-
132118
"Start"
133119
=?> ("Clean", Commandline.needsClean )
134120
=?> ("FullBuild", Commandline.needsFullBuild)

build/scripts/Testing.fsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#I @"../../packages/build/FAKE/tools"
2-
open Fake.Core
32
#r @"FakeLib.dll"
43

54
#load @"Commandline.fsx"
@@ -8,10 +7,8 @@ open Fake.Core
87
#load @"Tooling.fsx"
98
#load @"Versioning.fsx"
109

11-
open System.IO
1210
open Fake
1311
open Paths
14-
open Projects
1512
open Tooling
1613
open Commandline
1714
open Versioning

build/scripts/Tooling.fsx

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ open System
77
open System.IO
88
open System.Diagnostics
99
open System.Net
10-
open System.Text.RegularExpressions
1110

1211
#load @"Paths.fsx"
1312

@@ -17,7 +16,6 @@ Fake.ProcessHelper.redirectOutputToTrace <-true
1716

1817
module Tooling =
1918
open Paths
20-
open Projects
2119

2220
(* helper functions *)
2321
#if mono_posix
@@ -107,41 +105,6 @@ module Tooling =
107105
TargetDir:string;
108106
}
109107

110-
let jetBrainsTools = [{
111-
DotTraceTool.Name = "JetBrains DotTrace Self-Profile API";
112-
Download = "https://download-cf.jetbrains.com/resharper/JetBrains.Profiler.SelfSdk.2017.3.2.zip";
113-
TargetDir = "dottrace-selfprofile";
114-
};
115-
{
116-
DotTraceTool.Name = "JetBrains DotTrace Commandline Tools";
117-
Download = "https://download-cf.jetbrains.com/resharper/JetBrains.dotTrace.CommandLineTools.2017.3.2.zip";
118-
TargetDir = "dottrace-commandline";
119-
}]
120-
121-
jetBrainsTools
122-
|> Seq.iter(fun t ->
123-
let toolName = Path.GetFileNameWithoutExtension t.Download
124-
let buildToolsDirectory = Paths.Build("tools")
125-
let targetDir = sprintf "%s/%s" buildToolsDirectory t.TargetDir
126-
127-
if (not (Directory.Exists targetDir)) then
128-
tracefn "No %s found in %s. Downloading now" t.Name buildToolsDirectory
129-
let zipFile = sprintf "%s/%s.zip" buildToolsDirectory toolName
130-
use webClient = new WebClient()
131-
webClient.DownloadFile(t.Download, zipFile)
132-
System.IO.Compression.ZipFile.ExtractToDirectory(zipFile, targetDir)
133-
File.Delete zipFile
134-
tracefn "%s downloaded" t.Name
135-
)
136-
137-
type ProfilerTooling(path) =
138-
let commandLineTool = Paths.CheckedInTool((jetBrainsTools.Item 1).TargetDir)
139-
let toolPath = commandLineTool @@ path
140-
member this.Exec arguments = execAt Environment.CurrentDirectory toolPath arguments
141-
142-
let DotTraceReporter = new ProfilerTooling("Reporter.exe")
143-
let DotTraceSnapshotStats = new ProfilerTooling("SnapshotStat.exe")
144-
145108
type DotNetTooling(exe) =
146109
member this.Exec arguments =
147110
this.ExecWithTimeout arguments (TimeSpan.FromMinutes 30.)

build/scripts/Versioning.fsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,17 @@
55
#r @"System.Xml.Linq.dll"
66
#nowarn "0044" //TODO sort out FAKE 5
77

8-
#load @"Projects.fsx"
98
#load @"Paths.fsx"
109
#load @"Commandline.fsx"
1110

1211
open System
1312
open System.Diagnostics
1413
open System.IO
15-
open System.Xml
16-
open System.Text.RegularExpressions
1714
open FSharp.Data
1815

1916
open Fake
20-
open AssemblyInfoFile
2117
open SemVerHelper
2218
open Paths
23-
open Projects
24-
open SemVerHelper
2519
open Commandline
2620

2721
module Versioning =

build/scripts/scripts.fsproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<None Include="Differ.fsx" />
76
<None Include="Projects.fsx" />
87
<None Include="Paths.fsx" />
8+
<None Include="Differ.fsx" />
99
<None Include="Tooling.fsx" />
1010
<None Include="Releasing.fsx" />
1111
<None Include="Versioning.fsx" />
12-
<None Include="Profiling.fsx" />
1312
<None Include="Benchmarking.fsx" />
1413
<None Include="XmlDocPatcher.fsx" />
1514
<None Include="Building.fsx" />

paket.dependencies

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ group build
66

77
nuget FAKE prerelease
88
nuget FSharp.Data
9-
nuget Mono.Cecil prerelease
9+
nuget Newtonsoft.Json
1010

11-
# persisting profiling results
12-
nuget Nest ~> 5.5 framework: net45
13-
1411
nuget Octokit
1512

1613
nuget ILRepack 2.0.16

0 commit comments

Comments
 (0)