Skip to content

Commit ff397f6

Browse files
HirogenHirogen
authored
Merge branch 'Development' into editorconfig_optimizations
2 parents c8f3e53 + 1fd4864 commit ff397f6

39 files changed

Lines changed: 891 additions & 842 deletions

‎src/AutoColumnizer/AutoColumnizer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<AssemblyTitle>AutoColumnizer</AssemblyTitle>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
9-
<IsTestProject>false</IsTestProject>
9+
<IsTestProject>false</IsTestProject>
1010
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1111
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1212
</PropertyGroup>

‎src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<OutputType>Library</OutputType>
55
<IsTestProject>true</IsTestProject>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎src/DefaultPlugins/DefaultPlugins.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
4-
<EnableWindowsTargeting>true</EnableWindowsTargeting>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<EnableWindowsTargeting>False</EnableWindowsTargeting>
55
<OutputType>Library</OutputType>
6-
<IsTestProject>false</IsTestProject>
6+
<IsTestProject>false</IsTestProject>
77
<RootNamespace>LogExpert</RootNamespace>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<UseWindowsForms>true</UseWindowsForms>
10-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
9+
<UseWindowsForms>False</UseWindowsForms>
10+
<ImportWindowsDesktopTargets>False</ImportWindowsDesktopTargets>
1111
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1212
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1313
</PropertyGroup>

‎src/DefaultPlugins/ProcessLauncher.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace LogExpert
44
{
5-
public class ProcessLauncher : IKeywordAction
5+
//TODO: Not in use
6+
internal class ProcessLauncher : IKeywordAction
67
{
78
#region Properties
89

‎src/GlassfishColumnizer/GlassfishColumnizer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<OutputType>Library</OutputType>
5-
<IsTestProject>false</IsTestProject>
5+
<IsTestProject>false</IsTestProject>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
88
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>

‎src/JsonColumnizer/JsonColumnizer.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +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>
4+
<EnableWindowsTargeting>false</EnableWindowsTargeting>
55
<OutputType>Library</OutputType>
6-
<IsTestProject>false</IsTestProject>
6+
<IsTestProject>false</IsTestProject>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<UseWindowsForms>true</UseWindowsForms>
9-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
8+
<UseWindowsForms>false</UseWindowsForms>
9+
<ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
1010
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1111
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1212
</PropertyGroup>

‎src/JsonCompactColumnizer/JsonCompactColumnizer.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
4-
<EnableWindowsTargeting>true</EnableWindowsTargeting>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<EnableWindowsTargeting>false</EnableWindowsTargeting>
55
<OutputType>Library</OutputType>
6-
<IsTestProject>false</IsTestProject>
6+
<IsTestProject>false</IsTestProject>
77
<RootNamespace>JsonColumnizer</RootNamespace>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<UseWindowsForms>true</UseWindowsForms>
10-
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
9+
<UseWindowsForms>false</UseWindowsForms>
10+
<ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
1111
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1212
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
1313
</PropertyGroup>

‎src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net8.0-windows</TargetFramework>
44
<EnableWindowsTargeting>true</EnableWindowsTargeting>
55
<OutputType>Library</OutputType>
6-
<IsTestProject>false</IsTestProject>
6+
<IsTestProject>false</IsTestProject>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
88
<UseWindowsForms>true</UseWindowsForms>
99
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

‎src/LogExpert.Core/Classes/Filter/Filter.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using LogExpert.Core.Callback;
22
using LogExpert.Core.Classes;
33
using LogExpert.Core.Classes.Filter;
4-
54
using NLog;
65

76
namespace LogExpert.Classes.Filter

‎src/LogExpert.Core/Config/ColorMode.cs‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,34 +74,5 @@ private static void SetBrightMode()
7474
InactiveTabColor = LessBrightBackgroundColor;
7575
DarkModeEnabled = false;
7676
}
77-
78-
#region TitleBarDarkMode
79-
[DllImport("dwmapi.dll")]
80-
private static extern int DwmSetWindowAttribute(nint hwnd, int attr, ref int attrValue, int attrSize);
81-
82-
private const int DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19;
83-
private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20;
84-
85-
public static bool UseImmersiveDarkMode(nint handle, bool enabled)
86-
{
87-
88-
var attribute = DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1;
89-
if (IsWindows10OrGreater(18985))
90-
{
91-
attribute = DWMWA_USE_IMMERSIVE_DARK_MODE;
92-
}
93-
94-
int useImmersiveDarkMode = enabled ? 1 : 0;
95-
return DwmSetWindowAttribute(handle, attribute, ref useImmersiveDarkMode, sizeof(int)) == 0;
96-
97-
}
98-
99-
private static bool IsWindows10OrGreater(int build = -1)
100-
{
101-
return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build;
102-
}
103-
104-
#endregion TitleBarDarkMode
105-
10677
}
10778
}

0 commit comments

Comments
 (0)