Skip to content

Commit

Permalink
Merge pull request #5 from integralfx/2.0.3
Browse files Browse the repository at this point in the history
2.1.0
  • Loading branch information
integralfx authored Nov 3, 2019
2 parents 1154a4f + 34578c3 commit 6b1272e
Show file tree
Hide file tree
Showing 9 changed files with 372 additions and 132 deletions.
16 changes: 16 additions & 0 deletions MemTestHelper2/App.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
</configSections>

<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>

<appSettings>

</appSettings>

<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<targets>
<target name="logfile" xsi:type="File" fileName="memtesthelper.log" />
</targets>

<rules>
<logger name="*" minlevel="Debug" writeTo="logfile" />
</rules>
</nlog>
</configuration>
4 changes: 4 additions & 0 deletions MemTestHelper2/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura />
</Weavers>
111 changes: 111 additions & 0 deletions MemTestHelper2/FodyWeavers.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:all>
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
<xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
<xs:annotation>
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCompression" type="xs:boolean">
<xs:annotation>
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCleanup" type="xs:boolean">
<xs:annotation>
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>
35 changes: 17 additions & 18 deletions MemTestHelper2/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<GridViewColumn Header="Coverage" Width="80">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Coverage, StringFormat='f1'}"/>
<TextBlock Text="{Binding Coverage, StringFormat='f2'}"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
Expand All @@ -62,28 +62,27 @@

<TabItem Header="Settings">
<Grid Background="#252525" Margin="0">
<Label Content="X Offset:" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<mah:NumericUpDown x:Name="udXOffset" Margin="65,0,288,174" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Label Content="Y Offset:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="163,0,0,0"/>
<mah:NumericUpDown x:Name="udYOffset" Margin="228,0,125,174" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Button x:Name="btnCentre" Content="Centre" HorizontalAlignment="Left" Margin="333,0,0,0" VerticalAlignment="Top" Width="105" Height="26" Click="btnCentre_Click"/>
<Label Content="X Spacing:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,31,0,0"/>
<mah:NumericUpDown x:Name="udXSpacing" Margin="65,31,288,143" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Label Content="Y Spacing:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="163,31,0,0"/>
<mah:NumericUpDown x:Name="udYSpacing" Margin="228,31,125,143" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<ComboBox x:Name="cboRows" HorizontalAlignment="Left" Margin="378,31,0,0" VerticalAlignment="Top" Width="60" SelectionChanged="cboRows_SelectionChanged"/>
<Label x:Name="___No_Name_" Content="Rows:" HorizontalAlignment="Left" Margin="333,31,0,0" VerticalAlignment="Top"/>
<TextBox x:Name="txtStopAt" HorizontalAlignment="Left" Height="25" Margin="85,62,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40" MaxLength="4" MinHeight="20" IsEnabled="False"/>
<CheckBox x:Name="chkStopAtTotal" Content="Total" HorizontalAlignment="Left" Margin="130,69,0,0" VerticalAlignment="Top" IsEnabled="False"/>
<CheckBox x:Name="chkStopAt" Content="Stop at %:" HorizontalAlignment="Left" Margin="3,69,0,0" VerticalAlignment="Top" Checked="chkStopAt_Checked" Unchecked="chkStopAt_Unchecked"/>
<CheckBox x:Name="chkStopOnError" Content="Stop on error" HorizontalAlignment="Left" Margin="219,69,0,0" VerticalAlignment="Top" IsChecked="True"/>
<CheckBox x:Name="chkStartMin" Content="Start minimised" HorizontalAlignment="Left" Margin="332,69,0,0" VerticalAlignment="Top" IsChecked="True"/>
<Label Content="X Offset:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,5,0,0"/>
<mah:NumericUpDown x:Name="udXOffset" Margin="67,5,286,169" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Label Content="Y Offset:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="161,5,0,0"/>
<mah:NumericUpDown x:Name="udYOffset" Margin="226,5,127,169" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Button x:Name="btnCentre" Content="Centre" HorizontalAlignment="Left" Margin="328,5,0,0" VerticalAlignment="Top" Width="105" Height="26" Click="btnCentre_Click"/>
<Label Content="X Spacing:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,36,0,0"/>
<mah:NumericUpDown x:Name="udXSpacing" Margin="67,36,286,138" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<Label Content="Y Spacing:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="161,36,0,0"/>
<mah:NumericUpDown x:Name="udYSpacing" Margin="226,36,127,138" HasDecimals="False" NumericInputMode="Numbers" Maximum="9999" Minimum="-9999" Value="0" ValueChanged="Offset_Changed"/>
<ComboBox x:Name="cboRows" HorizontalAlignment="Left" Margin="373,36,0,0" VerticalAlignment="Top" Width="60" SelectionChanged="cboRows_SelectionChanged"/>
<Label x:Name="___No_Name_" Content="Rows:" HorizontalAlignment="Left" Margin="322,36,0,0" VerticalAlignment="Top"/>
<TextBox x:Name="txtStopAt" HorizontalAlignment="Left" Height="25" Margin="87,67,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="40" MaxLength="4" MinHeight="20" IsEnabled="False"/>
<CheckBox x:Name="chkStopAt" Content="Stop at %:" HorizontalAlignment="Left" Margin="7,74,0,0" VerticalAlignment="Top" Checked="chkStopAt_Checked" Unchecked="chkStopAt_Unchecked"/>
<CheckBox x:Name="chkStopOnError" Content="Stop on error" HorizontalAlignment="Left" Margin="166,74,0,0" VerticalAlignment="Top" IsChecked="True"/>
<CheckBox x:Name="chkStartMin" Content="Start minimised" HorizontalAlignment="Left" Margin="328,74,0,0" VerticalAlignment="Top" IsChecked="True"/>
</Grid>
</TabItem>

<TabItem Header="About">
<Grid Background="#252525" Margin="0">
<Label Content="Version 2.0.2" HorizontalAlignment="Center" Margin="180,70,180,104" VerticalAlignment="Center"/>
<Label x:Name="lblVersion" HorizontalAlignment="Center" Margin="180,70,180,104" VerticalAlignment="Center"/>
<Label Content="Discord:" HorizontalAlignment="Center" Margin="138,98,248,76" VerticalAlignment="Center"/>
<TextBox x:Name="txtDiscord" HorizontalAlignment="Left" Margin="190,98,0,0" TextWrapping="Wrap"
Text="∫ntegral#7834" VerticalAlignment="Top" IsReadOnly="True" Width="89" PreviewMouseDoubleClick="txtDiscord_DoubleClick"/>
Expand Down
Loading

0 comments on commit 6b1272e

Please sign in to comment.