This is an automated email from the ASF dual-hosted git repository. FreeAndNil pushed a commit to branch Feature/302-log4net.Ext.Mail in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 37762d0b53ed19b7cdc9830282aee2d4eea6e679 Author: Jan Friedrich <[email protected]> AuthorDate: Tue Jul 28 16:22:44 2026 +0200 #300 create new assemblies for SmtpAppender --- scripts/update-version.ps1 | 2 +- src/Directory.Build.props | 1 + .../log4net.Ext.Mail.Tests.csproj | 33 ++++++++++++++ .../log4net.Ext.Mail.csproj} | 53 +++------------------- src/log4net.sln | 16 ++++++- src/log4net/log4net.csproj | 1 - 6 files changed, 56 insertions(+), 50 deletions(-) diff --git a/scripts/update-version.ps1 b/scripts/update-version.ps1 index 5e7f35d5..fd9329e2 100644 --- a/scripts/update-version.ps1 +++ b/scripts/update-version.ps1 @@ -52,7 +52,7 @@ Update-TextVersion $PSScriptRoot/../doc/MailTemplate.Result.txt $OldVersion $New Update-TextVersion $PSScriptRoot/../doc/MailTemplate.Announce.txt $OldVersion $NewVersion Update-TextVersion $PSScriptRoot/build-preview.ps1 $OldVersion $NewVersion Update-TextVersion $PSScriptRoot/build-release.ps1 $OldVersion $NewVersion -Update-XmlVersion $PSScriptRoot/../src/log4net/log4net.csproj $NewVersion '/Project/PropertyGroup/Version' +Update-XmlVersion $PSScriptRoot/../src/Directory.Build.props $NewVersion '/Project/PropertyGroup/VersionPrefix' Update-XmlVersion $PSScriptRoot/../src/Directory.Build.props $OldVersion '/Project/PropertyGroup/Log4NetPackageVersion' Update-XmlVersion $PSScriptRoot/../examples/Directory.Build.props $OldVersion '/Project/PropertyGroup/Version' Update-TextVersion $PSScriptRoot/../src/site/antora/modules/ROOT/partials/supported-versions.adoc $OldVersion $NewVersion diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4cdce339..ceabeb65 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -14,6 +14,7 @@ <SatelliteResourceLanguages>en;en-US</SatelliteResourceLanguages> </PropertyGroup> <PropertyGroup Label="Package Versions"> + <VersionPrefix>3.3.3</VersionPrefix> <Log4NetPackageVersion>3.3.2</Log4NetPackageVersion> <SystemConfigurationConfigurationManagerPackageVersion>4.5.0</SystemConfigurationConfigurationManagerPackageVersion> <MicrosoftSourceLinkGitHubPackageVersion>8.0.0</MicrosoftSourceLinkGitHubPackageVersion> diff --git a/src/log4net.Ext.Mail.Tests/log4net.Ext.Mail.Tests.csproj b/src/log4net.Ext.Mail.Tests/log4net.Ext.Mail.Tests.csproj new file mode 100644 index 00000000..c7e3e071 --- /dev/null +++ b/src/log4net.Ext.Mail.Tests/log4net.Ext.Mail.Tests.csproj @@ -0,0 +1,33 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <IsTestProject>true</IsTestProject> + <TargetFrameworks>net8.0</TargetFrameworks> + <NoWarn>NETSDK1138;CS1701</NoWarn> + <OutputType>Library</OutputType> + <OutputPath>bin\$(Configuration)</OutputPath> + <Configurations>Debug;Release</Configurations> + <Platforms>AnyCPU</Platforms> + <Deterministic>true</Deterministic> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants> + <!-- suppress analyzer mismatch warning --> + <NoWarn>CS8032</NoWarn> + <VSTestLogger>quackers</VSTestLogger> + </PropertyGroup> + <ItemGroup> + <Compile Include="..\log4net\Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" Link="Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" /> + <Compile Include="..\log4net\Diagnostics\CodeAnalysis\IsExternalInit.cs" Link="Diagnostics\CodeAnalysis\IsExternalInit.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\log4net.Ext.Mail\log4net.Ext.Mail.csproj" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" /> + <PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersPackageVersion)" /> + <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterPackageVersion)" /> + <PackageReference Include="Quackers.TestLogger" Version="$(QuackersTestLoggerPackageVersion)" /> + </ItemGroup> + <ItemGroup Condition="'$(TargetFramework)'=='net8.0'"> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkPackageVersion)" /> + </ItemGroup> +</Project> \ No newline at end of file diff --git a/src/log4net/log4net.csproj b/src/log4net.Ext.Mail/log4net.Ext.Mail.csproj similarity index 62% copy from src/log4net/log4net.csproj copy to src/log4net.Ext.Mail/log4net.Ext.Mail.csproj index c1568607..c6d81d48 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net.Ext.Mail/log4net.Ext.Mail.csproj @@ -1,34 +1,15 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Version>3.3.3</Version> - <PackageId>log4net</PackageId> - <Product>Apache log4net</Product> + <PackageId>log4net.Ext.Mail</PackageId> + <Product>Apache log4net.Ext.Mail</Product> <Title>$(Product)</Title> - <Description>log4net is a tool to help the programmer output log statements to a variety of output targets. -In case of problems with an application, it is helpful to enable logging so that the problem -can be located. With log4net it is possible to enable logging at runtime without modifying the -application binary. The log4net package is designed so that log statements can remain in -shipped code without incurring a high performance cost. It follows that the speed of logging -(or rather not logging) is crucial. - -At the same time, log output can be so voluminous that it quickly becomes overwhelming. -One of the distinctive features of log4net is the notion of hierarchical loggers. -Using these loggers it is possible to selectively control which log statements are output -at arbitrary granularity. - -log4net is designed with two distinct goals in mind: speed and flexibility - </Description> + <Description>log4net.Ext.Mail provides Appenders for sending mails</Description> <Platforms>AnyCPU</Platforms> - <TargetFrameworks>net462;netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0</TargetFrameworks> <Configurations>Debug;Release</Configurations> - <RootNamespace>log4net</RootNamespace> - <AssemblyName>log4net</AssemblyName> - <ProjectType>Local</ProjectType> <OutputType>Library</OutputType> <MapFileExtensions>true</MapFileExtensions> <GenerateAssemblyInfo>true</GenerateAssemblyInfo> - <SignAssembly>true</SignAssembly> - <AssemblyOriginatorKeyFile>..\..\log4net.snk</AssemblyOriginatorKeyFile> <GenerateDocumentationFile>true</GenerateDocumentationFile> <OutputPath>..\..\build\$(Configuration)</OutputPath> <PackageOutputPath>..\..\build\artifacts</PackageOutputPath> @@ -37,31 +18,22 @@ log4net is designed with two distinct goals in mind: speed and flexibility </PropertyGroup> <PropertyGroup Label="NuGet generation"> <Authors>The Apache Software Foundation</Authors> - <Copyright>Copyright 2004-2025 The Apache Software Foundation</Copyright> <DevelopmentDependency>false</DevelopmentDependency> <IsPackable>true</IsPackable> <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression> <PackageProjectUrl>https://logging.apache.org/log4net/</PackageProjectUrl> <PackageIcon>package-icon.png</PackageIcon> - <PackageTags>logging log tracing logfiles</PackageTags> + <PackageTags>logging log tracing mail smtp</PackageTags> <Owners>Apache Logging Project</Owners> <PublishRepositoryUrl>true</PublishRepositoryUrl> <EmbedUntrackedSources>true</EmbedUntrackedSources> - <AssemblyTitle>Apache log4net for .NET</AssemblyTitle> + <AssemblyTitle>Apache log4net mail extensions</AssemblyTitle> <AssemblyProduct>$(AssemblyName)</AssemblyProduct> <AssemblyCompany>The Apache Software Foundation</AssemblyCompany> - <Copyright>Copyright %A9 2004 - $([System.DateTime]::Now.Year) The Apache Software Foundation</Copyright> + <Copyright>Copyright %A9 2026 - $([System.DateTime]::Now.Year) The Apache Software Foundation</Copyright> <AssemblyCopyright>$(Copyright)</AssemblyCopyright> <AssemblyTrademark>Apache and Apache log4net are trademarks of The Apache Software Foundation</AssemblyTrademark> <AssemblyDefaultAlias>$(AssemblyName)</AssemblyDefaultAlias> - <AssemblyCulture> - </AssemblyCulture> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)'=='net462'"> - <AssemblyTitle>$(AssemblyTitle) Framework 4.6.2</AssemblyTitle> - </PropertyGroup> - <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'"> - <AssemblyTitle>$(AssemblyTitle) Standard 2.0</AssemblyTitle> </PropertyGroup> <PropertyGroup> <PackageReadmeFile>README.md</PackageReadmeFile> @@ -80,17 +52,7 @@ log4net is designed with two distinct goals in mind: speed and flexibility <PathMap>$(MSBuildProjectDirectory)\=$(MSBuildProjectDirectory.Replace($(MSBuildThisFileDirectory),"D:\Git\apache\logging-log4net"))\</PathMap> </PropertyGroup> <PropertyGroup /> - <ItemGroup Condition="'$(TargetFramework)'=='net462'"> - <Reference Include="System.Configuration" /> - <Reference Include="System.Web" /> - </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)'!='net462'"> - <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" /> - </ItemGroup> <ItemGroup> - <None Include="..\..\log4net.snk"> - <Link>log4net.snk</Link> - </None> <None Include="..\..\README.md" Pack="true" PackagePath="\" /> </ItemGroup> <ItemGroup Label="Packaging"> @@ -102,7 +64,6 @@ log4net is designed with two distinct goals in mind: speed and flexibility <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftNetAnalyzersPackageVersion)" PrivateAssets="All" IncludeAssets="All" /> </ItemGroup> - <Import Project="../MonoForFramework.targets" /> <Target Name="_ResolveCopyLocalNuGetPackagePdbsAndXml" Condition="$(CopyLocalLockFileAssemblies) == true" AfterTargets="ResolveReferences"> <!-- "Workaround" for missing '.pdb'-Files from NuGet Packages --> <!-- https://github.com/dotnet/sdk/issues/1458#issuecomment-420456386 --> diff --git a/src/log4net.sln b/src/log4net.sln index 3ecbc281..f0c53061 100644 --- a/src/log4net.sln +++ b/src/log4net.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.9.34622.214 +# Visual Studio Version 18 +VisualStudioVersion = 18.7.11903.348 stable MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4net", "log4net\log4net.csproj", "{181FE707-E161-4722-9F38-6AAAB6FAA106}" EndProject @@ -56,6 +56,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".scripts", ".scripts", "{C0 ..\scripts\update-version.ps1 = ..\scripts\update-version.ps1 EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Mail", "log4net.Ext.Mail\log4net.Ext.Mail.csproj", "{73AA7739-6E5E-6256-E2A2-6A3B79864E0B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.Ext.Mail.Tests", "log4net.Ext.Mail.Tests\log4net.Ext.Mail.Tests.csproj", "{56A9114E-30BC-0ED0-843E-97613E9E6221}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -94,6 +98,14 @@ Global {605058A8-CE6D-4190-91DA-7B3E9F84489E}.Debug|Any CPU.Build.0 = Debug|Any CPU {605058A8-CE6D-4190-91DA-7B3E9F84489E}.Release|Any CPU.ActiveCfg = Release|Any CPU {605058A8-CE6D-4190-91DA-7B3E9F84489E}.Release|Any CPU.Build.0 = Release|Any CPU + {73AA7739-6E5E-6256-E2A2-6A3B79864E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73AA7739-6E5E-6256-E2A2-6A3B79864E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73AA7739-6E5E-6256-E2A2-6A3B79864E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73AA7739-6E5E-6256-E2A2-6A3B79864E0B}.Release|Any CPU.Build.0 = Release|Any CPU + {56A9114E-30BC-0ED0-843E-97613E9E6221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56A9114E-30BC-0ED0-843E-97613E9E6221}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56A9114E-30BC-0ED0-843E-97613E9E6221}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56A9114E-30BC-0ED0-843E-97613E9E6221}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index c1568607..3f78b5ff 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -1,6 +1,5 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <Version>3.3.3</Version> <PackageId>log4net</PackageId> <Product>Apache log4net</Product> <Title>$(Product)</Title>
