This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a commit to branch Feature/FixMacOS in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 9db566802962370cda44548de7b3288fa42c84d9 Author: Jan Friedrich <[email protected]> AuthorDate: Thu Aug 21 20:43:20 2025 +0200 skip net462 on MacOS for now - mono no longer works on the current image --- .github/workflows/build.yaml | 12 ++++++------ src/log4net.Tests/log4net.Tests.csproj | 5 ++++- src/log4net/log4net.csproj | 5 ++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6c0a06d1..bf5159a1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,11 +33,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest, ubuntu-22.04, windows-latest ] + include: + os: [macos-latest, ubuntu-22.04, windows-latest] env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_CLI_TELEMETRY_OPTOUT: 1 + SkipNet4: ${{ matrix.os == 'macos-latest' ? 'true' : 'false' }} steps: @@ -51,9 +53,7 @@ jobs: dotnet-quality: ga - name: Build - run: | - dotnet build ./src/log4net.sln - + run: dotnet build ./src/log4net.sln + - name: Test - run: | - dotnet test ./src/log4net.sln + run: dotnet test ./src/log4net.sln diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj index b144e43a..123f375a 100644 --- a/src/log4net.Tests/log4net.Tests.csproj +++ b/src/log4net.Tests/log4net.Tests.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <IsTestProject>true</IsTestProject> - <TargetFrameworks>net462;net8.0</TargetFrameworks> + <TargetFrameworks>net8.0</TargetFrameworks> <NoWarn>NETSDK1138;CS1701</NoWarn> <OutputType>Library</OutputType> <OutputPath>bin\$(Configuration)</OutputPath> @@ -13,6 +13,9 @@ <!-- suppress analyzer mismatch warning --> <NoWarn>CS8032</NoWarn> <VSTestLogger>quackers</VSTestLogger> + </PropertyGroup Condition="'$(SkipNet4)' != 'true'"> + <TargetFrameworks>net462;$(TargetFrameworks)</TargetFrameworks> + <PropertyGroup> </PropertyGroup> <ItemGroup> <Compile Include="..\log4net\Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" Link="Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" /> diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 328c5343..a49cc869 100644 --- a/src/log4net/log4net.csproj +++ b/src/log4net/log4net.csproj @@ -19,7 +19,7 @@ at arbitrary granularity. log4net is designed with two distinct goals in mind: speed and flexibility </Description> <Platforms>AnyCPU</Platforms> - <TargetFrameworks>net462;netstandard2.0</TargetFrameworks> + <TargetFrameworks>netstandard2.0</TargetFrameworks> <Configurations>Debug;Release</Configurations> <RootNamespace>log4net</RootNamespace> <AssemblyName>log4net</AssemblyName> @@ -35,6 +35,9 @@ log4net is designed with two distinct goals in mind: speed and flexibility <DocumentationFile>..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> </PropertyGroup> + </PropertyGroup Condition="'$(SkipNet4)' != 'true'"> + <TargetFrameworks>net462;$(TargetFrameworks)</TargetFrameworks> + <PropertyGroup> <PropertyGroup Label="NuGet generation"> <Authors>The Apache Software Foundation</Authors> <Copyright>Copyright 2004-2024 The Apache Software Foundation</Copyright>
