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 6beeea4b6447975c36d831293ded8978b8b312c9 Author: Jan Friedrich <freeand...@apache.org> 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 | 6 +++--- src/log4net.Tests/log4net.Tests.csproj | 5 ++++- src/log4net/log4net.csproj | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6c0a06d1..86205a46 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-latest, ubuntu-22.04, windows-latest ] + os: [ macos-14, ubuntu-22.04, windows-latest ] env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 @@ -53,7 +53,7 @@ jobs: - name: Build run: | dotnet build ./src/log4net.sln - + - name: Test run: | - dotnet test ./src/log4net.sln + dotnet test ./src/log4net.sln \ No newline at end of file diff --git a/src/log4net.Tests/log4net.Tests.csproj b/src/log4net.Tests/log4net.Tests.csproj index b144e43a..3fa79dd9 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> @@ -14,6 +14,9 @@ <NoWarn>CS8032</NoWarn> <VSTestLogger>quackers</VSTestLogger> </PropertyGroup> + <PropertyGroup Condition="'$(SkipNet4)' != 'true'"> + <TargetFrameworks>net462;$(TargetFrameworks)</TargetFrameworks> + </PropertyGroup> <ItemGroup> <Compile Include="..\log4net\Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" Link="Diagnostics\CodeAnalysis\CallerArgumentExpressionAttribute.cs" /> <Compile Include="..\log4net\Diagnostics\CodeAnalysis\IsExternalInit.cs" Link="Diagnostics\CodeAnalysis\IsExternalInit.cs" /> diff --git a/src/log4net/log4net.csproj b/src/log4net/log4net.csproj index 328c5343..c5b7d3ff 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>