Skip to content

Commit 667c4e9

Browse files
HirogenHirogen
authored
Merge pull request #430 from RandallFlagg/solution_organize
Organize solution and project files to be more streamlined
2 parents 8568e73 + 7e8783a commit 667c4e9

41 files changed

Lines changed: 136 additions & 631 deletions

File tree

Some content is hidden

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

‎build/Build.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ protected override void OnBuildInitialized()
245245
{
246246
Log.Information($"AssemblyVersion {VersionString}\r\nAssemblyFileVersion {VersionFileString}\r\nAssemblyInformationalVersion {VersionInformationString}");
247247

248-
AbsolutePath assemblyVersion = SourceDirectory / "Solution Items" / "AssemblyVersion.cs";
248+
AbsolutePath assemblyInfo = SourceDirectory / "Solution Items" / "AssemblyInfo.cs";
249249

250-
string text = assemblyVersion.ReadAllText();
250+
string text = assemblyInfo.ReadAllText();
251251
Regex configurationRegex = AssemblyConfiguration();
252252
Regex assemblyVersionRegex = AssemblyVersion();
253253
Regex assemblyFileVersionRegex = AssemblyFileVersion();
@@ -258,11 +258,11 @@ protected override void OnBuildInitialized()
258258
text = assemblyFileVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionFileString));
259259
text = assemblyInformationalVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionInformationString));
260260

261-
Log.Verbose("Content of AssemblyVersion file");
261+
Log.Verbose("Content of AssemblyInfo.cs file");
262262
Log.Verbose(text);
263263
Log.Verbose("End of Content");
264264

265-
assemblyVersion.WriteAllText(text);
265+
assemblyInfo.WriteAllText(text);
266266

267267
SourceDirectory.GlobFiles("**sftp-plugin/*.cs").ForEach(file =>
268268
{

‎build/_build.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
6-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
76
<RootNamespace></RootNamespace>
87
<IsPackable>False</IsPackable>
98
<NoWarn>CS0649;CS0169</NoWarn>

‎src/AutoColumnizer/AutoColumnizer.csproj‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
4-
<OutputType>Library</OutputType>
5-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
4+
65
<AssemblyTitle>AutoColumnizer</AssemblyTitle>
7-
<SignAssembly>true</SignAssembly>
8-
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
9-
<IsTestProject>false</IsTestProject>
10-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
116
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
127
</PropertyGroup>
13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14-
<Optimize>False</Optimize>
15-
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17-
<Optimize>True</Optimize>
18-
</PropertyGroup>
19-
20-
<ItemGroup>
21-
<Compile Include="..\Solution Items\AssemblyVersion.cs">
22-
<Link>Properties\AssemblyVersion.cs</Link>
23-
</Compile>
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<None Include="..\Solution Items\Key.snk">
28-
<Link>Key.snk</Link>
29-
</None>
30-
</ItemGroup>
318

329
<ItemGroup>
3310
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />

‎src/AutoColumnizer/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net8.0</TargetFramework>
4-
<OutputType>Library</OutputType>
4+
55
<IsTestProject>true</IsTestProject>
6-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
76
<AssemblyTitle>ColumnizerLib.UnitTests</AssemblyTitle>
87
<Company>Microsoft</Company>
9-
<Product>ColumnizerLib.UnitTests</Product>
10-
<Copyright>Copyright © Microsoft 2018</Copyright>
11-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
12-
<FileVersion>1.0.0.0</FileVersion>
13-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
148
<OutputPath>bin\$(Configuration)</OutputPath>
159
</PropertyGroup>
1610
<ItemGroup>

‎src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/ColumnizerLib/ColumnizerLib.csproj‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFramework>net8.0</TargetFramework>
4-
<OutputType>Library</OutputType>
5-
<AppDesignerFolder>Properties</AppDesignerFolder>
6-
<RootNamespace>LogExpert</RootNamespace>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
86
<DocumentationFile>$(SolutionDir)..\bin\Docs\ColumnizerLib.xml</DocumentationFile>
9-
<IsTestProject>false</IsTestProject>
10-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
11-
<OutputPath>$(SolutionDir)..\bin\$(Configuration)</OutputPath>
127
</PropertyGroup>
13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14-
<Optimize>False</Optimize>
15-
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17-
<Optimize>True</Optimize>
18-
</PropertyGroup>
19-
<PropertyGroup>
20-
<SignAssembly>true</SignAssembly>
21-
</PropertyGroup>
22-
<PropertyGroup>
23-
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
24-
</PropertyGroup>
25-
<ItemGroup>
26-
<Compile Include="..\Solution Items\AssemblyVersion.cs">
27-
<Link>Properties\AssemblyVersion.cs</Link>
28-
</Compile>
29-
</ItemGroup>
30-
<ItemGroup>
31-
<None Include="..\Solution Items\Key.snk">
32-
<Link>Key.snk</Link>
33-
</None>
34-
</ItemGroup>
8+
359
</Project>

‎src/ColumnizerLib/ColumnizerLib.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Columnizer Lib for Logexpert plugins</description>
1313
<releaseNotes>See https://github.com/zarunbal/LogExpert/releases/tag/v$version$</releaseNotes>
14-
<copyright>Copyright 2019</copyright>
14+
<copyright>Copyright 2025</copyright>
1515
<tags>LogExpert Columnizer</tags>
1616
</metadata>
1717
</package>

‎src/CsvColumnizer/CsvColumnizer.csproj‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,21 @@
22
<PropertyGroup>
33
<TargetFramework>net8.0-windows</TargetFramework>
44
<EnableWindowsTargeting>true</EnableWindowsTargeting>
5-
<OutputType>Library</OutputType>
6-
<IsTestProject>false</IsTestProject>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
5+
86
<UseWindowsForms>true</UseWindowsForms>
97
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
10-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
118
<OutputPath>$(SolutionDir)..\bin\$(Configuration)\plugins</OutputPath>
129
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
10+
<AssemblyTitle>CsvColumnizer</AssemblyTitle>
1311
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
15-
<Optimize>False</Optimize>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18-
<Optimize>True</Optimize>
19-
</PropertyGroup>
20-
<PropertyGroup>
21-
<SignAssembly>true</SignAssembly>
22-
</PropertyGroup>
23-
<PropertyGroup>
24-
<AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
25-
</PropertyGroup>
26-
<ItemGroup>
27-
<Compile Include="..\Solution Items\AssemblyVersion.cs">
28-
<Link>Properties\AssemblyVersion.cs</Link>
29-
</Compile>
30-
</ItemGroup>
12+
3113
<ItemGroup>
3214
<ProjectReference Include="..\ColumnizerLib\ColumnizerLib.csproj" />
3315
</ItemGroup>
34-
<ItemGroup>
35-
<None Include="..\Solution Items\Key.snk">
36-
<Link>Key.snk</Link>
37-
</None>
38-
</ItemGroup>
16+
3917
<ItemGroup>
4018
<PackageReference Include="CsvHelper" />
4119
<PackageReference Include="Newtonsoft.Json" />
4220
</ItemGroup>
43-
<PropertyGroup>
44-
<AssemblyTitle>CsvColumnizer</AssemblyTitle>
45-
</PropertyGroup>
21+
4622
</Project>

‎src/CsvColumnizer/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)