Skip to content

Commit 79fc262

Browse files
0xced0xced
committed
Drop support for .NET 6
1 parent 9661c5e commit 79fc262

File tree

5 files changed

+30
-397
lines changed

5 files changed

+30
-397
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
# [2.0.0][Unreleased] - Unreleased
8+
9+
- **Breaking Change**: Drop support for .NET 6 which is [ended](https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core) on November 12, 2024. Note that .NET 6 is still supported through .NET Standard 2.0.
10+
711
## [1.4.0][1.4.0] - 2025-09-19
812

913
- Properties whose values are `null` are now always serialized with a `value` attribute. Thanks to @southernprogrammer for reporting this issue. See the [Null text](https://github.com/serilog-contrib/serilog-formatting-log4net#null-text) documentation in the README for more information.

‎src/CompatibilitySuppressions.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4+
<Suppression>
5+
<DiagnosticId>CP0008</DiagnosticId>
6+
<Target>T:Serilog.Formatting.Log4Net.CDataMode</Target>
7+
<Left>lib/net6.0/Serilog.Formatting.Log4Net.dll</Left>
8+
<Right>lib/netstandard2.0/Serilog.Formatting.Log4Net.dll</Right>
9+
<IsBaselineSuppression>true</IsBaselineSuppression>
10+
</Suppression>
11+
<Suppression>
12+
<DiagnosticId>CP0008</DiagnosticId>
13+
<Target>T:Serilog.Formatting.Log4Net.Indentation</Target>
14+
<Left>lib/net6.0/Serilog.Formatting.Log4Net.dll</Left>
15+
<Right>lib/netstandard2.0/Serilog.Formatting.Log4Net.dll</Right>
16+
<IsBaselineSuppression>true</IsBaselineSuppression>
17+
</Suppression>
18+
<Suppression>
19+
<DiagnosticId>CP0008</DiagnosticId>
20+
<Target>T:Serilog.Formatting.Log4Net.LineEnding</Target>
21+
<Left>lib/net6.0/Serilog.Formatting.Log4Net.dll</Left>
22+
<Right>lib/netstandard2.0/Serilog.Formatting.Log4Net.dll</Right>
23+
<IsBaselineSuppression>true</IsBaselineSuppression>
24+
</Suppression>
25+
</Suppressions>

‎src/Serilog.Formatting.Log4Net.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Label="Compiling">

‎src/packages.lock.json‎

Lines changed: 0 additions & 343 deletions
Original file line numberDiff line numberDiff line change
@@ -353,349 +353,6 @@
353353
}
354354
}
355355
},
356-
"net6.0": {
357-
"MinVer": {
358-
"type": "Direct",
359-
"requested": "[6.0.0, )",
360-
"resolved": "6.0.0",
361-
"contentHash": "+/SsmiySsXJlvQLCGBqaZKNVt3s/Y/HbAdwtop7Km2CnuZbaScoqkWJEBQ5Cy9ebkn6kCYKrHsXgwrFdTgcb3g=="
362-
},
363-
"Serilog": {
364-
"type": "Direct",
365-
"requested": "[2.0.0, )",
366-
"resolved": "2.0.0",
367-
"contentHash": "PKR/FMxfHOhX1p3Qs54Uv9dJEC09sI91cVz39Jt/2f/BpCYHTt9F1RpogSJTFU9xxW6j9FHd+P7aBcC0qMeuqg==",
368-
"dependencies": {
369-
"Microsoft.CSharp": "4.0.1",
370-
"System.Collections": "4.0.11",
371-
"System.Dynamic.Runtime": "4.0.11",
372-
"System.Globalization": "4.0.11",
373-
"System.Linq": "4.1.0",
374-
"System.Reflection": "4.1.0",
375-
"System.Reflection.Extensions": "4.0.1",
376-
"System.Runtime": "4.1.0",
377-
"System.Runtime.Extensions": "4.1.0",
378-
"System.Text.RegularExpressions": "4.1.0",
379-
"System.Threading": "4.0.11"
380-
}
381-
},
382-
"Microsoft.CSharp": {
383-
"type": "Transitive",
384-
"resolved": "4.0.1",
385-
"contentHash": "17h8b5mXa87XYKrrVqdgZ38JefSUqLChUQpXgSnpzsM0nDOhE40FTeNWOJ/YmySGV6tG6T8+hjz6vxbknHJr6A==",
386-
"dependencies": {
387-
"System.Collections": "4.0.11",
388-
"System.Diagnostics.Debug": "4.0.11",
389-
"System.Dynamic.Runtime": "4.0.11",
390-
"System.Globalization": "4.0.11",
391-
"System.Linq": "4.1.0",
392-
"System.Linq.Expressions": "4.1.0",
393-
"System.ObjectModel": "4.0.12",
394-
"System.Reflection": "4.1.0",
395-
"System.Reflection.Extensions": "4.0.1",
396-
"System.Reflection.Primitives": "4.0.1",
397-
"System.Reflection.TypeExtensions": "4.1.0",
398-
"System.Resources.ResourceManager": "4.0.1",
399-
"System.Runtime": "4.1.0",
400-
"System.Runtime.Extensions": "4.1.0",
401-
"System.Runtime.InteropServices": "4.1.0",
402-
"System.Threading": "4.0.11"
403-
}
404-
},
405-
"Microsoft.NETCore.Platforms": {
406-
"type": "Transitive",
407-
"resolved": "1.0.1",
408-
"contentHash": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ=="
409-
},
410-
"Microsoft.NETCore.Targets": {
411-
"type": "Transitive",
412-
"resolved": "1.0.1",
413-
"contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw=="
414-
},
415-
"System.Collections": {
416-
"type": "Transitive",
417-
"resolved": "4.0.11",
418-
"contentHash": "YUJGz6eFKqS0V//mLt25vFGrrCvOnsXjlvFQs+KimpwNxug9x0Pzy4PlFMU3Q2IzqAa9G2L4LsK3+9vCBK7oTg==",
419-
"dependencies": {
420-
"Microsoft.NETCore.Platforms": "1.0.1",
421-
"Microsoft.NETCore.Targets": "1.0.1",
422-
"System.Runtime": "4.1.0"
423-
}
424-
},
425-
"System.Diagnostics.Debug": {
426-
"type": "Transitive",
427-
"resolved": "4.0.11",
428-
"contentHash": "w5U95fVKHY4G8ASs/K5iK3J5LY+/dLFd4vKejsnI/ZhBsWS9hQakfx3Zr7lRWKg4tAw9r4iktyvsTagWkqYCiw==",
429-
"dependencies": {
430-
"Microsoft.NETCore.Platforms": "1.0.1",
431-
"Microsoft.NETCore.Targets": "1.0.1",
432-
"System.Runtime": "4.1.0"
433-
}
434-
},
435-
"System.Dynamic.Runtime": {
436-
"type": "Transitive",
437-
"resolved": "4.0.11",
438-
"contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==",
439-
"dependencies": {
440-
"System.Collections": "4.0.11",
441-
"System.Diagnostics.Debug": "4.0.11",
442-
"System.Globalization": "4.0.11",
443-
"System.Linq": "4.1.0",
444-
"System.Linq.Expressions": "4.1.0",
445-
"System.ObjectModel": "4.0.12",
446-
"System.Reflection": "4.1.0",
447-
"System.Reflection.Emit": "4.0.1",
448-
"System.Reflection.Emit.ILGeneration": "4.0.1",
449-
"System.Reflection.Primitives": "4.0.1",
450-
"System.Reflection.TypeExtensions": "4.1.0",
451-
"System.Resources.ResourceManager": "4.0.1",
452-
"System.Runtime": "4.1.0",
453-
"System.Runtime.Extensions": "4.1.0",
454-
"System.Threading": "4.0.11"
455-
}
456-
},
457-
"System.Globalization": {
458-
"type": "Transitive",
459-
"resolved": "4.0.11",
460-
"contentHash": "B95h0YLEL2oSnwF/XjqSWKnwKOy/01VWkNlsCeMTFJLLabflpGV26nK164eRs5GiaRSBGpOxQ3pKoSnnyZN5pg==",
461-
"dependencies": {
462-
"Microsoft.NETCore.Platforms": "1.0.1",
463-
"Microsoft.NETCore.Targets": "1.0.1",
464-
"System.Runtime": "4.1.0"
465-
}
466-
},
467-
"System.IO": {
468-
"type": "Transitive",
469-
"resolved": "4.1.0",
470-
"contentHash": "3KlTJceQc3gnGIaHZ7UBZO26SHL1SHE4ddrmiwumFnId+CEHP+O8r386tZKaE6zlk5/mF8vifMBzHj9SaXN+mQ==",
471-
"dependencies": {
472-
"Microsoft.NETCore.Platforms": "1.0.1",
473-
"Microsoft.NETCore.Targets": "1.0.1",
474-
"System.Runtime": "4.1.0",
475-
"System.Text.Encoding": "4.0.11",
476-
"System.Threading.Tasks": "4.0.11"
477-
}
478-
},
479-
"System.Linq": {
480-
"type": "Transitive",
481-
"resolved": "4.1.0",
482-
"contentHash": "bQ0iYFOQI0nuTnt+NQADns6ucV4DUvMdwN6CbkB1yj8i7arTGiTN5eok1kQwdnnNWSDZfIUySQY+J3d5KjWn0g==",
483-
"dependencies": {
484-
"System.Collections": "4.0.11",
485-
"System.Diagnostics.Debug": "4.0.11",
486-
"System.Resources.ResourceManager": "4.0.1",
487-
"System.Runtime": "4.1.0",
488-
"System.Runtime.Extensions": "4.1.0"
489-
}
490-
},
491-
"System.Linq.Expressions": {
492-
"type": "Transitive",
493-
"resolved": "4.1.0",
494-
"contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==",
495-
"dependencies": {
496-
"System.Collections": "4.0.11",
497-
"System.Diagnostics.Debug": "4.0.11",
498-
"System.Globalization": "4.0.11",
499-
"System.IO": "4.1.0",
500-
"System.Linq": "4.1.0",
501-
"System.ObjectModel": "4.0.12",
502-
"System.Reflection": "4.1.0",
503-
"System.Reflection.Emit": "4.0.1",
504-
"System.Reflection.Emit.ILGeneration": "4.0.1",
505-
"System.Reflection.Emit.Lightweight": "4.0.1",
506-
"System.Reflection.Extensions": "4.0.1",
507-
"System.Reflection.Primitives": "4.0.1",
508-
"System.Reflection.TypeExtensions": "4.1.0",
509-
"System.Resources.ResourceManager": "4.0.1",
510-
"System.Runtime": "4.1.0",
511-
"System.Runtime.Extensions": "4.1.0",
512-
"System.Threading": "4.0.11"
513-
}
514-
},
515-
"System.ObjectModel": {
516-
"type": "Transitive",
517-
"resolved": "4.0.12",
518-
"contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==",
519-
"dependencies": {
520-
"System.Collections": "4.0.11",
521-
"System.Diagnostics.Debug": "4.0.11",
522-
"System.Resources.ResourceManager": "4.0.1",
523-
"System.Runtime": "4.1.0",
524-
"System.Threading": "4.0.11"
525-
}
526-
},
527-
"System.Reflection": {
528-
"type": "Transitive",
529-
"resolved": "4.1.0",
530-
"contentHash": "JCKANJ0TI7kzoQzuwB/OoJANy1Lg338B6+JVacPl4TpUwi3cReg3nMLplMq2uqYfHFQpKIlHAUVAJlImZz/4ng==",
531-
"dependencies": {
532-
"Microsoft.NETCore.Platforms": "1.0.1",
533-
"Microsoft.NETCore.Targets": "1.0.1",
534-
"System.IO": "4.1.0",
535-
"System.Reflection.Primitives": "4.0.1",
536-
"System.Runtime": "4.1.0"
537-
}
538-
},
539-
"System.Reflection.Emit": {
540-
"type": "Transitive",
541-
"resolved": "4.0.1",
542-
"contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==",
543-
"dependencies": {
544-
"System.IO": "4.1.0",
545-
"System.Reflection": "4.1.0",
546-
"System.Reflection.Emit.ILGeneration": "4.0.1",
547-
"System.Reflection.Primitives": "4.0.1",
548-
"System.Runtime": "4.1.0"
549-
}
550-
},
551-
"System.Reflection.Emit.ILGeneration": {
552-
"type": "Transitive",
553-
"resolved": "4.0.1",
554-
"contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==",
555-
"dependencies": {
556-
"System.Reflection": "4.1.0",
557-
"System.Reflection.Primitives": "4.0.1",
558-
"System.Runtime": "4.1.0"
559-
}
560-
},
561-
"System.Reflection.Emit.Lightweight": {
562-
"type": "Transitive",
563-
"resolved": "4.0.1",
564-
"contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==",
565-
"dependencies": {
566-
"System.Reflection": "4.1.0",
567-
"System.Reflection.Emit.ILGeneration": "4.0.1",
568-
"System.Reflection.Primitives": "4.0.1",
569-
"System.Runtime": "4.1.0"
570-
}
571-
},
572-
"System.Reflection.Extensions": {
573-
"type": "Transitive",
574-
"resolved": "4.0.1",
575-
"contentHash": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==",
576-
"dependencies": {
577-
"Microsoft.NETCore.Platforms": "1.0.1",
578-
"Microsoft.NETCore.Targets": "1.0.1",
579-
"System.Reflection": "4.1.0",
580-
"System.Runtime": "4.1.0"
581-
}
582-
},
583-
"System.Reflection.Primitives": {
584-
"type": "Transitive",
585-
"resolved": "4.0.1",
586-
"contentHash": "4inTox4wTBaDhB7V3mPvp9XlCbeGYWVEM9/fXALd52vNEAVisc1BoVWQPuUuD0Ga//dNbA/WeMy9u9mzLxGTHQ==",
587-
"dependencies": {
588-
"Microsoft.NETCore.Platforms": "1.0.1",
589-
"Microsoft.NETCore.Targets": "1.0.1",
590-
"System.Runtime": "4.1.0"
591-
}
592-
},
593-
"System.Reflection.TypeExtensions": {
594-
"type": "Transitive",
595-
"resolved": "4.1.0",
596-
"contentHash": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==",
597-
"dependencies": {
598-
"System.Reflection": "4.1.0",
599-
"System.Runtime": "4.1.0"
600-
}
601-
},
602-
"System.Resources.ResourceManager": {
603-
"type": "Transitive",
604-
"resolved": "4.0.1",
605-
"contentHash": "TxwVeUNoTgUOdQ09gfTjvW411MF+w9MBYL7AtNVc+HtBCFlutPLhUCdZjNkjbhj3bNQWMdHboF0KIWEOjJssbA==",
606-
"dependencies": {
607-
"Microsoft.NETCore.Platforms": "1.0.1",
608-
"Microsoft.NETCore.Targets": "1.0.1",
609-
"System.Globalization": "4.0.11",
610-
"System.Reflection": "4.1.0",
611-
"System.Runtime": "4.1.0"
612-
}
613-
},
614-
"System.Runtime": {
615-
"type": "Transitive",
616-
"resolved": "4.1.0",
617-
"contentHash": "v6c/4Yaa9uWsq+JMhnOFewrYkgdNHNG2eMKuNqRn8P733rNXeRCGvV5FkkjBXn2dbVkPXOsO0xjsEeM1q2zC0g==",
618-
"dependencies": {
619-
"Microsoft.NETCore.Platforms": "1.0.1",
620-
"Microsoft.NETCore.Targets": "1.0.1"
621-
}
622-
},
623-
"System.Runtime.Extensions": {
624-
"type": "Transitive",
625-
"resolved": "4.1.0",
626-
"contentHash": "CUOHjTT/vgP0qGW22U4/hDlOqXmcPq5YicBaXdUR2UiUoLwBT+olO6we4DVbq57jeX5uXH2uerVZhf0qGj+sVQ==",
627-
"dependencies": {
628-
"Microsoft.NETCore.Platforms": "1.0.1",
629-
"Microsoft.NETCore.Targets": "1.0.1",
630-
"System.Runtime": "4.1.0"
631-
}
632-
},
633-
"System.Runtime.Handles": {
634-
"type": "Transitive",
635-
"resolved": "4.0.1",
636-
"contentHash": "nCJvEKguXEvk2ymk1gqj625vVnlK3/xdGzx0vOKicQkoquaTBJTP13AIYkocSUwHCLNBwUbXTqTWGDxBTWpt7g==",
637-
"dependencies": {
638-
"Microsoft.NETCore.Platforms": "1.0.1",
639-
"Microsoft.NETCore.Targets": "1.0.1",
640-
"System.Runtime": "4.1.0"
641-
}
642-
},
643-
"System.Runtime.InteropServices": {
644-
"type": "Transitive",
645-
"resolved": "4.1.0",
646-
"contentHash": "16eu3kjHS633yYdkjwShDHZLRNMKVi/s0bY8ODiqJ2RfMhDMAwxZaUaWVnZ2P71kr/or+X9o/xFWtNqz8ivieQ==",
647-
"dependencies": {
648-
"Microsoft.NETCore.Platforms": "1.0.1",
649-
"Microsoft.NETCore.Targets": "1.0.1",
650-
"System.Reflection": "4.1.0",
651-
"System.Reflection.Primitives": "4.0.1",
652-
"System.Runtime": "4.1.0",
653-
"System.Runtime.Handles": "4.0.1"
654-
}
655-
},
656-
"System.Text.Encoding": {
657-
"type": "Transitive",
658-
"resolved": "4.0.11",
659-
"contentHash": "U3gGeMlDZXxCEiY4DwVLSacg+DFWCvoiX+JThA/rvw37Sqrku7sEFeVBBBMBnfB6FeZHsyDx85HlKL19x0HtZA==",
660-
"dependencies": {
661-
"Microsoft.NETCore.Platforms": "1.0.1",
662-
"Microsoft.NETCore.Targets": "1.0.1",
663-
"System.Runtime": "4.1.0"
664-
}
665-
},
666-
"System.Text.RegularExpressions": {
667-
"type": "Transitive",
668-
"resolved": "4.1.0",
669-
"contentHash": "i88YCXpRTjCnoSQZtdlHkAOx4KNNik4hMy83n0+Ftlb7jvV6ZiZWMpnEZHhjBp6hQVh8gWd/iKNPzlPF7iyA2g==",
670-
"dependencies": {
671-
"System.Collections": "4.0.11",
672-
"System.Globalization": "4.0.11",
673-
"System.Resources.ResourceManager": "4.0.1",
674-
"System.Runtime": "4.1.0",
675-
"System.Runtime.Extensions": "4.1.0",
676-
"System.Threading": "4.0.11"
677-
}
678-
},
679-
"System.Threading": {
680-
"type": "Transitive",
681-
"resolved": "4.0.11",
682-
"contentHash": "N+3xqIcg3VDKyjwwCGaZ9HawG9aC6cSDI+s7ROma310GQo8vilFZa86hqKppwTHleR/G0sfOzhvgnUxWCR/DrQ==",
683-
"dependencies": {
684-
"System.Runtime": "4.1.0",
685-
"System.Threading.Tasks": "4.0.11"
686-
}
687-
},
688-
"System.Threading.Tasks": {
689-
"type": "Transitive",
690-
"resolved": "4.0.11",
691-
"contentHash": "k1S4Gc6IGwtHGT8188RSeGaX86Qw/wnrgNLshJvsdNUOPP9etMmo8S07c+UlOAx4K/xLuN9ivA1bD0LVurtIxQ==",
692-
"dependencies": {
693-
"Microsoft.NETCore.Platforms": "1.0.1",
694-
"Microsoft.NETCore.Targets": "1.0.1",
695-
"System.Runtime": "4.1.0"
696-
}
697-
}
698-
},
699356
"net8.0": {
700357
"Microsoft.NET.ILLink.Tasks": {
701358
"type": "Direct",

0 commit comments

Comments
 (0)