Skip to content

Commit

Permalink
#129 Prepare release 3.0.0-preview.1
Browse files Browse the repository at this point in the history
  • Loading branch information
FreeAndNil committed Apr 4, 2024
1 parent 53bc2e2 commit 22307e2
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 149 deletions.
4 changes: 1 addition & 3 deletions doc/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ release version 2.0.123:
(or at least, I haven't figured out how - in particular CF)
- TODO: the following are still manual and need to be built into the `release` script:
- log4net.build: update package.version property
- log4net.shfbproj: update HtmlHelpName
- pom.xml: update version
4. Sign release artifacts (zips & nupkg) under `build/artifacts`
- eg `gpg --argmor --output log4net-2.0.123.nupkg.asc --detach-sig log4net-2.0.123.nupkg`
Expand Down Expand Up @@ -84,5 +83,4 @@ release version 2.0.123:
- `git pull --rebase`
- `git merge asf-staging`
18. rename the release at github, eg to `rel/2.0.123`
- double-check that the `rel` tag is created

- double-check that the `rel` tag is created
39 changes: 13 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<groupId>log4net</groupId>
<artifactId>apache-log4net</artifactId>
<packaging>pom</packaging>
<version>2.0.17</version>
<version>3.0.0</version>
<name>Apache log4net</name>
<description>Logging framework for Microsoft .NET Framework.</description>
<url>http://logging.apache.org/log4net/</url>
Expand Down Expand Up @@ -91,30 +91,6 @@
<templateFile>${basedir}/src/site/site.vm</templateFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<fixcrlf srcDir="target/site" excludes="images/**"/>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.11</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>

Expand All @@ -134,7 +110,7 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.12</version>
<configuration>
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
<excludesFile>${basedir}/rat.excludesFile</excludesFile>
</configuration>
</plugin>
<plugin>
Expand All @@ -158,6 +134,14 @@
</reporting>

<developers>
<developer>
<name>Davyd McColl</name>
<id>fluffynuts</id>
</developer>
<developer>
<name>Jan Friedrich</name>
<id>freeandnil</id>
</developer>
<developer>
<name>Curt Arnold</name>
<id>carnold</id>
Expand Down Expand Up @@ -189,6 +173,9 @@
</developers>

<contributors>
<contributor>
<name>Erik Mavrinac</name>
</contributor>
<contributor>
<name>Julian Biddle</name>
</contributor>
Expand Down
15 changes: 9 additions & 6 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<Project>
<PropertyGroup>
<UseSharedCompilation>true</UseSharedCompilation>
<LangVersion>latest</LangVersion>
<Nullable>Enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
</PropertyGroup>
<PropertyGroup Label="Versioning">
<VersionPrefix>3.0.0</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<UseSharedCompilation>true</UseSharedCompilation>
<LangVersion>latest</LangVersion>
<Nullable>Enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/build-preview.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dotnet build -c Release '-p:GeneratePackages=true;VersionSuffix=preview.1' ./log4net/log4net.csproj
5 changes: 3 additions & 2 deletions src/log4net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "log4net2-SerializeEvent", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".doc", ".doc", "{33D80AD3-8048-4220-8BB0-38E3BDE5FCF4}"
ProjectSection(SolutionItems) = preProject
build-preview.ps1 = build-preview.ps1
..\doc\BUILDING.md = ..\doc\BUILDING.md
site\xdoc\download_log4net.xml = site\xdoc\download_log4net.xml
..\doc\MailTemplate.Result.txt = ..\doc\MailTemplate.Result.txt
..\doc\MailTemplate.txt = ..\doc\MailTemplate.txt
..\doc\RELEASING.md = ..\doc\RELEASING.md
site\xdoc\release\release-notes.xml = site\xdoc\release\release-notes.xml
site\xdoc\download_log4net.xml = site\xdoc\download_log4net.xml
..\doc\RELEASING.md = ..\doc\RELEASING.md
EndProjectSection
EndProject
Global
Expand Down
223 changes: 111 additions & 112 deletions src/log4net/log4net.csproj
Original file line number Diff line number Diff line change
@@ -1,118 +1,117 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>log4net</PackageId>
<Version>3.0.0</Version>
<PackageVersion>$(Version)</PackageVersion>
<Title>Apache log4net</Title>
<Product>Apache log4net</Product>
<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.
<PropertyGroup>
<PackageId>log4net</PackageId>
<Title>Apache log4net</Title>
<Product>Apache log4net</Product>
<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.
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>
<Platforms>AnyCPU</Platforms>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<RootNamespace>log4net</RootNamespace>
<AssemblyName>log4net</AssemblyName>
<ProjectType>Local</ProjectType>
<OutputType>Library</OutputType>
<MapFileExtensions>true</MapFileExtensions>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\log4net.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputPath>..\..\build\$(Configuration)</OutputPath>
<PackageOutputPath>..\..\build\artifacts</PackageOutputPath>
<DocumentationFile>..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<PropertyGroup Label="NuGet generation">
<Authors>The Apache Software Foundation</Authors>
<Copyright>Copyright 2004-2024 The Apache Software Foundation</Copyright>
<DevelopmentDependency>false</DevelopmentDependency>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://logging.apache.org/log4net/</PackageProjectUrl>
<PackageIcon>package-icon.png</PackageIcon>
<PackageTags>logging log tracing logfiles</PackageTags>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/apache/logging-log4net</RepositoryUrl>
<Owners>Apache Logging Project</Owners>
<PackageVersion>$(Version)</PackageVersion>
</PropertyGroup>
<PropertyGroup>
<BaseAddress>285212672</BaseAddress>
<DebugType>portable</DebugType>
<Deterministic>true</Deterministic>
<FileAlignment>4096</FileAlignment>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/apache/logging-log4net</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<DefineConstants>TRACE;STRONG;$(DefineConstants)</DefineConstants>
<DebugType>none</DebugType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup />
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Update="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Web">
<Name>System.Web</Name>
</Reference>
<Reference Update="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Update="System.Xml">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\log4net.snk">
<Link>log4net.snk</Link>
</None>
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup Label="Packaging">
<Content Include="..\..\package-icon.png" PackagePath="package-icon.png">
<Link>package-icon.png</Link>
</Content>
</ItemGroup>
log4net is designed with two distinct goals in mind: speed and flexibility
</Description>
<Platforms>AnyCPU</Platforms>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<RootNamespace>log4net</RootNamespace>
<AssemblyName>log4net</AssemblyName>
<ProjectType>Local</ProjectType>
<OutputType>Library</OutputType>
<MapFileExtensions>true</MapFileExtensions>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\log4net.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputPath>..\..\build\$(Configuration)</OutputPath>
<PackageOutputPath>..\..\build\artifacts</PackageOutputPath>
<DocumentationFile>..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<PropertyGroup Label="NuGet generation">
<Authors>The Apache Software Foundation</Authors>
<Copyright>Copyright 2004-2024 The Apache Software Foundation</Copyright>
<DevelopmentDependency>false</DevelopmentDependency>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>$(GeneratePackages)</GeneratePackageOnBuild>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://logging.apache.org/log4net/</PackageProjectUrl>
<PackageIcon>package-icon.png</PackageIcon>
<PackageTags>logging log tracing logfiles</PackageTags>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/apache/logging-log4net</RepositoryUrl>
<Owners>Apache Logging Project</Owners>
<PackageVersion>$(Version)</PackageVersion>
</PropertyGroup>
<PropertyGroup>
<BaseAddress>285212672</BaseAddress>
<DebugType>portable</DebugType>
<Deterministic>true</Deterministic>
<FileAlignment>4096</FileAlignment>
<PackageReadmeFile>README.md</PackageReadmeFile>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/apache/logging-log4net</RepositoryUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<DefineConstants>TRACE;STRONG;$(DefineConstants)</DefineConstants>
<DebugType>none</DebugType>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup />
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Update="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Web">
<Name>System.Web</Name>
</Reference>
<Reference Update="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Update="System.Xml">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\log4net.snk">
<Link>log4net.snk</Link>
</None>
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup Label="Packaging">
<Content Include="..\..\package-icon.png" PackagePath="package-icon.png">
<Link>package-icon.png</Link>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</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 -->
<ItemGroup>
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdb')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')" />
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</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 -->
<ItemGroup>
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdb')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')" />
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')" />
</ItemGroup>
</Target>
</Target>
</Project>

0 comments on commit 22307e2

Please sign in to comment.