Merge branch 'develop' into feature/cd-pipeline
Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/bc53a4fc Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/bc53a4fc Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/bc53a4fc Branch: refs/heads/develop Commit: bc53a4fce05268f895c54bee2668450e4f8c75cd Parents: 9f7118c 1d3afc1 Author: Stefan Bodewig <stefan.bode...@innoq.com> Authored: Sat Jan 20 18:43:12 2018 +0100 Committer: Stefan Bodewig <stefan.bode...@innoq.com> Committed: Sat Jan 20 18:43:12 2018 +0100 ---------------------------------------------------------------------- NOTICE | 2 +- log4net.build | 6 +++--- log4net.nuspec | 6 +++--- log4net.shfbproj | 8 ++++---- netstandard/1.3/log4net.netstandard.sln | 18 ++++++++++++++++++ .../1.3/log4net.tests/log4net.tests.csproj | 17 +++++++++++++++++ netstandard/1.3/log4net/log4net.csproj | 19 ++++++++++++++++++- src/AssemblyVersionInfo.cpp | 12 ++++++------ src/AssemblyVersionInfo.cs | 2 +- src/AssemblyVersionInfo.js | 12 ++++++------ src/AssemblyVersionInfo.vb | 14 +++++++------- 11 files changed, 84 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/log4net.build ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net.netstandard.sln ---------------------------------------------------------------------- diff --cc netstandard/1.3/log4net.netstandard.sln index c578a2e,0000000..f811388 mode 100644,000000..100644 --- a/netstandard/1.3/log4net.netstandard.sln +++ b/netstandard/1.3/log4net.netstandard.sln @@@ -1,33 -1,0 +1,51 @@@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 ++# ++# 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. ++# +VisualStudioVersion = 15.0.26114.2 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net", "log4net\log4net.csproj", "{00764202-B361-4BC8-A1B9-01D87F9D2D51}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "log4net.tests", "log4net.tests\log4net.tests.csproj", "{6A78D53B-C864-4316-AA00-F2EBFE975223}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BB38D1C-1862-432B-881C-925714F7F997}" + ProjectSection(SolutionItems) = preProject + nuget.config = nuget.config + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {00764202-B361-4BC8-A1B9-01D87F9D2D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00764202-B361-4BC8-A1B9-01D87F9D2D51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00764202-B361-4BC8-A1B9-01D87F9D2D51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00764202-B361-4BC8-A1B9-01D87F9D2D51}.Release|Any CPU.Build.0 = Release|Any CPU + {6A78D53B-C864-4316-AA00-F2EBFE975223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A78D53B-C864-4316-AA00-F2EBFE975223}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A78D53B-C864-4316-AA00-F2EBFE975223}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A78D53B-C864-4316-AA00-F2EBFE975223}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net.tests/log4net.tests.csproj ---------------------------------------------------------------------- diff --cc netstandard/1.3/log4net.tests/log4net.tests.csproj index b644ad9,0000000..f2b8843 mode 100755,000000..100755 --- a/netstandard/1.3/log4net.tests/log4net.tests.csproj +++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj @@@ -1,32 -1,0 +1,49 @@@ ++<?xml version="1.0"?> ++<!-- ++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. ++--> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <VersionPrefix>2.0.9</VersionPrefix> + <TargetFramework>netcoreapp1.0</TargetFramework> + <DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants> + <AssemblyName>log4net.tests</AssemblyName> + <PackageId>log4net.tests</PackageId> + <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> + <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback> + <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion> + <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> + <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> + <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> + <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> + </PropertyGroup> + + <ItemGroup> + <Compile Include="../../../tests/src/*.cs;../../../tests/src/Appender/AppenderCollectionTest.cs;../../../tests/src/Appender/BufferingAppenderTest.cs;../../../tests/src/Appender/CountingAppender.cs;../../../tests/src/Appender/MemoryAppenderTest.cs;../../../tests/src/Appender/RollingFileAppenderTest.cs;../../../tests/src/Appender/SmtpPickupDirAppenderTest.cs;../../../tests/src/Appender/StringAppender.cs;../../../tests/src/Appender/TraceAppenderTest.cs;../../../tests/src/Context/LogicalThreadContextTest.cs;../../../tests/src/Context/ThreadContextTest.cs;../../../tests/src/Co../../../*.cs;../../../tests/src/DateFormatt../../../*.cs;../../../tests/src/Hierarc../../../*.cs;../../../tests/src/Layo../../../*.cs;../../../tests/src/LoggerReposito../../../*.cs;../../../tests/src/Util/CyclicBufferTest.cs;../../../tests/src/Util/LogLogTest.cs;../../../tests/src/Util/PatternConverterTest.cs;../../../tests/src/Util/RandomStringPatternConverterTest.cs;../../../tests/src/Util/SystemInfoTest.cs; ../../../tests/src/Util/TransformTest.cs" Exclude="bin/**;obj/**;**/*.xproj;packages/**" /> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ProjectReference Include="../log4net/log4net.csproj" /> + <PackageReference Include="NUnit" Version="3.9.0" /> + </ItemGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> + <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" /> + </ItemGroup> + +</Project> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/bc53a4fc/netstandard/1.3/log4net/log4net.csproj ---------------------------------------------------------------------- diff --cc netstandard/1.3/log4net/log4net.csproj index c484481,0000000..460d549 mode 100755,000000..100755 --- a/netstandard/1.3/log4net/log4net.csproj +++ b/netstandard/1.3/log4net/log4net.csproj @@@ -1,62 -1,0 +1,79 @@@ ++<?xml version="1.0"?> ++<!-- ++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. ++--> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> - <Copyright>Copyright 2004-2017 The Apache Software Foundation.</Copyright> ++ <Copyright>Copyright 2004-2018 The Apache Software Foundation.</Copyright> + <AssemblyTitle>Apache log4net for .NET Core</AssemblyTitle> + <VersionPrefix>2.0.9</VersionPrefix> + <TargetFramework>netstandard1.3</TargetFramework> + <AssemblyName>log4net</AssemblyName> + <PackageId>log4net</PackageId> + <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute> + <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> + <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute> + <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> + <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute> + <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute> + <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute> + <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> + <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> + </PropertyGroup> + + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> + <DefineConstants>$(DefineConstants);HAS_READERWRITERLOCKSLIM</DefineConstants> + <PublicSign>true</PublicSign> + <AssemblyOriginatorKeyFile>../../../log4net.snk</AssemblyOriginatorKeyFile> + <SignAssembly>true</SignAssembly> + </PropertyGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> + <Compile Remove="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConverters\AppSettingPatternConverte r.cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs" /> + <Compile Include="..\..\..\src\**\*.cs" Exclude="..\..\..\src\Appender\AdoNetAppender.cs;..\..\..\src\Appender\AspNetTraceAppender.cs;..\..\..\src\Appender\ColoredConsoleAppender.cs;..\..\..\src\Appender\EventLogAppender.cs;..\..\..\src\Appender\NetSendAppender.cs;..\..\..\src\Appender\RemotingAppender.cs;..\..\..\src\Appender\SmtpAppender.cs;..\..\..\src\Config\DOMConfigurator.cs;..\..\..\src\Config\DOMConfiguratorAttribute.cs;..\..\..\src\Config\Log4NetConfigurationSectionHandler.cs;..\..\..\src\Layout\Pattern\AspNetCachePatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetContextPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetRequestPatternConverter.cs;..\..\..\src\Layout\Pattern\AspNetSessionPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTraceDetailPatternConverter.cs;..\..\..\src\Layout\Pattern\StackTracePatternConverter.cs;..\..\..\src\Plugin\RemoteLoggingServerPlugin.cs;..\..\..\src\Util\PatternStringConve rters\AppSettingPatternConverter.cs;..\..\..\src\Util\PatternStringConverters\EnvironmentFolderPathPatternConverter.cs;..\..\..\src\Util\NativeError.cs;..\..\..\src\Util\WindowsSecurityContext.cs;bin\**;obj\**;**\*.xproj;packages\**" /> + </ItemGroup> + + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> + <PackageReference Include="System.AppContext" Version="4.3.0" /> + <PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" /> + <PackageReference Include="System.Console" Version="4.3.0" /> + <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" /> + <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" /> + <PackageReference Include="System.Diagnostics.StackTrace" Version="4.0.1" /> + <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" /> + <PackageReference Include="System.IO.FileSystem" Version="4.3.0" /> + <PackageReference Include="System.IO.FileSystem.Watcher" Version="4.0.0" /> + <PackageReference Include="System.Linq" Version="4.3.0" /> + <PackageReference Include="System.Net.NameResolution" Version="4.0.0" /> + <PackageReference Include="System.Net.Requests" Version="4.0.11" /> + <PackageReference Include="System.Net.Sockets" Version="4.3.0" /> + <PackageReference Include="System.Reflection" Version="4.3.0" /> + <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" /> + <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" /> + <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" /> + <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" /> + <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> + <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" /> + <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" /> + <PackageReference Include="System.Threading" Version="4.3.0" /> + <PackageReference Include="System.Threading.Thread" Version="4.0.0" /> + <PackageReference Include="System.Threading.Timer" Version="4.3.0" /> + <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" /> + <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" /> + </ItemGroup> + +</Project>
