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/933cf8a9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/933cf8a9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/933cf8a9 Branch: refs/heads/feature/RollingFileAppender-NG Commit: 933cf8a9705884b53bcf84b836917d270ffdd5c8 Parents: bc53a4f 24a9c08 Author: Stefan Bodewig <stefan.bode...@innoq.com> Authored: Sat Jan 20 22:20:19 2018 +0100 Committer: Stefan Bodewig <stefan.bode...@innoq.com> Committed: Sat Jan 20 22:20:19 2018 +0100 ---------------------------------------------------------------------- Jenkinsfile | 15 ++++++++++++++- buildtools/docker/builder-netstandard-1.3/Dockerfile | 3 +-- netstandard/1.3/log4net.tests/log4net.tests.csproj | 4 ++++ tests/src/Appender/RollingFileAppenderTest.cs | 2 ++ 4 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/933cf8a9/Jenkinsfile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/933cf8a9/netstandard/1.3/log4net.tests/log4net.tests.csproj ---------------------------------------------------------------------- diff --cc netstandard/1.3/log4net.tests/log4net.tests.csproj index f2b8843,0000000..d389e82 mode 100755,000000..100755 --- a/netstandard/1.3/log4net.tests/log4net.tests.csproj +++ b/netstandard/1.3/log4net.tests/log4net.tests.csproj @@@ -1,49 -1,0 +1,53 @@@ +<?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> + ++ <PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> ++ <DefineConstants>$(DefineConstants);NET_STANDARD_1_ON_LINUX</DefineConstants> ++ </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>