Merge pull request #222 from Hirogen/v1.8.7-json-options

V1.8.7 version update
zarunbal · Jun 17, 2022 · 036f05c · 036f05c
2 parents c12bd2d + 0c8f1c4
commit 036f05c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 49 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -73,7 +73,7 @@ Version Version
     {
         get
         {
-            int patch = 0;
+            int patch = 7;
 
             if (AppVeyor.Instance != null)
             {

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -1,48 +1,48 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <RootNamespace></RootNamespace>
-    <IsPackable>False</IsPackable>
-    <NoWarn>CS0649;CS0169</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="chocolatey" Version="0.10.14" />
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <RootNamespace></RootNamespace>
+    <IsPackable>False</IsPackable>
+    <NoWarn>CS0649;CS0169</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="chocolatey" Version="0.10.14" />
     <PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NuGet.CommandLine" Version="5.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Nuke.Common" Version="0.21.2" />
-    <PackageReference Include="Nuke.GitHub" Version="1.5.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
-    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
-    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
-    <None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
-    <None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
-    <None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
-
-    <!-- Common build related files -->
-    <None Include="..\build.ps1" />
-    <None Include="..\build.sh" />
-    <None Include="..\.nuke" />
-    <None Include="..\global.json" Condition="Exists('..\global.json')" />
-    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
-    <None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
-    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
-    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
-    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
-    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
-  </ItemGroup>
-
-</Project>
+    </PackageReference>
+    <PackageReference Include="NuGet.CommandLine" Version="5.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Nuke.Common" Version="0.21.2" />
+    <PackageReference Include="Nuke.GitHub" Version="1.5.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
+    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
+    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
+    <None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
+    <None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
+    <None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
+
+    <!-- Common build related files -->
+    <None Include="..\build.ps1" />
+    <None Include="..\build.sh" />
+    <None Include="..\.nuke" />
+    <None Include="..\global.json" Condition="Exists('..\global.json')" />
+    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
+    <None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
+    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
+    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
+    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
+    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs
@@ -867,11 +867,15 @@ private void columnButton_Click(object sender, EventArgs e)
         private void dataGridView_CellContextMenuStripNeeded(object sender,
             DataGridViewCellContextMenuStripNeededEventArgs e)
         {
-            if (e.RowIndex > 0 && e.RowIndex < dataGridView.RowCount
+            if (e.RowIndex >= 0 && e.RowIndex < dataGridView.RowCount
                                && !dataGridView.Rows[e.RowIndex].Selected)
             {
                 SelectLine(e.RowIndex, false, true);
             }
+            else if (e.RowIndex < 0)
+            {
+                e.ContextMenuStrip = columnContextMenuStrip;
+            }
 
             if (e.ContextMenuStrip == columnContextMenuStrip)
             {

diff --git a/src/Solution Items/AssemblyVersion.cs b/src/Solution Items/AssemblyVersion.cs
@@ -5,8 +5,8 @@
 [assembly: AssemblyProduct("LogExpert")]
 [assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2017 Zarunbal")]
 
-[assembly: AssemblyVersion("1.8.0")]
+[assembly: AssemblyVersion("1.8.7")]
 [assembly: AssemblyFileVersion("1.8.0")]
-[assembly: AssemblyInformationalVersion("1.8.0")]
+[assembly: AssemblyInformationalVersion("1.8.7")]
 
 [assembly: ComVisible(false)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ Version Version @@
         {
             get
             {
-                int patch = 0;
+                int patch = 7;
                 if (AppVeyor.Instance != null)
                 {
@@ Expand Down @@