Skip to content

Organize solution and project files to be more streamlined #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hirogen merged 1 commit into from
Jun 21, 2025
Merged

Organize solution and project files to be more streamlined #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ protected override void OnBuildInitialized()
{
Log.Information($"AssemblyVersion {VersionString}\r\nAssemblyFileVersion {VersionFileString}\r\nAssemblyInformationalVersion {VersionInformationString}");

AbsolutePath assemblyVersion = SourceDirectory / "Solution Items" / "AssemblyVersion.cs";
AbsolutePath assemblyInfo = SourceDirectory / "Solution Items" / "AssemblyInfo.cs";

string text = assemblyVersion.ReadAllText();
string text = assemblyInfo.ReadAllText();
Regex configurationRegex = AssemblyConfiguration();
Regex assemblyVersionRegex = AssemblyVersion();
Regex assemblyFileVersionRegex = AssemblyFileVersion();
Expand All @@ -258,11 +258,11 @@ protected override void OnBuildInitialized()
text = assemblyFileVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionFileString));
text = assemblyInformationalVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionInformationString));

Log.Verbose("Content of AssemblyVersion file");
Log.Verbose("Content of AssemblyInfo.cs file");
Log.Verbose(text);
Log.Verbose("End of Content");

assemblyVersion.WriteAllText(text);
assemblyInfo.WriteAllText(text);

SourceDirectory.GlobFiles("**sftp-plugin/*.cs").ForEach(file =>
{
Expand Down
1 change: 0 additions & 1 deletion build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace>
<IsPackable>False</IsPackable>
<NoWarn>CS0649;CS0169</NoWarn>
Expand Down
25 changes: 1 addition & 24 deletions src/AutoColumnizer/AutoColumnizer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

<AssemblyTitle>AutoColumnizer</AssemblyTitle>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
<IsTestProject>false</IsTestProject>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions src/AutoColumnizer/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>

<IsTestProject>true</IsTestProject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AssemblyTitle>ColumnizerLib.UnitTests</AssemblyTitle>
<Company>Microsoft</Company>
<Product>ColumnizerLib.UnitTests</Product>
<Copyright>Copyright © Microsoft 2018</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup>
<ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

32 changes: 3 additions & 29 deletions src/ColumnizerLib/ColumnizerLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LogExpert</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
<IsTestProject>false</IsTestProject>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ColumnizerLib/ColumnizerLib.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Columnizer Lib for Logexpert plugins</description>
<releaseNotes>See https://github.com/zarunbal/LogExpert/releases/tag/v$version$</releaseNotes>
<copyright>Copyright 2019</copyright>
<copyright>Copyright 2025</copyright>
<tags>LogExpert Columnizer</tags>
</metadata>
</package>
34 changes: 5 additions & 29 deletions src/CsvColumnizer/CsvColumnizer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,21 @@
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<OutputType>Library</OutputType>
<IsTestProject>false</IsTestProject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyTitle>CsvColumnizer</AssemblyTitle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<PropertyGroup>
<AssemblyTitle>CsvColumnizer</AssemblyTitle>
</PropertyGroup>

</Project>
6 changes: 0 additions & 6 deletions src/CsvColumnizer/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

33 changes: 3 additions & 30 deletions src/DefaultPlugins/DefaultPlugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableWindowsTargeting>False</EnableWindowsTargeting>
<OutputType>Library</OutputType>
<IsTestProject>false</IsTestProject>
<RootNamespace>LogExpert</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>False</UseWindowsForms>
<ImportWindowsDesktopTargets>False</ImportWindowsDesktopTargets>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
Expand Down
32 changes: 30 additions & 2 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,33 @@
<InformationalVersion>2.0.0.0-rc1</InformationalVersion>
<Authors>Hirogen, zarunbal, RandallFlagg, TheNicker</Authors>
<Company>Log Expert</Company>
</PropertyGroup>
</Project>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
<PublishAot>false</PublishAot>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LogExpert</RootNamespace>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<!--<OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>--><!--TODO: Normalize this across solution-->
<SignAssembly>true</SignAssembly>
<Optimize Condition="'$(Configuration)' == 'Release'">true</Optimize>
<Product>LogExpert</Product>
<Copyright>Copyright © LogExpert 2025</Copyright>
<IsTestProject>false</IsTestProject>
<UseWindowsForms>false</UseWindowsForms>
<ImportWindowsDesktopTargets>false</ImportWindowsDesktopTargets>
<EnableWindowsTargeting>false</EnableWindowsTargeting>

<AssemblyTitle>FIX ME - AssemblyTitle!</AssemblyTitle>
<Description>FIX ME - Description!</Description>
</PropertyGroup>

<ItemGroup Label="Links">
<Compile Include="..\Solution Items\AssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
<None Include="..\Solution Items\Key.snk" Link="Key.snk" />
</ItemGroup>

</Project>

33 changes: 4 additions & 29 deletions src/FlashIconHighlighter/FlashIconHighlighter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<OutputType>Library</OutputType>
<IsTestProject>false</IsTestProject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

</Project>
35 changes: 5 additions & 30 deletions src/GlassfishColumnizer/GlassfishColumnizer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>
<IsTestProject>false</IsTestProject>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
<AssemblyTitle>GlassfishColumnizer</AssemblyTitle>
<Description>Glassfish logfile support for LogExpert</Description>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>False</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Solution Items\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\Solution Items\Key.snk">
<Link>Key.snk</Link>
</None>
</ItemGroup>
<PropertyGroup>
<AssemblyTitle>GlassfishColumnizer</AssemblyTitle>
<Description>Glassfish logfile support for LogExpert</Description>
</PropertyGroup>

</Project>
6 changes: 0 additions & 6 deletions src/GlassfishColumnizer/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading
Loading