Skip to content

Commit 72b8685

Browse files
Randall FlaggRandall Flagg
Randall Flagg
authored and
Randall Flagg
committed
Merge branch 'Development' of github.com:RandallFlagg/LogExpert into truncate-file-menu-option
# Conflicts: # src/LogExpert.sln # src/LogExpert/LogExpert.csproj
2 parents 5601fd0 + 8fba5b8 commit 72b8685

File tree

179 files changed

+1820
-20936
lines changed

Some content is hidden

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

179 files changed

+1820
-20936
lines changed

‎build/Build.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Version Version
7878
patch = AppVeyor.Instance.BuildNumber;
7979
}
8080

81-
return new Version(1, 11, 2, patch);
81+
return new Version(1, 12, 0, patch);
8282
}
8383
}
8484

‎src/ColumnizerLib/ColumnizerLib.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AppDesignerFolder>Properties</AppDesignerFolder>
66
<RootNamespace>LogExpert</RootNamespace>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
98
<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
109
<IsTestProject>false</IsTestProject>
1110
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎src/CsvColumnizer/CsvColumnizer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
using System.IO;
77
using System.Linq;
88
using System.Reflection;
9+
using System.Runtime.Versioning;
910
using System.Windows.Forms;
1011

12+
[assembly: SupportedOSPlatform("windows")]
1113
namespace CsvColumnizer
1214
{
1315
/// <summary>

‎src/CsvColumnizer/CsvColumnizer.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1111
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1212
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
13-
<NoWarn>CA1416;</NoWarn>
1413
</PropertyGroup>
1514
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1615
<Optimize>False</Optimize>

‎src/CsvColumnizer/CsvColumnizerConfigDlg.Designer.cs‎

Lines changed: 202 additions & 205 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/CsvColumnizer/CsvColumnizerConfigDlg.cs‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Drawing;
23
using System.Windows.Forms;
34

45
namespace CsvColumnizer
@@ -15,9 +16,14 @@ public partial class CsvColumnizerConfigDlg : Form
1516

1617
public CsvColumnizerConfigDlg(CsvColumnizerConfig config)
1718
{
19+
SuspendLayout();
20+
AutoScaleDimensions = new SizeF(96F, 96F);
21+
AutoScaleMode = AutoScaleMode.Dpi;
22+
1823
_config = config;
1924
InitializeComponent();
2025
FillValues();
26+
ResumeLayout();
2127
}
2228

2329
#endregion
@@ -27,23 +33,23 @@ public CsvColumnizerConfigDlg(CsvColumnizerConfig config)
2733
private void FillValues()
2834
{
2935
delimiterTextBox.Text = _config.DelimiterChar;
30-
quoteCharTextBox.Text = _config.QuoteChar.ToString();
31-
escapeCharTextBox.Text = _config.EscapeChar.ToString();
32-
escapeCheckBox.Checked = _config.EscapeChar != '\0';
33-
commentCharTextBox.Text = _config.CommentChar.ToString();
34-
fieldNamesCheckBox.Checked = _config.HasFieldNames;
35-
escapeCharTextBox.Enabled = escapeCheckBox.Checked;
36-
minColumnsNumericUpDown.Value = _config.MinColumns;
36+
textBoxQuoteChar.Text = _config.QuoteChar.ToString();
37+
textboxEscapeChar.Text = _config.EscapeChar.ToString();
38+
checkBoxEscape.Checked = _config.EscapeChar != '\0';
39+
textBoxCommentChar.Text = _config.CommentChar.ToString();
40+
checkBoxFieldNames.Checked = _config.HasFieldNames;
41+
textboxEscapeChar.Enabled = checkBoxEscape.Checked;
42+
numericUpDownMinColumns.Value = _config.MinColumns;
3743
}
3844

3945
private void RetrieveValues()
4046
{
4147
_config.DelimiterChar = delimiterTextBox.Text;
42-
_config.QuoteChar = quoteCharTextBox.Text[0];
43-
_config.EscapeChar = escapeCheckBox.Checked ? escapeCharTextBox.Text[0] : '\0';
44-
_config.CommentChar = commentCharTextBox.Text[0];
45-
_config.HasFieldNames = fieldNamesCheckBox.Checked;
46-
_config.MinColumns = (int) minColumnsNumericUpDown.Value;
48+
_config.QuoteChar = textBoxQuoteChar.Text[0];
49+
_config.EscapeChar = checkBoxEscape.Checked ? textboxEscapeChar.Text[0] : '\0';
50+
_config.CommentChar = textBoxCommentChar.Text[0];
51+
_config.HasFieldNames = checkBoxFieldNames.Checked;
52+
_config.MinColumns = (int)numericUpDownMinColumns.Value;
4753
}
4854

4955
#endregion
@@ -57,9 +63,10 @@ private void OnOkButtonClick(object sender, EventArgs e)
5763

5864
private void OnEscapeCheckBoxCheckedChanged(object sender, EventArgs e)
5965
{
60-
escapeCharTextBox.Enabled = escapeCheckBox.Checked;
66+
textboxEscapeChar.Enabled = checkBoxEscape.Checked;
6167
}
6268

6369
#endregion
70+
6471
}
6572
}

‎src/CsvColumnizer/CsvColumnizerConfigDlg.resx‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->

‎src/DefaultPlugins/DefaultPlugins.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
1111
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1212
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
13-
<NoWarn>CA1416;</NoWarn>
1413
</PropertyGroup>
1514
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1615
<Optimize>False</Optimize>

‎src/DefaultPlugins/Eminus.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
using System.IO;
77
using System.Runtime.Serialization;
88
using Newtonsoft.Json;
9+
using System.Runtime.Versioning;
910

11+
[assembly: SupportedOSPlatform("windows")]
1012
namespace LogExpert
1113
{
1214
public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator

‎src/Directory.Packages.props‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
<ItemGroup>
88
<PackageVersion Include="chocolatey" Version="2.4.1" />
99
<PackageVersion Include="CsvHelper" Version="33.0.1" />
10+
<PackageVersion Include="DockPanelSuite" Version="3.1.1" />
11+
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
1012
<PackageVersion Include="GitVersion.CommandLine" Version="5.12.0" />
1113
<PackageVersion Include="GitVersion.Core" Version="6.1.0" />
12-
<PackageVersion Include="Google.Protobuf" Version="3.29.3" />
13-
<PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
14+
<PackageVersion Include="Google.Protobuf" Version="3.30.1" />
15+
<PackageVersion Include="Grpc.AspNetCore" Version="2.70.0" />
1416
<PackageVersion Include="Grpc.Core" Version="2.46.6" />
15-
<PackageVersion Include="Grpc.Tools" Version="2.70.0" />
17+
<PackageVersion Include="Grpc.Tools" Version="2.71.0" />
1618
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
1719
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1820
<PackageVersion Include="Moq" Version="4.20.72" />
@@ -26,6 +28,8 @@
2628
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
2729
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
2830
<PackageVersion Include="System.Data.DataSetExtensions" Version="4.5.0" />
31+
<PackageVersion Include="System.Drawing.Common" Version="9.0.3" />
32+
<PackageVersion Include="System.Resources.Extensions" Version="9.0.3" />
2933
<PackageVersion Include="System.Text.Encoding" Version="4.3.0" />
3034
</ItemGroup>
3135
</Project>

0 commit comments

Comments
 (0)