Skip to content

Commit 6f13f7e

Browse files
SteveGilhamSteveGilham
committed
Merge branch 'master' into release/Habu
2 parents 89ed261 + dbaa6d9 commit 6f13f7e

50 files changed

Lines changed: 129 additions & 123 deletions

Some content is hidden

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

‎AltCover.Avalonia/AltCover.MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<MenuItem Name="List" IsEnabled="False">
2626
<MenuItem.Header>
2727
<StackPanel>
28-
<Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGray.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
28+
<Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGrey.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
2929
</StackPanel>
3030
</MenuItem.Header>
3131
<MenuItem Header="0"></MenuItem>

‎AltCover.Tests/ShowGeneratedRunLatest.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2+
<?xml-stylesheet type="text/xsl" href="coverage.xsl" ?>
3+
<coverage profilerVersion="AltCover 7.1.7494.18954" driverVersion="AltCover.Recorder 7.1.7494.18954" startTime="2020-07-08T15:59:02.5945144Z" measureTime="2020-07-08T15:59:02.5945163Z">
4+
<module moduleId="e45f04b4-9ef2-5cde-9f2d-7439027eaa3b" name="C:\Users\steve\Documents\GitHub\altcover\_Binaries\Samples\Sample4\Debug+AnyCPU\netcoreapp2.1\Samples\Sample4.dll" assembly="Samples\Sample4" assemblyIdentity="Samples\Sample4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" excluded="false">
5+
<method name="main" class="Tests.Program" metadataToken="100663297" excluded="false" instrumented="true" fullname="System.Int32 Tests.Program.main(System.String[])">
6+
<seqpnt visitcount="0" line="63" column="16" endline="63" endcolumn="17" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
7+
</method>
8+
<method name="returnFoo" class="Tests.DU" metadataToken="100663298" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnFoo(System.Int32)">
9+
<seqpnt visitcount="1" line="51" column="21" endline="51" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
10+
</method>
11+
<method name="returnBar" class="Tests.DU" metadataToken="100663299" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnBar(System.String)">
12+
<seqpnt visitcount="1" line="52" column="21" endline="52" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
13+
</method>
14+
<method name="testMakeUnion" class="Tests.DU" metadataToken="100663300" excluded="false" instrumented="true" fullname="System.Void Tests.DU.testMakeUnion()">
15+
<seqpnt visitcount="1" line="56" column="5" endline="56" endcolumn="37" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
16+
<seqpnt visitcount="-2" line="56" column="5" endline="56" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
17+
<seqpnt visitcount="1" line="57" column="5" endline="57" endcolumn="39" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
18+
<seqpnt visitcount="-2" line="57" column="5" endline="57" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
19+
<seqpnt visitcount="1" line="58" column="5" endline="58" endcolumn="44" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
20+
<seqpnt visitcount="-2" line="58" column="5" endline="58" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
21+
</method>
22+
<method name="CompareTo" class="Tests.DU+MyUnion" metadataToken="100663314" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.CompareTo(System.Object)">
23+
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
24+
</method>
25+
<method name="CompareTo" class="Tests.DU+MyUnion" metadataToken="100663315" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.CompareTo(System.Object,System.Collections.IComparer)">
26+
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
27+
</method>
28+
<method name="GetHashCode" class="Tests.DU+MyUnion" metadataToken="100663317" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.GetHashCode()">
29+
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
30+
</method>
31+
<method name="as_bar" class="Tests.DU+MyUnion" metadataToken="100663319" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU+MyUnion.as_bar()">
32+
<seqpnt visitcount="1" line="36" column="7" endline="36" endcolumn="10" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
33+
<seqpnt visitcount="1" line="37" column="9" endline="37" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
34+
<seqpnt visitcount="1" line="38" column="20" endline="38" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
35+
<seqpnt visitcount="0" line="39" column="20" endline="39" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
36+
<seqpnt visitcount="0" line="40" column="20" endline="40" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
37+
<seqpnt visitcount="0" line="42" column="16" endline="42" endcolumn="20" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
38+
<seqpnt visitcount="0" line="43" column="7" endline="43" endcolumn="11" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
39+
<seqpnt visitcount="0" line="44" column="14" endline="44" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
40+
</method>
41+
<method name="get_MyBar" class="Tests.DU+MyUnion" metadataToken="100663320" excluded="false" instrumented="true" fullname="Microsoft.FSharp.Core.FSharpFunc`2 Tests.DU+MyUnion.get_MyBar()">
42+
<seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
43+
</method>
44+
<method name="Equals" class="Tests.DU+MyUnion" metadataToken="100663322" excluded="false" instrumented="true" fullname="System.Boolean Tests.DU+MyUnion.Equals(System.Object)">
45+
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
46+
</method>
47+
<method name="Invoke" class="Tests.DU+get_MyBar@46" metadataToken="100663340" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU+get_MyBar@44.Invoke(Microsoft.FSharp.Core.Unit)">
48+
<seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
49+
</method>
50+
<method name=".ctor" class="Tests.DU+MyClass" metadataToken="100663341" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.#ctor()">
51+
<seqpnt visitcount="0" line="49" column="27" endline="49" endcolumn="28" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
52+
<seqpnt visitcount="0" line="48" column="8" endline="48" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
53+
</method>
54+
<method name="get_Property" class="Tests.DU+MyClass" metadataToken="100663342" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyClass.get_Property()">
55+
<seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
56+
</method>
57+
<method name="set_Property" class="Tests.DU+MyClass" metadataToken="100663343" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.set_Property(System.Int32)">
58+
<seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
59+
</method>
60+
<method name="makeThing" class="Tests.M" metadataToken="100663344" excluded="false" instrumented="true" fullname="Tests.M+Thing Tests.M.makeThing(System.String)">
61+
<seqpnt visitcount="2" line="21" column="21" endline="21" endcolumn="34" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
62+
</method>
63+
<method name="testMakeThing" class="Tests.M" metadataToken="100663345" excluded="false" instrumented="true" fullname="System.Void Tests.M.testMakeThing()">
64+
<seqpnt visitcount="1" line="25" column="5" endline="25" endcolumn="43" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
65+
<seqpnt visitcount="0" line="25" column="5" endline="25" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
66+
<seqpnt visitcount="1" line="26" column="5" endline="26" endcolumn="54" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
67+
<seqpnt visitcount="0" line="26" column="5" endline="26" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
68+
</method>
69+
<method name="CompareTo" class="Tests.M+Thing" metadataToken="100663350" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.CompareTo(System.Object)">
70+
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
71+
</method>
72+
<method name="CompareTo" class="Tests.M+Thing" metadataToken="100663351" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.CompareTo(System.Object,System.Collections.IComparer)">
73+
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
74+
</method>
75+
<method name="GetHashCode" class="Tests.M+Thing" metadataToken="100663353" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.GetHashCode()">
76+
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
77+
</method>
78+
<method name="bytes" class="Tests.M+Thing" metadataToken="100663355" excluded="false" instrumented="true" fullname="System.Byte[] Tests.M+Thing.bytes()">
79+
<seqpnt visitcount="1" line="18" column="27" endline="18" endcolumn="73" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
80+
</method>
81+
<method name="Equals" class="Tests.M+Thing" metadataToken="100663357" excluded="false" instrumented="true" fullname="System.Boolean Tests.M+Thing.Equals(System.Object)">
82+
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
83+
</method>
84+
</module>
85+
</coverage>

