From 7e8783a31c958dcc2bd22aa557e2fe9137432ed4 Mon Sep 17 00:00:00 2001 From: Randall Flagg Date: Fri, 20 Jun 2025 01:51:37 +0300 Subject: [PATCH] Organize solution and project files to be more streamlined --- build/Build.cs | 8 +-- build/_build.csproj | 1 - src/AutoColumnizer/AutoColumnizer.csproj | 25 +-------- src/AutoColumnizer/Properties/AssemblyInfo.cs | 6 --- .../ColumnizerLib.UnitTests.csproj | 8 +-- .../Properties/AssemblyInfo.cs | 13 ----- src/ColumnizerLib/ColumnizerLib.csproj | 32 ++---------- src/ColumnizerLib/ColumnizerLib.nuspec | 2 +- src/CsvColumnizer/CsvColumnizer.csproj | 34 ++---------- src/CsvColumnizer/Properties/AssemblyInfo.cs | 6 --- src/DefaultPlugins/DefaultPlugins.csproj | 33 ++---------- src/Directory.Build.props | 32 +++++++++++- .../FlashIconHighlighter.csproj | 33 ++---------- .../GlassfishColumnizer.csproj | 35 ++----------- .../Properties/AssemblyInfo.cs | 6 --- src/JsonColumnizer/JsonColumnizer.csproj | 37 ++----------- src/JsonColumnizer/Properties/AssemblyInfo.cs | 6 --- .../JsonCompactColumnizer.csproj | 36 ++----------- .../Properties/AssemblyInfo.cs | 6 --- .../Log4jXmlColumnizer.csproj | 30 ++--------- src/LogExpert.Core/LogExpert.Core.csproj | 14 ----- src/LogExpert.Core/Properties/AssemblyInfo.cs | 3 ++ .../LogExpert.Resources.csproj | 13 ----- src/LogExpert.Tests/LogExpert.Tests.csproj | 49 +++++++----------- .../Properties/AssemblyInfo.cs | 10 ---- src/LogExpert.UI/LogExpert.UI.csproj | 22 +++----- src/LogExpert.sln | 4 +- src/LogExpert/LogExpert.csproj | 20 ------- src/LogExpert/Properties/AssemblyInfo.cs | 1 - .../LogExpert.PluginRegistry.csproj | 15 +----- .../Properties/AssemblyInfo.cs | 12 ----- .../RegexColumnizer.UnitTests.csproj | 15 +++--- src/RegexColumnizer/RegexColumnizer.csproj | 31 ++--------- .../Columnizer/Properties/AssemblyInfo.cs | 36 ------------- .../Properties/AssemblyInfo.cs | 36 ------------- .../Properties/AssemblyInfo.cs | 6 --- .../SftpFileSystemx64.csproj | 37 +++---------- .../Properties/AssemblyInfo.cs | 6 --- .../SftpFileSystemx86.csproj | 23 ++------ .../{AssemblyVersion.cs => AssemblyInfo.cs} | 25 ++++----- src/Solution Items/Key.Public.snk | Bin 0 -> 160 bytes 41 files changed, 136 insertions(+), 631 deletions(-) delete mode 100644 src/AutoColumnizer/Properties/AssemblyInfo.cs delete mode 100644 src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs delete mode 100644 src/CsvColumnizer/Properties/AssemblyInfo.cs delete mode 100644 src/GlassfishColumnizer/Properties/AssemblyInfo.cs delete mode 100644 src/JsonColumnizer/Properties/AssemblyInfo.cs delete mode 100644 src/JsonCompactColumnizer/Properties/AssemblyInfo.cs create mode 100644 src/LogExpert.Core/Properties/AssemblyInfo.cs delete mode 100644 src/LogExpert.Tests/Properties/AssemblyInfo.cs delete mode 100644 src/LogExpert/Properties/AssemblyInfo.cs delete mode 100644 src/RegexColumnizer.UnitTests/Properties/AssemblyInfo.cs delete mode 100644 src/SDK/Columnizer/Columnizer/Properties/AssemblyInfo.cs delete mode 100644 src/SDK/Log4jXmlColumnizer/Properties/AssemblyInfo.cs delete mode 100644 src/SftpFileSystemx64/Properties/AssemblyInfo.cs delete mode 100644 src/SftpFileSystemx86/Properties/AssemblyInfo.cs rename src/Solution Items/{AssemblyVersion.cs => AssemblyInfo.cs} (86%) create mode 100644 src/Solution Items/Key.Public.snk diff --git a/build/Build.cs b/build/Build.cs index fc83e858..0e700887 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -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(); @@ -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 => { diff --git a/build/_build.csproj b/build/_build.csproj index d11d75f7..d024e268 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -3,7 +3,6 @@ Exe net8.0 - false False CS0649;CS0169 diff --git a/src/AutoColumnizer/AutoColumnizer.csproj b/src/AutoColumnizer/AutoColumnizer.csproj index e77962e3..3f5dd983 100644 --- a/src/AutoColumnizer/AutoColumnizer.csproj +++ b/src/AutoColumnizer/AutoColumnizer.csproj @@ -1,33 +1,10 @@  net8.0 - Library - false + AutoColumnizer - true - ..\Solution Items\Key.snk - false - false $(SolutionDir)..\bin\$(Configuration)\plugins - - False - - - True - - - - - Properties\AssemblyVersion.cs - - - - - - Key.snk - - diff --git a/src/AutoColumnizer/Properties/AssemblyInfo.cs b/src/AutoColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index 59b88e6a..00000000 --- a/src/AutoColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b57259a3-4ed7-4f8b-a252-29e799a56b9e")] \ No newline at end of file diff --git a/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj b/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj index 339b9ce6..af5aa1ac 100644 --- a/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj +++ b/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj @@ -1,16 +1,10 @@  net8.0 - Library + true - false ColumnizerLib.UnitTests Microsoft - ColumnizerLib.UnitTests - Copyright © Microsoft 2018 - 1.0.0.0 - 1.0.0.0 - false bin\$(Configuration) diff --git a/src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs b/src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5496df04..00000000 --- a/src/ColumnizerLib.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0dbbcbef-4a91-4031-aeab-b7eee802f496")] diff --git a/src/ColumnizerLib/ColumnizerLib.csproj b/src/ColumnizerLib/ColumnizerLib.csproj index c341d269..960aa76e 100644 --- a/src/ColumnizerLib/ColumnizerLib.csproj +++ b/src/ColumnizerLib/ColumnizerLib.csproj @@ -1,35 +1,9 @@  + net8.0 - Library - Properties - LogExpert - false + $(SolutionDir)..\bin\Docs\ColumnizerLib.xml - false - false - $(SolutionDir)..\bin\$(Configuration) - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - - - - Key.snk - - + diff --git a/src/ColumnizerLib/ColumnizerLib.nuspec b/src/ColumnizerLib/ColumnizerLib.nuspec index 043d6dcf..99e650fe 100644 --- a/src/ColumnizerLib/ColumnizerLib.nuspec +++ b/src/ColumnizerLib/ColumnizerLib.nuspec @@ -11,7 +11,7 @@ false Columnizer Lib for Logexpert plugins See https://github.com/zarunbal/LogExpert/releases/tag/v$version$ - Copyright 2019 + Copyright 2025 LogExpert Columnizer \ No newline at end of file diff --git a/src/CsvColumnizer/CsvColumnizer.csproj b/src/CsvColumnizer/CsvColumnizer.csproj index 070afa9e..4e54cc43 100644 --- a/src/CsvColumnizer/CsvColumnizer.csproj +++ b/src/CsvColumnizer/CsvColumnizer.csproj @@ -2,45 +2,21 @@ net8.0-windows true - Library - false - false + true true - false $(SolutionDir)..\bin\$(Configuration)\plugins true + CsvColumnizer - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - + - - CsvColumnizer - + diff --git a/src/CsvColumnizer/Properties/AssemblyInfo.cs b/src/CsvColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index d689fe35..00000000 --- a/src/CsvColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d939a82b-591f-4403-9c9b-7d1f54043019")] \ No newline at end of file diff --git a/src/DefaultPlugins/DefaultPlugins.csproj b/src/DefaultPlugins/DefaultPlugins.csproj index 1b0a14ea..20255a67 100644 --- a/src/DefaultPlugins/DefaultPlugins.csproj +++ b/src/DefaultPlugins/DefaultPlugins.csproj @@ -1,41 +1,14 @@  net8.0 - False - Library - false - LogExpert - false - False - False - false + $(SolutionDir)..\bin\$(Configuration)\plugins - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 11a29ac4..85213014 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -6,5 +6,33 @@ 2.0.0.0-rc1 Hirogen, zarunbal, RandallFlagg, TheNicker Log Expert - - \ No newline at end of file + enable + enable + false + false + ..\Solution Items\Key.snk + false + Properties + LogExpert + false + + true + true + LogExpert + Copyright © LogExpert 2025 + false + false + false + false + + FIX ME - AssemblyTitle! + FIX ME - Description! + + + + + + + + + diff --git a/src/FlashIconHighlighter/FlashIconHighlighter.csproj b/src/FlashIconHighlighter/FlashIconHighlighter.csproj index f86abe7a..50489d9a 100644 --- a/src/FlashIconHighlighter/FlashIconHighlighter.csproj +++ b/src/FlashIconHighlighter/FlashIconHighlighter.csproj @@ -1,41 +1,16 @@  + net8.0-windows true - Library - false - false true true - false $(SolutionDir)..\bin\$(Configuration)\plugins + true - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - - - true - + diff --git a/src/GlassfishColumnizer/GlassfishColumnizer.csproj b/src/GlassfishColumnizer/GlassfishColumnizer.csproj index 5bd15728..23bf3af2 100644 --- a/src/GlassfishColumnizer/GlassfishColumnizer.csproj +++ b/src/GlassfishColumnizer/GlassfishColumnizer.csproj @@ -1,39 +1,14 @@  net8.0 - Library - false - false - false + $(SolutionDir)..\bin\$(Configuration)\plugins + GlassfishColumnizer + Glassfish logfile support for LogExpert - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - - - GlassfishColumnizer - Glassfish logfile support for LogExpert - + diff --git a/src/GlassfishColumnizer/Properties/AssemblyInfo.cs b/src/GlassfishColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index 3346c8f5..00000000 --- a/src/GlassfishColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ffea3945-9d17-476d-b565-268f0700704c")] \ No newline at end of file diff --git a/src/JsonColumnizer/JsonColumnizer.csproj b/src/JsonColumnizer/JsonColumnizer.csproj index d53c1966..0092f405 100644 --- a/src/JsonColumnizer/JsonColumnizer.csproj +++ b/src/JsonColumnizer/JsonColumnizer.csproj @@ -1,44 +1,17 @@  net8.0 - false - Library - false - false - false - false - false + $(SolutionDir)..\bin\$(Configuration)\plugins + JsonColumnizer - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - - - JsonColumnizer - + + diff --git a/src/JsonColumnizer/Properties/AssemblyInfo.cs b/src/JsonColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index 113a680e..00000000 --- a/src/JsonColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4C0B11AE-BCAF-492C-AFE7-53C9B79148BE")] \ No newline at end of file diff --git a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj index 4a9f2836..48c72fcc 100644 --- a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj +++ b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj @@ -1,45 +1,17 @@  net8.0 - false - Library - false + JsonColumnizer - false - false - false - false $(SolutionDir)..\bin\$(Configuration)\plugins + JsonCompactColumnizer - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - - - JsonCompactColumnizer - + diff --git a/src/JsonCompactColumnizer/Properties/AssemblyInfo.cs b/src/JsonCompactColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index 47c642d5..00000000 --- a/src/JsonCompactColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6D5A3E51-4D0F-452E-8A86-DDCC313F3A7F")] \ No newline at end of file diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj index 189b5254..3008beb6 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj @@ -2,42 +2,20 @@ net8.0-windows true - Library - false - false + true true - false $(SolutionDir)..\bin\$(Configuration)\plugins - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + + - - - Key.snk - - + diff --git a/src/LogExpert.Core/LogExpert.Core.csproj b/src/LogExpert.Core/LogExpert.Core.csproj index c31d226e..094d3861 100644 --- a/src/LogExpert.Core/LogExpert.Core.csproj +++ b/src/LogExpert.Core/LogExpert.Core.csproj @@ -2,23 +2,9 @@ net8.0 - enable - enable - false true - True - ..\Solution Items\Key.snk - false - - - - - - - - diff --git a/src/LogExpert.Core/Properties/AssemblyInfo.cs b/src/LogExpert.Core/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..1af21449 --- /dev/null +++ b/src/LogExpert.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("LogExpert.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100619e9beea345a3bb5e15f55b29ddf40d96e9bb473ae58304fc63dfb3e9c94d8944bb7e45324ee0bef3e345dccba79b0bf64b85a128a7f261861899add639218ddaeb2acc6fcc746d6acb5bb212d375a0967756af192cfdb6cf0bff666a0fe535600abda860d3eafaff4ef1c9b5710181f72d996ca9c29ed64bae4a5fd916dea5")] \ No newline at end of file diff --git a/src/LogExpert.Resources/LogExpert.Resources.csproj b/src/LogExpert.Resources/LogExpert.Resources.csproj index 8786f4f1..553388a5 100644 --- a/src/LogExpert.Resources/LogExpert.Resources.csproj +++ b/src/LogExpert.Resources/LogExpert.Resources.csproj @@ -2,17 +2,8 @@ net8.0 - enable - enable - false - True - ..\Solution Items\Key.snk - - - - PreserveNewest @@ -26,10 +17,6 @@ - - - - diff --git a/src/LogExpert.Tests/LogExpert.Tests.csproj b/src/LogExpert.Tests/LogExpert.Tests.csproj index 8e058cf3..71fdb0dc 100644 --- a/src/LogExpert.Tests/LogExpert.Tests.csproj +++ b/src/LogExpert.Tests/LogExpert.Tests.csproj @@ -1,34 +1,34 @@  + net8.0-windows true - Library + true - false true true - false bin\$(Configuration) true - - - true - - - ..\Solution Items\Key.snk LogExpert.Tests - LogExpert.Tests - Copyright © 2018 - 1.0.0.0 - 1.0.0.0 + + + + + + + + + + - + + PreserveNewest @@ -38,6 +38,9 @@ PreserveNewest + + + PreserveNewest @@ -59,16 +62,6 @@ PreserveNewest - - - - - - - - - - PreserveNewest @@ -78,16 +71,9 @@ PreserveNewest - - PreserveNewest - - - - Key.snk - PreserveNewest @@ -98,4 +84,5 @@ PreserveNewest + diff --git a/src/LogExpert.Tests/Properties/AssemblyInfo.cs b/src/LogExpert.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 756a12ef..00000000 --- a/src/LogExpert.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("1ffb09a8-dae4-4deb-aff6-8bae6d01c7ac")] -[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")] \ No newline at end of file diff --git a/src/LogExpert.UI/LogExpert.UI.csproj b/src/LogExpert.UI/LogExpert.UI.csproj index 145fbbc4..f01a1266 100644 --- a/src/LogExpert.UI/LogExpert.UI.csproj +++ b/src/LogExpert.UI/LogExpert.UI.csproj @@ -1,21 +1,19 @@  - True - ..\Solution Items\Key.snk + true true true - false - enable - enable - false - True net8.0-windows true - + + + + + @@ -24,14 +22,6 @@ - - - - - - - - Always diff --git a/src/LogExpert.sln b/src/LogExpert.sln index d4494be0..e215b839 100644 --- a/src/LogExpert.sln +++ b/src/LogExpert.sln @@ -24,7 +24,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE6375A4-B4C4-4620-8FFB-B9D5A4E21144}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - Solution Items\AssemblyVersion.cs = Solution Items\AssemblyVersion.cs + Solution Items\AssemblyInfo.cs = Solution Items\AssemblyInfo.cs + Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props Solution Items\usedComponents.json = Solution Items\usedComponents.json EndProjectSection EndProject diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index d8c317de..20ea2108 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -1,39 +1,19 @@  - False - False PerMonitorV2 logexpert.ico - ..\Solution Items\Key.snk True $(SolutionDir)..\bin\Docs\LogExpert.xml True True - False Auto - enable - False $(SolutionDir)..\bin\$(Configuration) WinExe - True net8.0-windows False - - False - - - True - - - - Properties\AssemblyVersion.cs - - - Key.snk - Always diff --git a/src/LogExpert/Properties/AssemblyInfo.cs b/src/LogExpert/Properties/AssemblyInfo.cs deleted file mode 100644 index 69e5aee9..00000000 --- a/src/LogExpert/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ -[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")] \ No newline at end of file diff --git a/src/PluginRegistry/LogExpert.PluginRegistry.csproj b/src/PluginRegistry/LogExpert.PluginRegistry.csproj index 63c4fbbe..cf09bc7b 100644 --- a/src/PluginRegistry/LogExpert.PluginRegistry.csproj +++ b/src/PluginRegistry/LogExpert.PluginRegistry.csproj @@ -2,27 +2,14 @@ net8.0 - enable - false - enable - True - ..\Solution Items\Key.snk - - - - - + - - - - diff --git a/src/RegexColumnizer.UnitTests/Properties/AssemblyInfo.cs b/src/RegexColumnizer.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 323361a8..00000000 --- a/src/RegexColumnizer.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("FBFB598D-B94A-4AD3-A355-0D5A618CEEE3")] diff --git a/src/RegexColumnizer.UnitTests/RegexColumnizer.UnitTests.csproj b/src/RegexColumnizer.UnitTests/RegexColumnizer.UnitTests.csproj index 50c96688..be3904ad 100644 --- a/src/RegexColumnizer.UnitTests/RegexColumnizer.UnitTests.csproj +++ b/src/RegexColumnizer.UnitTests/RegexColumnizer.UnitTests.csproj @@ -1,24 +1,21 @@  net8.0-windows - Library + true - false - false + + bin\$(Configuration) true - true + - ..\Solution Items\Key.snk + RegexColumnizer.UnitTests - RegexColumnizer.UnitTests - Copyright © 2023 - 1.0.0.0 - 1.0.0.0 + diff --git a/src/RegexColumnizer/RegexColumnizer.csproj b/src/RegexColumnizer/RegexColumnizer.csproj index 5cbe4fe9..b85e7eac 100644 --- a/src/RegexColumnizer/RegexColumnizer.csproj +++ b/src/RegexColumnizer/RegexColumnizer.csproj @@ -2,37 +2,14 @@ net8.0-windows true - Library - false + true - false true - false $(SolutionDir)..\bin\$(Configuration)\plugins - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - - Key.snk - - - + + \ No newline at end of file diff --git a/src/SDK/Columnizer/Columnizer/Properties/AssemblyInfo.cs b/src/SDK/Columnizer/Columnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index 29495b39..00000000 --- a/src/SDK/Columnizer/Columnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Columnizer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Columnizer")] -[assembly: AssemblyCopyright("Copyright © 2008")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("cbf6cfb3-b9b7-4596-aba4-f622e350bed1")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SDK/Log4jXmlColumnizer/Properties/AssemblyInfo.cs b/src/SDK/Log4jXmlColumnizer/Properties/AssemblyInfo.cs deleted file mode 100644 index e77e09f6..00000000 --- a/src/SDK/Log4jXmlColumnizer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("Log4jXmlColumnizer")] -[assembly: AssemblyDescription("XML logfile support for LogExpert")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Log4jXmlColumnizer")] -[assembly: AssemblyCopyright("Copyright © 2009 Hagen Raab")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("7e083fad-da9a-4962-870f-0f1676293961")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SftpFileSystemx64/Properties/AssemblyInfo.cs b/src/SftpFileSystemx64/Properties/AssemblyInfo.cs deleted file mode 100644 index 458b8d80..00000000 --- a/src/SftpFileSystemx64/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -[assembly: AssemblyCulture("")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6d67894f-87fd-40ad-bbce-0923fd38d0ff")] \ No newline at end of file diff --git a/src/SftpFileSystemx64/SftpFileSystemx64.csproj b/src/SftpFileSystemx64/SftpFileSystemx64.csproj index b9080834..751e2a0c 100644 --- a/src/SftpFileSystemx64/SftpFileSystemx64.csproj +++ b/src/SftpFileSystemx64/SftpFileSystemx64.csproj @@ -2,44 +2,23 @@ net8.0-windows true - Library + SftpFileSystem SftpFileSystem - false - false true true - false $(SolutionDir)..\bin\$(Configuration)\plugins + SftpFileSystem - - False - - - True - - - true - - - ..\Solution Items\Key.snk - - - - Properties\AssemblyVersion.cs - - + - - Key.snk - + + - - - + @@ -47,7 +26,5 @@ - - SftpFileSystem - + diff --git a/src/SftpFileSystemx86/Properties/AssemblyInfo.cs b/src/SftpFileSystemx86/Properties/AssemblyInfo.cs deleted file mode 100644 index 2d342d43..00000000 --- a/src/SftpFileSystemx86/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3d01e923-5219-488b-b0a7-98521841e680")] \ No newline at end of file diff --git a/src/SftpFileSystemx86/SftpFileSystemx86.csproj b/src/SftpFileSystemx86/SftpFileSystemx86.csproj index b223e8ba..d6794794 100644 --- a/src/SftpFileSystemx86/SftpFileSystemx86.csproj +++ b/src/SftpFileSystemx86/SftpFileSystemx86.csproj @@ -2,23 +2,15 @@ net8.0-windows true - Library + SftpFileSystem SftpFileSystem - false true - false true SftpFileSystemx86 - false $(SolutionDir)..\bin\$(Configuration)\pluginsx86 - - False - - - True - + ConfigData.cs @@ -46,25 +38,20 @@ SftpLogFileInfo.cs - - Properties\AssemblyVersion.cs - + + - - - Key.snk - - + diff --git a/src/Solution Items/AssemblyVersion.cs b/src/Solution Items/AssemblyInfo.cs similarity index 86% rename from src/Solution Items/AssemblyVersion.cs rename to src/Solution Items/AssemblyInfo.cs index c7b9e075..29f6db81 100644 --- a/src/Solution Items/AssemblyVersion.cs +++ b/src/Solution Items/AssemblyInfo.cs @@ -1,12 +1,13 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("LogExpert")] -[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2025 Zarunbal|Hirogen and many others")] - -[assembly: AssemblyVersion("1.12.0")] -[assembly: AssemblyFileVersion("1.12.0")] -[assembly: AssemblyInformationalVersion("1.12.0")] - -[assembly: ComVisible(false)] +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyProduct("LogExpert")] +[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2025 Zarunbal|Hirogen and many others")] + +[assembly: AssemblyVersion("1.12.0")] +[assembly: AssemblyFileVersion("1.12.0")] +[assembly: AssemblyInformationalVersion("1.12.0")] + +[assembly: ComVisible(false)] +//warning CA1824: Mark assemblies with NeutralResourcesLanguageAttribute \ No newline at end of file diff --git a/src/Solution Items/Key.Public.snk b/src/Solution Items/Key.Public.snk new file mode 100644 index 0000000000000000000000000000000000000000..b9d1ac9528be91368a05f36088478e940f068e91 GIT binary patch literal 160 zcmV;R0AK$ABme*efB*oL000060ssI2Bme+XQ$aBR1ONa50097Do}2EYMWef374=&w z-SiEX>AOcd<%0zLW8bss$xVqwyM9G7PT;=t<3-%dr<)7*ONF5*r}ANj7@4isIU$YO z>nhA|%yeyP%UiM%({-ShcUG?%Ed9363;$+n59Kvr3caXc)9U*FPVvdLaRGt%Etzbo O!k*Sku1a6o7T%>(JV|!| literal 0 HcmV?d00001