Repository: logging-log4net Updated Branches: refs/heads/feature/cd-pipeline 3c32a0ca4 -> 65e503110
Moved netstandard-1.3 files to make room for other netstandard targets Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/65e50311 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/65e50311 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/65e50311 Branch: refs/heads/feature/cd-pipeline Commit: 65e50311004d3a37c6d1b2c5ab9a46f0418708d5 Parents: 3c32a0c Author: Dominik Psenner <dpsen...@apache.org> Authored: Sun Nov 12 09:15:24 2017 +0100 Committer: Dominik Psenner <dpsen...@apache.org> Committed: Sun Nov 12 09:15:24 2017 +0100 ---------------------------------------------------------------------- log4net.build | 4 +- netstandard/1.3/log4net.netstandard.sln | 33 ++++++++ .../1.3/log4net.tests/ApplicationException.cs | 27 +++++++ .../log4net.tests/CompatibilityExtensions.cs | 38 +++++++++ .../log4net.tests/ExpectedExceptionAttribute.cs | 85 ++++++++++++++++++++ .../1.3/log4net.tests/log4net.tests.csproj | 32 ++++++++ .../1.3/log4net/CompatibilityExtensions.cs | 53 ++++++++++++ netstandard/1.3/log4net/log4net.csproj | 62 ++++++++++++++ netstandard/log4net.netstandard.sln | 33 -------- .../log4net.tests/ApplicationException.cs | 27 ------- .../log4net.tests/CompatibilityExtensions.cs | 38 --------- .../log4net.tests/ExpectedExceptionAttribute.cs | 85 -------------------- netstandard/log4net.tests/log4net.tests.csproj | 32 -------- netstandard/log4net/CompatibilityExtensions.cs | 53 ------------ netstandard/log4net/log4net.csproj | 62 -------------- tests/nant.build | 14 ++-- 16 files changed, 339 insertions(+), 339 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/log4net.build ---------------------------------------------------------------------- diff --git a/log4net.build b/log4net.build index f08133f..7f1406f 100644 --- a/log4net.build +++ b/log4net.build @@ -1784,12 +1784,12 @@ limitations under the License. <mkdir dir="${log4net.basedir}/bin/netstandard/1.3"/> <if test="${current.build.config.release}"> <move todir="${log4net.basedir}/bin/netstandard/1.3/release"> - <fileset basedir="netstandard/log4net/bin/Release/netstandard1.3"/> + <fileset basedir="netstandard/1.3/log4net/bin/Release/netstandard1.3"/> </move> </if> <ifnot test="${current.build.config.release}"> <move todir="${log4net.basedir}/bin/netstandard/1.3/debug"> - <fileset basedir="netstandard/log4net/bin/Debug/netstandard1.3"/> + <fileset basedir="netstandard/1.3/log4net/bin/Debug/netstandard1.3"/> </move> </ifnot> </if> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/1.3/log4net.netstandard.sln ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net.netstandard.sln b/netstandard/1.3/log4net.netstandard.sln new file mode 100644 index 0000000..c578a2e --- /dev/null +++ b/netstandard/1.3/log4net.netstandard.sln @@ -0,0 +1,33 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +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/65e50311/netstandard/1.3/log4net.tests/ApplicationException.cs ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net.tests/ApplicationException.cs b/netstandard/1.3/log4net.tests/ApplicationException.cs new file mode 100644 index 0000000..30bfe37 --- /dev/null +++ b/netstandard/1.3/log4net.tests/ApplicationException.cs @@ -0,0 +1,27 @@ +#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 + +using System; + +namespace log4net.Tests +{ + public class ApplicationException : Exception + { + } +} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/1.3/log4net.tests/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net.tests/CompatibilityExtensions.cs b/netstandard/1.3/log4net.tests/CompatibilityExtensions.cs new file mode 100644 index 0000000..a634ed0 --- /dev/null +++ b/netstandard/1.3/log4net.tests/CompatibilityExtensions.cs @@ -0,0 +1,38 @@ +#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 + +using System; +using System.IO; +using System.Reflection; +using System.Threading; + +namespace log4net +{ + internal static class CompatibilityExtensions + { + public static void Close(this Mutex mutex) => mutex.Dispose(); + public static void Close(this Stream stream) => stream.Dispose(); + public static void Close(this StreamReader streamReader) => streamReader.Dispose(); + + public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingAttr, object binder, Type[] types, object[] modifiers) + { + return type.GetConstructor(types); + } + } +} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/1.3/log4net.tests/ExpectedExceptionAttribute.cs ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net.tests/ExpectedExceptionAttribute.cs b/netstandard/1.3/log4net.tests/ExpectedExceptionAttribute.cs new file mode 100644 index 0000000..771922a --- /dev/null +++ b/netstandard/1.3/log4net.tests/ExpectedExceptionAttribute.cs @@ -0,0 +1,85 @@ +#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 + +// https://github.com/nunit/nunit-csharp-samples/blob/master/ExpectedExceptionExample/ExpectedExceptionAttribute.cs + +using System; +using NUnit.Framework.Interfaces; +using NUnit.Framework.Internal; +using NUnit.Framework.Internal.Commands; + +namespace NUnit.Framework +{ + /// <summary> + /// A simple ExpectedExceptionAttribute + /// </summary> + [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] + public class ExpectedExceptionAttribute : NUnitAttribute, IWrapTestMethod + { + private readonly Type _expectedExceptionType; + + public ExpectedExceptionAttribute(Type type) + { + _expectedExceptionType = type; + } + + public TestCommand Wrap(TestCommand command) + { + return new ExpectedExceptionCommand(command, _expectedExceptionType); + } + + private class ExpectedExceptionCommand : DelegatingTestCommand + { + private readonly Type _expectedType; + + public ExpectedExceptionCommand(TestCommand innerCommand, Type expectedType) + : base(innerCommand) + { + _expectedType = expectedType; + } + + public override TestResult Execute(TestExecutionContext context) + { + Type caughtType = null; + + try + { + innerCommand.Execute(context); + } + catch (Exception ex) + { + if (ex is NUnitException) + ex = ex.InnerException; + caughtType = ex.GetType(); + } + + if (caughtType == _expectedType) + context.CurrentResult.SetResult(ResultState.Success); + else if (caughtType != null) + context.CurrentResult.SetResult(ResultState.Failure, + string.Format("Expected {0} but got {1}", _expectedType.Name, caughtType.Name)); + else + context.CurrentResult.SetResult(ResultState.Failure, + string.Format("Expected {0} but no exception was thrown", _expectedType.Name)); + + return context.CurrentResult; + } + } + } +} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/1.3/log4net.tests/log4net.tests.csproj ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net.tests/log4net.tests.csproj b/netstandard/1.3/log4net.tests/log4net.tests.csproj new file mode 100755 index 0000000..444f30c --- /dev/null +++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj @@ -0,0 +1,32 @@ +<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\Core\**\*.cs;..\..\tests\src\DateFormatter\**\*.cs;..\..\tests\src\Hierarchy\**\*.cs;..\..\tests\src\Layout\**\*.cs;..\..\tests\src\LoggerRepository\**\*.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;packag es\**" /> + </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/65e50311/netstandard/1.3/log4net/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net/CompatibilityExtensions.cs b/netstandard/1.3/log4net/CompatibilityExtensions.cs new file mode 100644 index 0000000..48957f2 --- /dev/null +++ b/netstandard/1.3/log4net/CompatibilityExtensions.cs @@ -0,0 +1,53 @@ +#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 + +#if NETSTANDARD1_3 + +using System; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Reflection; +using System.Threading; +using System.Xml; + +namespace log4net +{ + internal static class CompatibilityExtensions + { + public static void Close(this Mutex mutex) => mutex.Dispose(); + public static void Close(this Socket socket) => socket.Dispose(); + public static void Close(this Stream stream) => stream.Dispose(); + public static void Close(this StreamWriter streamWriter) => streamWriter.Dispose(); + public static void Close(this UdpClient client) => client.Dispose(); + public static void Close(this WebResponse response) => response.Dispose(); + public static void Close(this XmlWriter xmlWriter) => xmlWriter.Dispose(); + + public static Attribute[] GetCustomAttributes(this Type type, Type other, bool inherit) => type.GetTypeInfo().GetCustomAttributes(other, inherit).ToArray(); + public static bool IsAssignableFrom(this Type type, Type other) => type.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo()); + public static bool IsSubclassOf(this Type type, Type t) => type.GetTypeInfo().IsSubclassOf(t); + + public static string ToLower(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToLower(s); + public static string ToUpper(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToUpper(s); + } +} + +#endif http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/1.3/log4net/log4net.csproj ---------------------------------------------------------------------- diff --git a/netstandard/1.3/log4net/log4net.csproj b/netstandard/1.3/log4net/log4net.csproj new file mode 100755 index 0000000..c863441 --- /dev/null +++ b/netstandard/1.3/log4net/log4net.csproj @@ -0,0 +1,62 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <Copyright>Copyright 2004-2017 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\AppSettingPatternConverter.cs;..\..\src\Util\PatternStringConverters\EnvironmentFol derPathPatternConverter.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\PatternStringConverters\AppSettingPatternConverter.cs;..\..\src\Util\PatternSt ringConverters\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> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/log4net.netstandard.sln ---------------------------------------------------------------------- diff --git a/netstandard/log4net.netstandard.sln b/netstandard/log4net.netstandard.sln deleted file mode 100644 index c578a2e..0000000 --- a/netstandard/log4net.netstandard.sln +++ /dev/null @@ -1,33 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -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/65e50311/netstandard/log4net.tests/ApplicationException.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/ApplicationException.cs b/netstandard/log4net.tests/ApplicationException.cs deleted file mode 100644 index 30bfe37..0000000 --- a/netstandard/log4net.tests/ApplicationException.cs +++ /dev/null @@ -1,27 +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 - -using System; - -namespace log4net.Tests -{ - public class ApplicationException : Exception - { - } -} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/log4net.tests/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/CompatibilityExtensions.cs b/netstandard/log4net.tests/CompatibilityExtensions.cs deleted file mode 100644 index a634ed0..0000000 --- a/netstandard/log4net.tests/CompatibilityExtensions.cs +++ /dev/null @@ -1,38 +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 - -using System; -using System.IO; -using System.Reflection; -using System.Threading; - -namespace log4net -{ - internal static class CompatibilityExtensions - { - public static void Close(this Mutex mutex) => mutex.Dispose(); - public static void Close(this Stream stream) => stream.Dispose(); - public static void Close(this StreamReader streamReader) => streamReader.Dispose(); - - public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingAttr, object binder, Type[] types, object[] modifiers) - { - return type.GetConstructor(types); - } - } -} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/log4net.tests/ExpectedExceptionAttribute.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/ExpectedExceptionAttribute.cs b/netstandard/log4net.tests/ExpectedExceptionAttribute.cs deleted file mode 100644 index 771922a..0000000 --- a/netstandard/log4net.tests/ExpectedExceptionAttribute.cs +++ /dev/null @@ -1,85 +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 - -// https://github.com/nunit/nunit-csharp-samples/blob/master/ExpectedExceptionExample/ExpectedExceptionAttribute.cs - -using System; -using NUnit.Framework.Interfaces; -using NUnit.Framework.Internal; -using NUnit.Framework.Internal.Commands; - -namespace NUnit.Framework -{ - /// <summary> - /// A simple ExpectedExceptionAttribute - /// </summary> - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)] - public class ExpectedExceptionAttribute : NUnitAttribute, IWrapTestMethod - { - private readonly Type _expectedExceptionType; - - public ExpectedExceptionAttribute(Type type) - { - _expectedExceptionType = type; - } - - public TestCommand Wrap(TestCommand command) - { - return new ExpectedExceptionCommand(command, _expectedExceptionType); - } - - private class ExpectedExceptionCommand : DelegatingTestCommand - { - private readonly Type _expectedType; - - public ExpectedExceptionCommand(TestCommand innerCommand, Type expectedType) - : base(innerCommand) - { - _expectedType = expectedType; - } - - public override TestResult Execute(TestExecutionContext context) - { - Type caughtType = null; - - try - { - innerCommand.Execute(context); - } - catch (Exception ex) - { - if (ex is NUnitException) - ex = ex.InnerException; - caughtType = ex.GetType(); - } - - if (caughtType == _expectedType) - context.CurrentResult.SetResult(ResultState.Success); - else if (caughtType != null) - context.CurrentResult.SetResult(ResultState.Failure, - string.Format("Expected {0} but got {1}", _expectedType.Name, caughtType.Name)); - else - context.CurrentResult.SetResult(ResultState.Failure, - string.Format("Expected {0} but no exception was thrown", _expectedType.Name)); - - return context.CurrentResult; - } - } - } -} http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/log4net.tests/log4net.tests.csproj ---------------------------------------------------------------------- diff --git a/netstandard/log4net.tests/log4net.tests.csproj b/netstandard/log4net.tests/log4net.tests.csproj deleted file mode 100755 index 444f30c..0000000 --- a/netstandard/log4net.tests/log4net.tests.csproj +++ /dev/null @@ -1,32 +0,0 @@ -<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\Core\**\*.cs;..\..\tests\src\DateFormatter\**\*.cs;..\..\tests\src\Hierarchy\**\*.cs;..\..\tests\src\Layout\**\*.cs;..\..\tests\src\LoggerRepository\**\*.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;packag es\**" /> - </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/65e50311/netstandard/log4net/CompatibilityExtensions.cs ---------------------------------------------------------------------- diff --git a/netstandard/log4net/CompatibilityExtensions.cs b/netstandard/log4net/CompatibilityExtensions.cs deleted file mode 100644 index 48957f2..0000000 --- a/netstandard/log4net/CompatibilityExtensions.cs +++ /dev/null @@ -1,53 +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 - -#if NETSTANDARD1_3 - -using System; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Reflection; -using System.Threading; -using System.Xml; - -namespace log4net -{ - internal static class CompatibilityExtensions - { - public static void Close(this Mutex mutex) => mutex.Dispose(); - public static void Close(this Socket socket) => socket.Dispose(); - public static void Close(this Stream stream) => stream.Dispose(); - public static void Close(this StreamWriter streamWriter) => streamWriter.Dispose(); - public static void Close(this UdpClient client) => client.Dispose(); - public static void Close(this WebResponse response) => response.Dispose(); - public static void Close(this XmlWriter xmlWriter) => xmlWriter.Dispose(); - - public static Attribute[] GetCustomAttributes(this Type type, Type other, bool inherit) => type.GetTypeInfo().GetCustomAttributes(other, inherit).ToArray(); - public static bool IsAssignableFrom(this Type type, Type other) => type.GetTypeInfo().IsAssignableFrom(other.GetTypeInfo()); - public static bool IsSubclassOf(this Type type, Type t) => type.GetTypeInfo().IsSubclassOf(t); - - public static string ToLower(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToLower(s); - public static string ToUpper(this string s, CultureInfo cultureInfo) => cultureInfo.TextInfo.ToUpper(s); - } -} - -#endif http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/netstandard/log4net/log4net.csproj ---------------------------------------------------------------------- diff --git a/netstandard/log4net/log4net.csproj b/netstandard/log4net/log4net.csproj deleted file mode 100755 index c863441..0000000 --- a/netstandard/log4net/log4net.csproj +++ /dev/null @@ -1,62 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - - <PropertyGroup> - <Copyright>Copyright 2004-2017 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\AppSettingPatternConverter.cs;..\..\src\Util\PatternStringConverters\EnvironmentFol derPathPatternConverter.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\PatternStringConverters\AppSettingPatternConverter.cs;..\..\src\Util\PatternSt ringConverters\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> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/65e50311/tests/nant.build ---------------------------------------------------------------------- diff --git a/tests/nant.build b/tests/nant.build index ba6fab5..b04af84 100644 --- a/tests/nant.build +++ b/tests/nant.build @@ -1,10 +1,10 @@ <?xml version="1.0" ?> <!-- -Licensed to the Apache Software Foundation (ASF) under one or more +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. +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 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 @@ -765,10 +765,10 @@ limitations under the License. <target name="runtests" description="Runs log4net tests"> <!-- - Because the <nunit2> task does not support multiple frameworks through the + Because the <nunit2> task does not support multiple frameworks through the nant.settings.currentframework setting we cannot just run the tests for each framework. Only the tests for the current framework are run. - + <if test="${framework::exists('net-1.0')}"> <call target="runtests-net-1.0" /> </if> @@ -787,7 +787,7 @@ limitations under the License. <call target="runtests-${nant.settings.currentframework}" /> </if> </target> - + <target name="runtests-net-1.0" description="Runs log4net tests on .NET Framework 1.0 version" depends="compile-net-1.0"> <nunit2 failonerror="false"> <formatter type="Xml" usefile="true" extension=".nunit.xml" outputdir="${current.bin.dir}" /> @@ -866,7 +866,7 @@ limitations under the License. </target> <target name="runtests-netstandard-1.3" description="Runs log4net tests on .NET Standard 1.3"> - <exec program="dotnet" workingdir="${log4net.basedir}/netstandard/log4net.tests" failonerror="false"> + <exec program="dotnet" workingdir="${log4net.basedir}/netstandard/1.3/log4net.tests" failonerror="false"> <arg value="test"/> <arg value="--logger:trx"/> </exec>