‎AltCover.UICommon/AltCover.UICommon.fsproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<EmbeddedResource Include="Property.png" />
4848
<EmbeddedResource Include="Refresh.png" />
4949
<EmbeddedResource Include="Refresh_greyThin.png" />
50-
<EmbeddedResource Include="Report.png" />
51-
<EmbeddedResource Include="ReportStale.png" />
52-
<EmbeddedResource Include="ReportWarning.png" />
50+
<EmbeddedResource Include="RawCodeCoverageDataFile.png" />
51+
<EmbeddedResource Include="RawCodeCoverageDataFileStale.png" />
52+
<EmbeddedResource Include="RawCodeCoverageDataFileWarning.png" />
5353
<EmbeddedResource Include="Resource.eo.resx" />
5454
<EmbeddedResource Include="Resource.resx" />
5555
<EmbeddedResource Include="StatusError.png" />

‎AltCover.UICommon/Assembly.png‎

-62 Bytes
Loading

‎AltCover.UICommon/Blank.png‎

-3 Bytes
Loading

‎AltCover.UICommon/Class.png‎

-109 Bytes
Loading

‎AltCover.UICommon/Effect.png‎

-155 Bytes
Loading

‎AltCover.UICommon/Exit.png‎

-9 Bytes
Loading

‎AltCover.UICommon/ExpandDown.png‎

-58 Bytes
Loading

‎AltCover.UICommon/ExpandRight.png‎

-35 Bytes
Loading

0 commit comments

Comments
 (0)