This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a commit to branch Feature/175-add-source-link in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 935d2d44c22e0d39ac76b68a7009f5201e344acc Author: Jan Friedrich <[email protected]> AuthorDate: Fri Sep 13 13:19:13 2024 +0200 #175 added source link --- src/Directory.Build.props | 7 ++--- src/log4net/AssemblyInfo.cs | 40 +------------------------- src/log4net/AssemblyVersionInfo.cs | 40 -------------------------- src/log4net/log4net.csproj | 57 +++++++++++++++++++++++--------------- 4 files changed, 38 insertions(+), 106 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b9576191..e6d21376 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,11 +1,10 @@ <Project> - <PropertyGroup Label="Versioning"> - <VersionPrefix>3.0.0</VersionPrefix> - </PropertyGroup> <PropertyGroup> + <Deterministic>true</Deterministic> + <DebugType>portable</DebugType> <UseSharedCompilation>true</UseSharedCompilation> <LangVersion>latest</LangVersion> <Nullable>Enable</Nullable> <WarningsAsErrors>nullable</WarningsAsErrors> </PropertyGroup> -</Project> +</Project> \ No newline at end of file diff --git a/src/log4net/AssemblyInfo.cs b/src/log4net/AssemblyInfo.cs index f22bdb9e..58f9ab7e 100644 --- a/src/log4net/AssemblyInfo.cs +++ b/src/log4net/AssemblyInfo.cs @@ -17,50 +17,12 @@ // #endregion -using System.Reflection; -using System.Runtime.CompilerServices; - -// // log4net makes use of static methods which cannot be made com visible -// [assembly: System.Runtime.InteropServices.ComVisible(false)] - -// -// log4net is CLS compliant -// [assembly: System.CLSCompliant(true)] - -// // If log4net is strongly named it still allows partially trusted callers -// [assembly: System.Security.AllowPartiallyTrustedCallers] -// // Allows partial trust applications (e.g. ASP.NET shared hosting) on .NET 4.0 to work // given our implementation of ISerializable. -// -[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// - -#if NET462_OR_GREATER -[assembly: AssemblyInformationalVersion("3.0.0.0-.NET 4.6.2")] -[assembly: AssemblyTitle("Apache log4net for .NET Framework 4.6.2")] -#endif -#if NETSTANDARD2_0_OR_GREATER -[assembly: AssemblyInformationalVersion("3.0.0.0-.NET Standard 2.0")] -[assembly: AssemblyTitle("Apache log4net for .NET Standard 2.0")] -#endif - -#if DEBUG -[assembly: AssemblyConfiguration("Debug")] -#else -[assembly: AssemblyConfiguration("Retail")] -#endif - -[assembly: AssemblyProduct("log4net")] -[assembly: AssemblyDefaultAlias("log4net")] -[assembly: AssemblyCulture("")] \ No newline at end of file +[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] \ No newline at end of file diff --git a/src/log4net/AssemblyVersionInfo.cs b/src/log4net/AssemblyVersionInfo.cs deleted file mode 100644 index e22225f4..00000000 --- a/src/log4net/AssemblyVersionInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -#region Apache License -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: System.Reflection.AssemblyVersion("3.0.0.0")] -[assembly: System.Reflection.AssemblyFileVersion("3.0.0.0")] - -// -// Shared assembly settings -// - -[assembly: System.Reflection.AssemblyCompany("The Apache Software Foundation")] -[assembly: System.Reflection.AssemblyCopyright("Copyright 2004-2024 The Apache Software Foundation.")] -[assembly: System.Reflection.AssemblyTrademark("Apache and Apache log4net are trademarks of The Apache Software Foundation")] \ No newline at end of file diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 1124e814..71676fa1 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -1,22 +1,22 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <Version>3.0.0</Version> <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. + <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. +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 +log4net is designed with two distinct goals in mind: speed and flexibility </Description> <Platforms>AnyCPU</Platforms> <TargetFrameworks>net462;netstandard2.0</TargetFrameworks> @@ -26,7 +26,7 @@ <ProjectType>Local</ProjectType> <OutputType>Library</OutputType> <MapFileExtensions>true</MapFileExtensions> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> + <GenerateAssemblyInfo>true</GenerateAssemblyInfo> <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>..\..\log4net.snk</AssemblyOriginatorKeyFile> <GenerateDocumentationFile>true</GenerateDocumentationFile> @@ -44,27 +44,37 @@ <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> + <PublishRepositoryUrl>true</PublishRepositoryUrl> + <EmbedUntrackedSources>true</EmbedUntrackedSources> + <AssemblyTitle>Apache log4net for .NET</AssemblyTitle> + <AssemblyProduct>$(AssemblyName)</AssemblyProduct> + <AssemblyCompany>The Apache Software Foundation</AssemblyCompany> + <Copyright>Copyright %A9 2004 - $([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> - <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' "> + <AssemblyConfiguration>Debug</AssemblyConfiguration> <DefineConstants>TRACE;DEBUG;$(DefineConstants)</DefineConstants> <GeneratePackageOnBuild>$(GeneratePackages)</GeneratePackageOnBuild> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)'=='Release' "> + <AssemblyConfiguration>Retail</AssemblyConfiguration> <DefineConstants>TRACE;STRONG;$(DefineConstants)</DefineConstants> <GeneratePackageOnBuild>true</GeneratePackageOnBuild> <PathMap>$(MSBuildProjectDirectory)\=$(MSBuildProjectDirectory.Replace($(MSBuildThisFileDirectory),"D:\Git\apache\logging-log4net"))\</PathMap> @@ -104,6 +114,7 @@ <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/> </ItemGroup> <Import Project="../MonoForFramework.targets" /> <Target Name="_ResolveCopyLocalNuGetPackagePdbsAndXml" Condition="$(CopyLocalLockFileAssemblies) == true" AfterTargets="ResolveReferences">
