Skip to content

Commit

Permalink
Merge branch 'master' into release/Habu
Browse files Browse the repository at this point in the history
  • Loading branch information
@SteveGilham
SteveGilham committed Mar 10, 2022
2 parents 89ed261 + dbaa6d9 commit 6f13f7e
Show file tree
Hide file tree
Showing 50 changed files with 129 additions and 123 deletions.
2 changes: 1 addition & 1 deletion AltCover.Avalonia/AltCover.MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<MenuItem Name="List" IsEnabled="False">
<MenuItem.Header>
<StackPanel>
<Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGray.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
<Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGrey.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
</StackPanel>
</MenuItem.Header>
<MenuItem Header="0"></MenuItem>
Expand Down
85 changes: 85 additions & 0 deletions AltCover.Tests/ShowGeneratedRunLatest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="coverage.xsl" ?>
<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">
<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">
<method name="main" class="Tests.Program" metadataToken="100663297" excluded="false" instrumented="true" fullname="System.Int32 Tests.Program.main(System.String[])">
<seqpnt visitcount="0" line="63" column="16" endline="63" endcolumn="17" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="returnFoo" class="Tests.DU" metadataToken="100663298" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnFoo(System.Int32)">
<seqpnt visitcount="1" line="51" column="21" endline="51" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="returnBar" class="Tests.DU" metadataToken="100663299" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnBar(System.String)">
<seqpnt visitcount="1" line="52" column="21" endline="52" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="testMakeUnion" class="Tests.DU" metadataToken="100663300" excluded="false" instrumented="true" fullname="System.Void Tests.DU.testMakeUnion()">
<seqpnt visitcount="1" line="56" column="5" endline="56" endcolumn="37" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="-2" line="56" column="5" endline="56" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="1" line="57" column="5" endline="57" endcolumn="39" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="-2" line="57" column="5" endline="57" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="1" line="58" column="5" endline="58" endcolumn="44" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="-2" line="58" column="5" endline="58" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="CompareTo" class="Tests.DU+MyUnion" metadataToken="100663314" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.CompareTo(System.Object)">
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<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)">
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="GetHashCode" class="Tests.DU+MyUnion" metadataToken="100663317" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.GetHashCode()">
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="as_bar" class="Tests.DU+MyUnion" metadataToken="100663319" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU+MyUnion.as_bar()">
<seqpnt visitcount="1" line="36" column="7" endline="36" endcolumn="10" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="1" line="37" column="9" endline="37" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="1" line="38" column="20" endline="38" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="39" column="20" endline="39" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="40" column="20" endline="40" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="42" column="16" endline="42" endcolumn="20" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="43" column="7" endline="43" endcolumn="11" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="44" column="14" endline="44" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<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()">
<seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="Equals" class="Tests.DU+MyUnion" metadataToken="100663322" excluded="false" instrumented="true" fullname="System.Boolean Tests.DU+MyUnion.Equals(System.Object)">
<seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="Invoke" class="Tests.DU+get_MyBar@46" metadataToken="100663340" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion [email protected](Microsoft.FSharp.Core.Unit)">
<seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name=".ctor" class="Tests.DU+MyClass" metadataToken="100663341" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.#ctor()">
<seqpnt visitcount="0" line="49" column="27" endline="49" endcolumn="28" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="48" column="8" endline="48" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="get_Property" class="Tests.DU+MyClass" metadataToken="100663342" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyClass.get_Property()">
<seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="set_Property" class="Tests.DU+MyClass" metadataToken="100663343" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.set_Property(System.Int32)">
<seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="makeThing" class="Tests.M" metadataToken="100663344" excluded="false" instrumented="true" fullname="Tests.M+Thing Tests.M.makeThing(System.String)">
<seqpnt visitcount="2" line="21" column="21" endline="21" endcolumn="34" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="testMakeThing" class="Tests.M" metadataToken="100663345" excluded="false" instrumented="true" fullname="System.Void Tests.M.testMakeThing()">
<seqpnt visitcount="1" line="25" column="5" endline="25" endcolumn="43" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="25" column="5" endline="25" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="1" line="26" column="5" endline="26" endcolumn="54" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
<seqpnt visitcount="0" line="26" column="5" endline="26" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="CompareTo" class="Tests.M+Thing" metadataToken="100663350" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.CompareTo(System.Object)">
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<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)">
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="GetHashCode" class="Tests.M+Thing" metadataToken="100663353" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.GetHashCode()">
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="bytes" class="Tests.M+Thing" metadataToken="100663355" excluded="false" instrumented="true" fullname="System.Byte[] Tests.M+Thing.bytes()">
<seqpnt visitcount="1" line="18" column="27" endline="18" endcolumn="73" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
<method name="Equals" class="Tests.M+Thing" metadataToken="100663357" excluded="false" instrumented="true" fullname="System.Boolean Tests.M+Thing.Equals(System.Object)">
<seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
</method>
</module>
</coverage>
6 changes: 3 additions & 3 deletions AltCover.UICommon/AltCover.UICommon.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
<EmbeddedResource Include="Property.png" />
<EmbeddedResource Include="Refresh.png" />
<EmbeddedResource Include="Refresh_greyThin.png" />
<EmbeddedResource Include="Report.png" />
<EmbeddedResource Include="ReportStale.png" />
<EmbeddedResource Include="ReportWarning.png" />
<EmbeddedResource Include="RawCodeCoverageDataFile.png" />
<EmbeddedResource Include="RawCodeCoverageDataFileStale.png" />
<EmbeddedResource Include="RawCodeCoverageDataFileWarning.png" />
<EmbeddedResource Include="Resource.eo.resx" />
<EmbeddedResource Include="Resource.resx" />
<EmbeddedResource Include="StatusError.png" />
Expand Down
Binary file modified AltCover.UICommon/Assembly.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Blank.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Class.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Effect.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Exit.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/ExpandDown.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/ExpandRight.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Font.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions AltCover.UICommon/Icons.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ type Icons<'TIcon>(toIcon: System.IO.Stream -> 'TIcon) =
//with
//| x -> System.InvalidOperationException(name, x) |> raise

