You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by da...@apache.org on 2020/09/30 17:42:07 UTC
[logging-log4net] 03/03: :tada: build-xplatform works;
now to get tests running...
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 141b00bbf32f8e054d804fc5e61657ebef7464b3
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Wed Sep 30 19:41:22 2020 +0200
:tada: build-xplatform works; now to get tests running...
---
package.json | 3 ++-
src/log4net.Tests/log4net.Tests.csproj | 3 ++-
src/log4net/log4net.csproj | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 2a41426..0997123 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
"description": "Log4Net is a logging framework for .NET",
"scripts": {
"test": "cross-env NUNIT_PROCESS=Single MAX_CONCURRENCY=1 run-s clean-build \"zarro test-dotnet\" run-dotnet-core-tests",
- "test-xplatform": "cross-env DOTNET_CORE=1 BUILD_CONFIGURATION=CrossPlatform run-s build run-dotnet-core-tests",
+ "test-xplatform": "run-s build-xplatform run-dotnet-core-tests",
+ "build-xplatform": "cross-env DOTNET_CORE=1 BUILD_CONFIGURATION=CrossPlatform run-s build",
"run-dotnet-core-tests": "cross-env DOTNET_CORE=1 run-s \"zarro quick-test-dotnet\"",
"clean-build": "rimraf build",
"build": "run-s clean-build \"zarro build\"",
diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj
index a15acca..7da2aaf 100644
--- a/src/log4net.Tests/log4net.Tests.csproj
+++ b/src/log4net.Tests/log4net.Tests.csproj
@@ -88,4 +88,5 @@
<Compile Remove="DateFormatter\AbsoluteTimeDateFormatterTest.cs" />
<Compile Remove="Hierarchy\XmlHierarchyConfiguratorTest.cs" />
</ItemGroup>
-</Project>
\ No newline at end of file
+ <Import Project="../MonoForFramework.targets" />
+</Project>
diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj
index 65a9828..0063fce 100644
--- a/src/log4net/log4net.csproj
+++ b/src/log4net/log4net.csproj
@@ -27,7 +27,7 @@
<TargetFrameworks>net20;net35;net35-client;net40;net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'CrossPlatform'">
- <TargetFrameworks>net20;net35;net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<Configurations>Debug;Release;CrossPlatform</Configurations>
@@ -197,4 +197,5 @@
</PackageReference>
</ItemGroup>
<PropertyGroup />
+ <Import Project="../MonoForFramework.targets" />
</Project>