Skip to content

Commit 141b00b

Browse files
committed
🎉 build-xplatform works; now to get tests running...
1 parent 9e3b1d1 commit 141b00b

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "Log4Net is a logging framework for .NET",
55
"scripts": {
66
"test": "cross-env NUNIT_PROCESS=Single MAX_CONCURRENCY=1 run-s clean-build \"zarro test-dotnet\" run-dotnet-core-tests",
7-
"test-xplatform": "cross-env DOTNET_CORE=1 BUILD_CONFIGURATION=CrossPlatform run-s build run-dotnet-core-tests",
7+
"test-xplatform": "run-s build-xplatform run-dotnet-core-tests",
8+
"build-xplatform": "cross-env DOTNET_CORE=1 BUILD_CONFIGURATION=CrossPlatform run-s build",
89
"run-dotnet-core-tests": "cross-env DOTNET_CORE=1 run-s \"zarro quick-test-dotnet\"",
910
"clean-build": "rimraf build",
1011
"build": "run-s clean-build \"zarro build\"",

src/log4net.Tests/log4net.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,5 @@
8888
<Compile Remove="DateFormatter\AbsoluteTimeDateFormatterTest.cs" />
8989
<Compile Remove="Hierarchy\XmlHierarchyConfiguratorTest.cs" />
9090
</ItemGroup>
91-
</Project>
91+
<Import Project="../MonoForFramework.targets" />
92+
</Project>

src/log4net/log4net.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<TargetFrameworks>net20;net35;net35-client;net40;net40-client;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)' == 'CrossPlatform'">
30-
<TargetFrameworks>net20;net35;net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
30+
<TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<Configurations>Debug;Release;CrossPlatform</Configurations>
@@ -197,4 +197,5 @@
197197
</PackageReference>
198198
</ItemGroup>
199199
<PropertyGroup />
200+
<Import Project="../MonoForFramework.targets" />
200201
</Project>

0 commit comments

Comments
 (0)