Skip to content

Commit 9db5668

Browse files
committed
skip net462 on MacOS for now - mono no longer works on the current image
1 parent 7163147 commit 9db5668

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
os: [ macos-latest, ubuntu-22.04, windows-latest ]
36+
include:
37+
os: [macos-latest, ubuntu-22.04, windows-latest]
3738

3839
env:
3940
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
4041
DOTNET_CLI_TELEMETRY_OPTOUT: 1
42+
SkipNet4: ${{ matrix.os == 'macos-latest' ? 'true' : 'false' }}
4143

4244
steps:
4345

@@ -51,9 +53,7 @@ jobs:
5153
dotnet-quality: ga
5254

5355
- name: Build
54-
run: |
55-
dotnet build ./src/log4net.sln
56-
56+
run: dotnet build ./src/log4net.sln
57+
5758
- name: Test
58-
run: |
59-
dotnet test ./src/log4net.sln
59+
run: dotnet test ./src/log4net.sln

src/log4net.Tests/log4net.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsTestProject>true</IsTestProject>
4-
<TargetFrameworks>net462;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<NoWarn>NETSDK1138;CS1701</NoWarn>
66
<OutputType>Library</OutputType>
77
<OutputPath>bin\$(Configuration)</OutputPath>
@@ -13,6 +13,9 @@
1313
<!-- suppress analyzer mismatch warning -->
1414
<NoWarn>CS8032</NoWarn>
1515
<VSTestLogger>quackers</VSTestLogger>
16+
</PropertyGroup Condition="'$(SkipNet4)' != 'true'">
17+
<TargetFrameworks>net462;$(TargetFrameworks)</TargetFrameworks>
18+
<PropertyGroup>
1619
</PropertyGroup>
1720
<ItemGroup>
1821
<Compile Include="..\log4net\Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" Link="Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" />

src/log4net/log4net.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ at arbitrary granularity.
1919
log4net is designed with two distinct goals in mind: speed and flexibility
2020
</Description>
2121
<Platforms>AnyCPU</Platforms>
22-
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
22+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
2323
<Configurations>Debug;Release</Configurations>
2424
<RootNamespace>log4net</RootNamespace>
2525
<AssemblyName>log4net</AssemblyName>
@@ -35,6 +35,9 @@ log4net is designed with two distinct goals in mind: speed and flexibility
3535
<DocumentationFile>..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
3636
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3737
</PropertyGroup>
38+
</PropertyGroup Condition="'$(SkipNet4)' != 'true'">
39+
<TargetFrameworks>net462;$(TargetFrameworks)</TargetFrameworks>
40+
<PropertyGroup>
3841
<PropertyGroup Label="NuGet generation">
3942
<Authors>The Apache Software Foundation</Authors>
4043
<Copyright>Copyright 2004-2024 The Apache Software Foundation</Copyright>

0 commit comments

Comments
 (0)