-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into release/Fukurou
# Conflicts: # appveyor.yml
- Loading branch information
Showing
106 changed files
with
2,786 additions
and
648 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| language: csharp | ||
| mono: latest | ||
| dist: xenial | ||
| dotnet: 2.1.701 | ||
| dotnet: 2.1.801 | ||
| addons: | ||
| apt: | ||
| sources: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| namespace AltCover.Recorder | ||
|
|
||
| open System.Collections.Generic | ||
|
|
||
| #if DEBUG | ||
| module Adapter = | ||
| let DoPause() = Instance.DoPause null | ||
| let DoResume() = Instance.DoResume null | ||
| let VisitsClear() = Instance.Visits.Clear() | ||
| let SamplesClear() = Instance.Samples.Clear() | ||
| let FlushAll() = Instance.FlushFinish () | ||
| let Reset () = | ||
| Instance.IsRunner <- false | ||
| Instance.Visits.Clear() | ||
| Instance.Samples.Clear() | ||
|
|
||
| let internal prepareName name = | ||
| if name | ||
| |> Instance.Visits.ContainsKey | ||
| |> not | ||
| then | ||
| let entry = Dictionary<int, PointVisit>() | ||
| Instance.Visits.Add(name, entry) | ||
|
|
||
| let VisitsAdd name line number = | ||
| prepareName name | ||
| let v = PointVisit.Init number [] | ||
| Instance.Visits.[name].Add(line, v) | ||
|
|
||
| let VisitsAddTrack name line number = | ||
| prepareName name | ||
| let v1 = PointVisit.Init number [ Call 17 | ||
| Call 42 ] | ||
| Instance.Visits.[name].Add(line, v1) | ||
|
|
||
| let v2 = PointVisit.Init (number + 1L) [ Time 17L | ||
| Both(42L, 23) ] | ||
| Instance.Visits.[name].Add(line + 1, v2) | ||
|
|
||
| let VisitsSeq() = Instance.Visits |> Seq.cast<obj> | ||
| let VisitsEntrySeq key = Instance.Visits.[key] |> Seq.cast<obj> | ||
| let VisitCount key key2 = (Instance.Visits.[key].[key2]).Count | ||
| let Lock = Instance.Visits :> obj | ||
|
|
||
| let VisitImplNone moduleId hitPointId = | ||
| Instance.VisitImpl moduleId hitPointId Track.Null | ||
| let VisitImplMethod moduleId hitPointId mId = | ||
| Instance.VisitImpl moduleId hitPointId (Call mId) | ||
|
|
||
| let AddSample moduleId hitPointId = | ||
| Instance.TakeSample Sampling.Single moduleId hitPointId | ||
| let AddSampleUnconditional moduleId hitPointId = | ||
| Instance.TakeSample Sampling.All moduleId hitPointId | ||
| let internal NewBoth time track = Both(time, track) | ||
| let internal Call track = Call track | ||
| let internal Time at = Time at | ||
| let internal untime at = | ||
| let r = List<System.Int64>() | ||
| match at with | ||
| | Time t ->r.Add(t) | ||
| | _ -> () | ||
| r | ||
| let internal Null () = Null | ||
| let internal Table t = Table t | ||
| let internal untable t = | ||
| let r = List<System.Object>() | ||
| match t with | ||
| | (n, p, Table d) -> r.Add(n) | ||
| r.Add(p) | ||
| r.Add(d) | ||
| | _ -> () | ||
| r | ||
|
|
||
| let internal DoFlush visits format report output = | ||
| let output' = //if System.String.IsNullOrEmpty output | ||
| //then None // this case gets tested elsewhere | ||
| (*else*) Some output | ||
| Counter.DoFlush ignore (fun _ _ -> ()) true visits format report output' | ||
| let internal UpdateReport counts format coverageFile outputFile = | ||
| Counter.UpdateReport ignore (fun _ _ -> ()) true counts format coverageFile outputFile | ||
| let internal PayloadSelector x = Instance.PayloadSelector (fun _ -> x) | ||
| let internal PayloadControl x y = Instance.PayloadControl (fun _ -> x) (fun _ -> y) | ||
| let internal PayloadSelection x y z = Instance.PayloadSelection (fun _ -> x) (fun _ -> y) (fun _ -> z) | ||
|
|
||
| let internal ProcessExit() = ProcessExit | ||
|
|
||
| #if MONO | ||
| let internal MakeNullTrace name = { Tracer = name | ||
| Stream = null | ||
| Formatter = null | ||
| Runner = false | ||
| Definitive = false } | ||
| let internal MakeStreamTrace s1 = { Tracer = null | ||
| Stream = new System.IO.MemoryStream() | ||
| Formatter = new System.IO.BinaryWriter(s1) | ||
| Runner = true | ||
| Definitive = false } | ||
| #endif | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="ILMerge" version="3.0.29" targetFramework="net452" /> | ||
| <package id="FSharp.Core" version="3.0.2" targetFramework="net35" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.