member self.Report = makeIcon "Report"
member self.Report = makeIcon "RawCodeCoverageDataFile"

member self.ReportDated =
makeIcon "ReportStale"
makeIcon "RawCodeCoverageDataFileStale"

member self.ReportWarning =
makeIcon "ReportWarning"
makeIcon "RawCodeCoverageDataFileWarning"

member self.Assembly = makeIcon "Assembly"
member self.Event = makeIcon "Event"
Expand All @@ -49,7 +49,7 @@ type Icons<'TIcon>(toIcon: System.IO.Stream -> 'TIcon) =
makeIcon "MethodWarning"

member self.MethodNoSource =
makeIcon "MissingMethod"
makeIcon "MethodMissing"

member self.Branched =
makeIcon "BranchFork_grn"
Expand Down
Binary file modified AltCover.UICommon/MethodMissing.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/MissingFile.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Module.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Namespace.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/OpenFile.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/Property.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added AltCover.UICommon/RawCodeCoverageDataFile.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added AltCover.UICommon/RawCodeCoverageDataFileStale.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added AltCover.UICommon/RawCodeCoverageDataFileWarning.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed AltCover.UICommon/Report.png
View file
Binary file not shown.
Binary file removed AltCover.UICommon/ReportStale.png
View file
Binary file not shown.
Binary file removed AltCover.UICommon/ReportWarning.png
View file
Binary file not shown.
Binary file modified AltCover.UICommon/StatusError.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 1 addition & 13 deletions AltCover.UICommon/StatusError.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/StatusError_32.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions AltCover.UICommon/StatusError_32.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified AltCover.UICommon/StatusInformation.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 1 addition & 13 deletions AltCover.UICommon/StatusInformation.svg
View file
8 changes: 1 addition & 7 deletions AltCover.UICommon/StatusInformation_32.svg
View file
14 changes: 1 addition & 13 deletions AltCover.UICommon/StatusWarning.svg
View file

0 comments on commit 6f13f7e

Please sign in to comment.