Skip to content

remove Tests.Profiling #3498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build/scripts/Building.fsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#I @"../../packages/build/FAKE/tools"
#I @"../../packages/build/FSharp.Data/lib/net45"
#I @"../../packages/build/Mono.Cecil/lib/net40"
#r @"FakeLib.dll"
#r @"Mono.Cecil.dll"
#r @"FSharp.Data.dll"
#nowarn "0044" //TODO sort out FAKE 5

Expand Down
1 change: 0 additions & 1 deletion build/scripts/Documentation.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#load @"Paths.fsx"
#load @"Commandline.fsx"

open System
open System.IO

open Fake
Expand Down
154 changes: 0 additions & 154 deletions build/scripts/Profiling.fsx

This file was deleted.

13 changes: 1 addition & 12 deletions build/scripts/Projects.fsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
#I @"../../packages/build/FAKE/tools"
#r @"FakeLib.dll"
#r @"System.IO.Compression.FileSystem.dll"

open System
open System.IO
open System.Diagnostics
open System.Net

open Fake

[<AutoOpen>]
[<AutoOpen>]
module Projects =
type DotNetFrameworkIdentifier = { MSBuild: string; Nuget: string; DefineConstants: string; }

Expand Down
15 changes: 0 additions & 15 deletions build/scripts/Targets.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#load @"Documentation.fsx"
#load @"Releasing.fsx"
#load @"Benchmarking.fsx"
#load @"Profiling.fsx"
#load @"XmlDocPatcher.fsx"
#load @"Differ.fsx"
#nowarn "0044" //TODO sort out FAKE 5
Expand All @@ -23,15 +22,11 @@ open Testing
open Versioning
open Documentation
open Releasing
open Profiling
open Benchmarking
open XmlDocPatcher
open Documentation
open Commandline
open Differ
open Differ.Differ
open Fake.IO
open Octokit

Commandline.parse()

Expand All @@ -50,11 +45,6 @@ Target "FullBuild" <| fun _ -> Build.Compile Commandline.needsFullBuild

Target "Test" Tests.RunUnitTests

Target "Profile" <| fun _ ->
Profiler.Run()
let url = getBuildParam "elasticsearch"
Profiler.IndexResults url

Target "Integrate" Tests.RunIntegrationTests

Target "Benchmark" Benchmarker.Run
Expand Down Expand Up @@ -133,11 +123,6 @@ Target "GenerateReleaseNotes" Release.GenerateNotes
=?> ("Documentation", (not Commandline.skipDocs))
==> "Build"

"Start"
=?> ("Clean", Commandline.needsClean )
=?> ("FullBuild", Commandline.needsFullBuild)
==> "Profile"

"Start"
=?> ("Clean", Commandline.needsClean )
=?> ("FullBuild", Commandline.needsFullBuild)
Expand Down
3 changes: 0 additions & 3 deletions build/scripts/Testing.fsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#I @"../../packages/build/FAKE/tools"
open Fake.Core
#r @"FakeLib.dll"

#load @"Commandline.fsx"
Expand All @@ -8,10 +7,8 @@ open Fake.Core
#load @"Tooling.fsx"
#load @"Versioning.fsx"

open System.IO
open Fake
open Paths
open Projects
open Tooling
open Commandline
open Versioning
Expand Down
37 changes: 0 additions & 37 deletions build/scripts/Tooling.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ open System
open System.IO
open System.Diagnostics
open System.Net
open System.Text.RegularExpressions

#load @"Paths.fsx"

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

module Tooling =
open Paths
open Projects

(* helper functions *)
#if mono_posix
Expand Down Expand Up @@ -107,41 +105,6 @@ module Tooling =
TargetDir:string;
}

let jetBrainsTools = [{
DotTraceTool.Name = "JetBrains DotTrace Self-Profile API";
Download = "https://download-cf.jetbrains.com/resharper/JetBrains.Profiler.SelfSdk.2017.3.2.zip";
TargetDir = "dottrace-selfprofile";
};
{
DotTraceTool.Name = "JetBrains DotTrace Commandline Tools";
Download = "https://download-cf.jetbrains.com/resharper/JetBrains.dotTrace.CommandLineTools.2017.3.2.zip";
TargetDir = "dottrace-commandline";
}]

jetBrainsTools
|> Seq.iter(fun t ->
let toolName = Path.GetFileNameWithoutExtension t.Download
let buildToolsDirectory = Paths.Build("tools")
let targetDir = sprintf "%s/%s" buildToolsDirectory t.TargetDir

if (not (Directory.Exists targetDir)) then
tracefn "No %s found in %s. Downloading now" t.Name buildToolsDirectory
let zipFile = sprintf "%s/%s.zip" buildToolsDirectory toolName
use webClient = new WebClient()
webClient.DownloadFile(t.Download, zipFile)
System.IO.Compression.ZipFile.ExtractToDirectory(zipFile, targetDir)
File.Delete zipFile
tracefn "%s downloaded" t.Name
)

type ProfilerTooling(path) =
let commandLineTool = Paths.CheckedInTool((jetBrainsTools.Item 1).TargetDir)
let toolPath = commandLineTool @@ path
member this.Exec arguments = execAt Environment.CurrentDirectory toolPath arguments

let DotTraceReporter = new ProfilerTooling("Reporter.exe")
let DotTraceSnapshotStats = new ProfilerTooling("SnapshotStat.exe")

type DotNetTooling(exe) =
member this.Exec arguments =
this.ExecWithTimeout arguments (TimeSpan.FromMinutes 30.)
Expand Down
6 changes: 0 additions & 6 deletions build/scripts/Versioning.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,17 @@
#r @"System.Xml.Linq.dll"
#nowarn "0044" //TODO sort out FAKE 5

#load @"Projects.fsx"
#load @"Paths.fsx"
#load @"Commandline.fsx"

open System
open System.Diagnostics
open System.IO
open System.Xml
open System.Text.RegularExpressions
open FSharp.Data

open Fake
open AssemblyInfoFile
open SemVerHelper
open Paths
open Projects
open SemVerHelper
open Commandline

module Versioning =
Expand Down
3 changes: 1 addition & 2 deletions build/scripts/scripts.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Include="Differ.fsx" />
<None Include="Projects.fsx" />
<None Include="Paths.fsx" />
<None Include="Differ.fsx" />
<None Include="Tooling.fsx" />
<None Include="Releasing.fsx" />
<None Include="Versioning.fsx" />
<None Include="Profiling.fsx" />
<None Include="Benchmarking.fsx" />
<None Include="XmlDocPatcher.fsx" />
<None Include="Building.fsx" />
Expand Down
6 changes: 1 addition & 5 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ group build
nuget FAKE prerelease
nuget FSharp.Data
nuget Newtonsoft.Json
nuget Mono.Cecil prerelease

# persisting profiling results
nuget Nest framework: net46

nuget Octokit

nuget ILRepack 2.0.16

source https://ci.appveyor.com/nuget/assemblyrewriter
clitool assembly-rewriter
clitool assembly-rewriter
Loading