diff --git a/.editorconfig b/.editorconfig index 2922ae5..7fb9ef8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -254,12 +254,7 @@ dotnet_naming_rule.async_methods_end_in_async.style = end_in_async_style # dotnet_naming_style.. = dotnet_naming_style.end_in_async_style.capitalization = pascal_case -dotnet_naming_style.end_in_async_style.word_separator = -dotnet_naming_style.end_in_async_style.required_prefix = dotnet_naming_style.end_in_async_style.required_suffix = Async # dotnet_naming_rule..severity = dotnet_naming_rule.async_methods_end_in_async.severity = warning - -# Remove unnecessary import https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005 -dotnet_diagnostic.IDE0005.severity = warning diff --git a/.globalconfig b/.globalconfig new file mode 100644 index 0000000..d129e6a --- /dev/null +++ b/.globalconfig @@ -0,0 +1,4 @@ +is_global = true + +# Remove unnecessary import https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005 +dotnet_diagnostic.IDE0005.severity = warning diff --git a/.net.csproj b/.net.csproj new file mode 100644 index 0000000..8299687 --- /dev/null +++ b/.net.csproj @@ -0,0 +1,12 @@ + + + + net10.0 + false + + + + + + + \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..0cbdf35 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,65 @@ + + + + 10.0 + enable + library + false + false + true + true + true + + + + true + embedded + all + true + + + + true + + + + true + + + + F# Destructuring extensions for Serilog + Destructurama for F# + + + + https://github.com/destructurama/ + Destructurama Contributors, Serilog Contributors + $([System.DateTime]::Now.ToString(yyyy)) + Copyright © Serilog Contributors 2019-$(CurrentYear) + Apache-2.0 + false + serilog;fsharp + README.md + true + true + icon.png + https://github.com/destructurama/fsharp/tree/master/assets/icon.png + Check CHANGES.md. + true + true + true + 4.0.0 + true + true + true + + + + + true + ../../assets/Destructurama.snk + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..bfc3d49 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,22 @@ + + + true + true + true + true + + + + + + + + + + + + + + + + diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000..d519c34 --- /dev/null +++ b/NuGet.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/destructurama-fsharp.slnx b/destructurama-fsharp.slnx new file mode 100644 index 0000000..871d170 --- /dev/null +++ b/destructurama-fsharp.slnx @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Destructurama.FSharp.Tests/Destructurama.FSharp.Tests.fsproj b/src/Destructurama.FSharp.Tests/Destructurama.FSharp.Tests.fsproj index ebd68a5..c33aa58 100644 --- a/src/Destructurama.FSharp.Tests/Destructurama.FSharp.Tests.fsproj +++ b/src/Destructurama.FSharp.Tests/Destructurama.FSharp.Tests.fsproj @@ -2,24 +2,25 @@ net10.0 + true + + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - + + + diff --git a/src/Destructurama.FSharp.Tests/packages.lock.json b/src/Destructurama.FSharp.Tests/packages.lock.json new file mode 100644 index 0000000..94b5d3c --- /dev/null +++ b/src/Destructurama.FSharp.Tests/packages.lock.json @@ -0,0 +1,129 @@ +{ + "version": 2, + "dependencies": { + "net10.0": { + "coverlet.collector": { + "type": "Direct", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "27jXSV/0DbVqF5jDrAxuQFZ9oaz6gmG03p8ttxAFk+X0M4woFYj7MoWDLCna5EGLb0CE6OE7X6ZH3Wt5smTtaA==" + }, + "DotNetProjectFile.Analyzers": { + "type": "Direct", + "requested": "[1.16.1, )", + "resolved": "1.16.1", + "contentHash": "WUqCgl7unxfAS98+H16uY3bYokM1g1sjmyvqWtBdVVwreNxjztPfDZrjMZGenE+R0LYqJO8fGDuAB6M/YJrCcw==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[18.9.0, )", + "resolved": "18.9.0", + "contentHash": "xIzVXa/VpKXqDWzyC/5Hw8JbFY5u9k3Jc53CpcjBiOXvkQGio484LD9FNwOiGUSMDcYL3Rcw9sNgGi5WrswlPQ==", + "dependencies": { + "Microsoft.CodeCoverage": "18.9.0", + "Microsoft.TestPlatform.TestHost": "18.9.0" + } + }, + "SerilogAnalyzer": { + "type": "Direct", + "requested": "[0.15.0, )", + "resolved": "0.15.0", + "contentHash": "sVpwfls4MfNnwIXLSGCgaUnV+c9kgJ8ia6GsyRcpd4Vs3gLogSDtSYBYrre2K2u/PNMo8GgG09RehwVnze70Tw==" + }, + "xunit": { + "type": "Direct", + "requested": "[2.9.3, )", + "resolved": "2.9.3", + "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==", + "dependencies": { + "xunit.analyzers": "1.18.0", + "xunit.assert": "2.9.3", + "xunit.core": "[2.9.3]" + } + }, + "xunit.runner.visualstudio": { + "type": "Direct", + "requested": "[3.1.5, )", + "resolved": "3.1.5", + "contentHash": "tKi7dSTwP4m5m9eXPM2Ime4Kn7xNf4x4zT9sdLO/G4hZVnQCRiMTWoSZqI/pYTVeI27oPPqHBKYI/DjJ9GsYgA==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "18.9.0", + "contentHash": "MtegCIKGuG0r/LCdIjoR1HgzCGIUBhR3aNdbtQpts5vMXQuqBDZ2Jsd2uFKoHFM2XrQV6ZrDf3F5oLi3SLTp8w==" + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "18.9.0", + "contentHash": "Fz/qXC52VXXopzHj7v2reCKcCqSxkTDCkEDfkNAH0vni/7qK/KLMiEYtRmnUanxO2F2g2zZZ60qCpxF0AF7URA==" + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "18.9.0", + "contentHash": "Oq+Pma/J86aZL72t71bcESvDszDsTjUfl6PIsuDdPoKTHZfNMhKamCfLD5fKx51W/u0KozXtJo2/3fnt0sgPxg==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "18.9.0" + } + }, + "xunit.abstractions": { + "type": "Transitive", + "resolved": "2.0.3", + "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg==" + }, + "xunit.analyzers": { + "type": "Transitive", + "resolved": "1.18.0", + "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ==" + }, + "xunit.assert": { + "type": "Transitive", + "resolved": "2.9.3", + "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA==" + }, + "xunit.core": { + "type": "Transitive", + "resolved": "2.9.3", + "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==", + "dependencies": { + "xunit.extensibility.core": "[2.9.3]", + "xunit.extensibility.execution": "[2.9.3]" + } + }, + "xunit.extensibility.core": { + "type": "Transitive", + "resolved": "2.9.3", + "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==", + "dependencies": { + "xunit.abstractions": "2.0.3" + } + }, + "xunit.extensibility.execution": { + "type": "Transitive", + "resolved": "2.9.3", + "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==", + "dependencies": { + "xunit.extensibility.core": "[2.9.3]" + } + }, + "destructurama.fsharp": { + "type": "Project", + "dependencies": { + "FSharp.Core": "[11.0.100, )", + "Serilog": "[4.4.0, )" + } + }, + "FSharp.Core": { + "type": "CentralTransitive", + "requested": "[11.0.100, )", + "resolved": "11.0.100", + "contentHash": "ijfOz8ihqkFNdKUY57l8YTrbJNfQW/6tFYAUU57ByZzmTxxf1o12cQaCqDOjNqAz4h86AKS7IwQkNhYcrjLeCQ==" + }, + "Serilog": { + "type": "CentralTransitive", + "requested": "[4.4.0, )", + "resolved": "4.4.0", + "contentHash": "ZC6Le3rr4TVJJjS4KsQAesxeF1EhW9qcZmmG7eP5Y2G3+gTGkJEUXkq4+tZNPtyp05I0wWOxnIjwtxFweJsObw==" + } + } + } +} \ No newline at end of file diff --git a/src/Destructurama.FSharp/Destructurama.FSharp.fsproj b/src/Destructurama.FSharp/Destructurama.FSharp.fsproj index 738404e..1a74e6e 100644 --- a/src/Destructurama.FSharp/Destructurama.FSharp.fsproj +++ b/src/Destructurama.FSharp/Destructurama.FSharp.fsproj @@ -1,9 +1,8 @@ - + netstandard2.0 - F# Destructuring extensions for Serilog - Native support for destructuring F# types when logging to Serilog. + true @@ -11,8 +10,17 @@ - - + + + + + + + + + + + diff --git a/src/Destructurama.FSharp/Destructurama.FSharp.nuspec b/src/Destructurama.FSharp/Destructurama.FSharp.nuspec index d4dbe72..109402e 100644 --- a/src/Destructurama.FSharp/Destructurama.FSharp.nuspec +++ b/src/Destructurama.FSharp/Destructurama.FSharp.nuspec @@ -1,4 +1,4 @@ - + Destructurama.FSharp diff --git a/src/Destructurama.FSharp/packages.config b/src/Destructurama.FSharp/packages.config index eaae832..45186d9 100644 --- a/src/Destructurama.FSharp/packages.config +++ b/src/Destructurama.FSharp/packages.config @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/Destructurama.FSharp/packages.lock.json b/src/Destructurama.FSharp/packages.lock.json new file mode 100644 index 0000000..3a8216c --- /dev/null +++ b/src/Destructurama.FSharp/packages.lock.json @@ -0,0 +1,105 @@ +{ + "version": 2, + "dependencies": { + ".NETStandard,Version=v2.0": { + "DotNetProjectFile.Analyzers": { + "type": "Direct", + "requested": "[1.16.1, )", + "resolved": "1.16.1", + "contentHash": "WUqCgl7unxfAS98+H16uY3bYokM1g1sjmyvqWtBdVVwreNxjztPfDZrjMZGenE+R0LYqJO8fGDuAB6M/YJrCcw==" + }, + "FSharp.Core": { + "type": "Direct", + "requested": "[11.0.100, )", + "resolved": "11.0.100", + "contentHash": "ijfOz8ihqkFNdKUY57l8YTrbJNfQW/6tFYAUU57ByZzmTxxf1o12cQaCqDOjNqAz4h86AKS7IwQkNhYcrjLeCQ==" + }, + "MinVer": { + "type": "Direct", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "2lMTCQl5bGP4iv0JNkockPnyllC6eHLz+CoK2ICvalvHod+exXSxueu9hq+zNkU7bZBJf8wMfeRC/Edn8AGmEg==" + }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, + "Serilog": { + "type": "Direct", + "requested": "[4.4.0, )", + "resolved": "4.4.0", + "contentHash": "ZC6Le3rr4TVJJjS4KsQAesxeF1EhW9qcZmmG7eP5Y2G3+gTGkJEUXkq4+tZNPtyp05I0wWOxnIjwtxFweJsObw==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.Threading.Channels": "8.0.0" + } + }, + "SerilogAnalyzer": { + "type": "Direct", + "requested": "[0.15.0, )", + "resolved": "0.15.0", + "contentHash": "sVpwfls4MfNnwIXLSGCgaUnV+c9kgJ8ia6GsyRcpd4Vs3gLogSDtSYBYrre2K2u/PNMo8GgG09RehwVnze70Tw==" + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + } + } + } +} \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index cf986d9..0000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - true - true - - latest - true - true - true - Destructurama Contributors, Serilog Contributors - $([System.DateTime]::Now.ToString(yyyy)) - Copyright © Serilog Contributors 2019-$(CurrentYear) - Apache-2.0 - false - icon.png - embedded - true - true - - True - serilog;fsharp - enable - README.md - true - enable - true - ../../assets/Destructurama.snk - - ../../../../../../assets/Destructurama.snk - - - - - - - - - diff --git a/src/Samples/Samples.fsproj b/src/Samples/Samples.fsproj index 0c37f91..1e9fbf2 100644 --- a/src/Samples/Samples.fsproj +++ b/src/Samples/Samples.fsproj @@ -3,7 +3,6 @@ Exe net10.0 - false @@ -11,9 +10,12 @@ - - + + + + + diff --git a/src/Samples/packages.lock.json b/src/Samples/packages.lock.json new file mode 100644 index 0000000..e9c2ef8 --- /dev/null +++ b/src/Samples/packages.lock.json @@ -0,0 +1,47 @@ +{ + "version": 2, + "dependencies": { + "net10.0": { + "DotNetProjectFile.Analyzers": { + "type": "Direct", + "requested": "[1.16.1, )", + "resolved": "1.16.1", + "contentHash": "WUqCgl7unxfAS98+H16uY3bYokM1g1sjmyvqWtBdVVwreNxjztPfDZrjMZGenE+R0LYqJO8fGDuAB6M/YJrCcw==" + }, + "Serilog": { + "type": "Direct", + "requested": "[4.4.0, )", + "resolved": "4.4.0", + "contentHash": "ZC6Le3rr4TVJJjS4KsQAesxeF1EhW9qcZmmG7eP5Y2G3+gTGkJEUXkq4+tZNPtyp05I0wWOxnIjwtxFweJsObw==" + }, + "Serilog.Sinks.Console": { + "type": "Direct", + "requested": "[6.1.1, )", + "resolved": "6.1.1", + "contentHash": "8jbqgjUyZlfCuSTaJk6lOca465OndqOz3KZP6Cryt/IqZYybyBu7GP0fE/AXBzrrQB3EBmQntBFAvMVz1COvAA==", + "dependencies": { + "Serilog": "4.0.0" + } + }, + "SerilogAnalyzer": { + "type": "Direct", + "requested": "[0.15.0, )", + "resolved": "0.15.0", + "contentHash": "sVpwfls4MfNnwIXLSGCgaUnV+c9kgJ8ia6GsyRcpd4Vs3gLogSDtSYBYrre2K2u/PNMo8GgG09RehwVnze70Tw==" + }, + "destructurama.fsharp": { + "type": "Project", + "dependencies": { + "FSharp.Core": "[11.0.100, )", + "Serilog": "[4.4.0, )" + } + }, + "FSharp.Core": { + "type": "CentralTransitive", + "requested": "[11.0.100, )", + "resolved": "11.0.100", + "contentHash": "ijfOz8ihqkFNdKUY57l8YTrbJNfQW/6tFYAUU57ByZzmTxxf1o12cQaCqDOjNqAz4h86AKS7IwQkNhYcrjLeCQ==" + } + } + } +} \ No newline at end of file diff --git a/src/destructurama-fsharp.slnx b/src/destructurama-fsharp.slnx deleted file mode 100644 index e4b9cfd..0000000 --- a/src/destructurama-fsharp.slnx +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -