Skip to content

Commit b7c088b

Browse files
HirogenHirogen
authored
Merge pull request #361 from LogExperts/Development
Version 1.12.0
2 parents 204b0f8 + 4a7fcd0 commit b7c088b

File tree

81 files changed

+2205
-2413
lines changed

Some content is hidden

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

81 files changed

+2205
-2413
lines changed

‎.github/workflows/test_dotnet.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# This workflow will build a .NET project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
3+
4+
name: .NET
5+
6+
on:
7+
push:
8+
branches: [ "Development" ]
9+
pull_request:
10+
branches: [ "Development" ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: windows-latest
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v4
21+
with:
22+
dotnet-version: 8.0.x
23+
- name: Restore dependencies
24+
run: dotnet restore
25+
working-directory: src
26+
- name: Build
27+
run: dotnet build --no-restore
28+
working-directory: src
29+
- name: Test
30+
run: dotnet test --no-build --verbosity normal
31+
working-directory: src

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogExpert [![Build status](https://ci.appveyor.com/api/projects/status/hxwxyyxy81l4tee8/branch/master?svg=true)](https://ci.appveyor.com/project/Zarunbal/logexpert/branch/master)
1+
# LogExpert [![.NET](https://github.com/LogExperts/LogExpert/actions/workflows/test_dotnet.yml/badge.svg)](https://github.com/LogExperts/LogExpert/actions/workflows/test_dotnet.yml)
22

33
This is a clone from (no longer exists) https://logexpert.codeplex.com/
44

‎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

‎build/_build.csproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,15 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="chocolatey" Version="2.4.1" />
15-
<PackageReference Include="GitVersion.CommandLine" Version="5.12.0">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
14+
<PackageReference Include="chocolatey" Version="2.4.3" />
1915
<PackageReference Include="GitVersion.Core" Version="6.1.0" />
20-
<PackageReference Include="NuGet.CommandLine" Version="6.12.2">
16+
<PackageReference Include="NuGet.CommandLine" Version="6.13.2">
2117
<PrivateAssets>all</PrivateAssets>
2218
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2319
</PackageReference>
24-
<PackageReference Include="Nuke.Common" Version="9.0.3" />
20+
<PackageReference Include="Nuke.Common" Version="9.0.4" />
2521
<PackageReference Include="Nuke.GitHub" Version="7.0.0" />
26-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.19.0" />
22+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.19.2" />
2723
</ItemGroup>
2824

2925
<ItemGroup>

‎src/AutoColumnizer/AutoColumnizer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<AssemblyTitle>AutoColumnizer</AssemblyTitle>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
9+
<IsTestProject>false</IsTestProject>
910
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1011
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1112
</PropertyGroup>

‎src/ColumnizerLib/ColumnizerLib.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
4-
<EnableWindowsTargeting>true</EnableWindowsTargeting>
3+
<TargetFramework>net8.0</TargetFramework>
54
<OutputType>Library</OutputType>
65
<AppDesignerFolder>Properties</AppDesignerFolder>
76
<RootNamespace>LogExpert</RootNamespace>
87
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<UseWindowsForms>true</UseWindowsForms>
10-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
118
<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
9+
<IsTestProject>false</IsTestProject>
1210
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1311
<OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>
1412
<NoWarn>CS1591;</NoWarn>

‎src/ColumnizerLib/ILogExpertPluginConfigurator.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Text;
4-
using System.Windows.Forms;
54

65
namespace LogExpert
76
{
@@ -46,7 +45,7 @@ public interface ILogExpertPluginConfigurator
4645
/// </summary>
4746
/// <seealso cref="HasEmbeddedForm"/>
4847
/// <param name="parentPanel">Set this panel as the parent for you config dialog.</param>
49-
void ShowConfigForm(Panel parentPanel);
48+
void ShowConfigForm(object parentPanel);
5049

5150
/// <summary>
5251
/// Implement this function if your plugin uses an own top level dialog for the configuration (modal config dialog).
@@ -60,7 +59,7 @@ public interface ILogExpertPluginConfigurator
6059
/// </summary>
6160
/// <seealso cref="HasEmbeddedForm"/>
6261
/// <param name="owner">Set the given Form as the owner of your dialog.</param>
63-
void ShowConfigDialog(Form owner);
62+
void ShowConfigDialog(object owner);
6463

6564
/// <summary>
6665
/// This function is called when the user selects another plugin in the list. You should retrieve

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<TargetFramework>net8.0-windows</TargetFramework>
44
<EnableWindowsTargeting>true</EnableWindowsTargeting>
55
<OutputType>Library</OutputType>
6+
<IsTestProject>false</IsTestProject>
67
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
78
<UseWindowsForms>true</UseWindowsForms>
89
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
910
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1011
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1112
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12-
<NoWarn>CA1416;</NoWarn>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1515
<Optimize>False</Optimize>

0 commit comments

Comments
 (0)