diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll b/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll deleted file mode 100644 index 233a5c5..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll and /dev/null differ diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json b/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json deleted file mode 100644 index ee05ff4..0000000 --- a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json +++ /dev/null @@ -1,600 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "2bbb9b701bcbe15bf3ca46f43106b2c49d5939ad" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToES/1.0.2": { - "dependencies": { - "NEST": "6.5.1", - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.1.0" - }, - "runtime": { - "TomatoLog.ToES.dll": {} - } - }, - "Elasticsearch.Net/6.5.1": { - "runtime": { - "lib/netstandard2.0/Elasticsearch.Net.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.5.1.0" - } - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Server.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.AspNetCore.WebUtilities": "2.1.0", - "Microsoft.Extensions.ObjectPool": "2.1.0", - "Microsoft.Extensions.Options": "2.1.0", - "Microsoft.Net.Http.Headers": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.FileProviders.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" - } - } - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.ObjectPool.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Options/2.1.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "NEST/6.5.1": { - "dependencies": { - "Elasticsearch.Net": "6.5.1" - }, - "runtime": { - "lib/netstandard2.0/Nest.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.5.1.0" - } - } - }, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } - } - }, - "NLog/4.5.11": { - "runtime": { - "lib/netstandard2.0/NLog.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.5.11.8645" - } - } - }, - "NLog.Extensions.Logging/1.4.0": { - "dependencies": { - "Microsoft.Extensions.Logging": "2.1.0", - "NLog": "4.5.11" - }, - "runtime": { - "lib/netstandard2.0/NLog.Extensions.Logging.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.4.0.867" - } - } - }, - "NLog.Web.AspNetCore/4.8.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http": "2.1.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.1.0", - "NLog.Extensions.Logging": "1.4.0" - }, - "runtime": { - "lib/netstandard2.0/NLog.Web.AspNetCore.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.8.982.0" - } - } - }, - "System.Buffers/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Buffers.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Memory/4.5.0": { - "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Numerics.Vectors/4.4.0": { - "runtime": { - "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" - } - } - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" - } - } - }, - "System.Text.Encodings.Web/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "TomatoLog.Common/1.1.0": { - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "NLog": "4.5.11", - "NLog.Extensions.Logging": "1.4.0", - "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" - }, - "runtime": { - "TomatoLog.Common.dll": {} - } - } - } - }, - "libraries": { - "TomatoLog.ToES/1.0.2": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Elasticsearch.Net/6.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-N3B4ignGMsWZEcofG3NEXLzuYAn2gZo+x0JJe7wMKuEtkJaB5A3HBKz4z3gK+xVfmbBl0KkHfe7+byvS2udj/w==", - "path": "elasticsearch.net/6.5.1", - "hashPath": "elasticsearch.net.6.5.1.nupkg.sha512" - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1TQgBfd/NPZLR2o/h6l5Cml2ZCF5hsyV4h9WEwWwAIavrbdTnaNozGGcTOd4AOgQvogMM9UM1ajflm9Cwd0jLQ==", - "path": "microsoft.aspnetcore.hosting.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YTKMi2vHX6P+WHEVpW/DS+eFHnwivCSMklkyamcK1ETtc/4j8H3VR0kgW8XIBqukNxhD8k5wYt22P7PhrWSXjQ==", - "path": "microsoft.aspnetcore.hosting.server.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.server.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-eAPryjDRH41EYY2sOMHCu+tHXLI6PUN1AsOPKst6GbiIoMi8wJCiPcE4h9418tKje1oUzmMc2Iz8fFPPVamfaw==", - "path": "microsoft.aspnetcore.http/2.1.0", - "hashPath": "microsoft.aspnetcore.http.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-vbFDyKsSYBnxl3+RABtN79b0vsTcG66fDY8vD6Nqvu9uLtSej70Q5NcbGlnN6bJpZci5orSdgFTHMhBywivDPg==", - "path": "microsoft.aspnetcore.http.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.http.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UmkUePxRjsQW0j5euFFscBwjvTu25b8+qIK/2fI3GvcqQ+mkwgbWNAT8b/Gkoei1m2bTWC07lSdutuRDPPLcJA==", - "path": "microsoft.aspnetcore.http.features/2.1.0", - "hashPath": "microsoft.aspnetcore.http.features.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LXmnHeb3v+HTfn74M46s+4wLaMkplj1Yl2pRf+2mfDDsQ7PN0+h8AFtgip5jpvBvFHQ/Pei7S+cSVsSTHE67fQ==", - "path": "microsoft.aspnetcore.routing.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.routing.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xBy8JGXQ3tVSYzLl/LtN3c9EeB75khFSB2Kw2HWmF+McU0Ltva7R4JBRH0Rb4LgkcjYyyJdf+09PZalQFwsT+Q==", - "path": "microsoft.aspnetcore.webutilities/2.1.0", - "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-SS8ce1GYQTkZoOq5bskqQ+m7xiXQjnKRiGfVNZkkX2SX0HpXNRsKnSUaywRRuCje3v2KT9xeacsM3J9/G2exsQ==", - "path": "microsoft.extensions.configuration/2.1.0", - "hashPath": "microsoft.extensions.configuration.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-lMmUjAKvY9r6QmxCS15iSb6ulhwnh0zp44NtnVJ+HIDLFmu4iej41U+dU58On8NRezmlgRXiQtLnBeZSzYNKQg==", - "path": "microsoft.extensions.configuration.abstractions/2.1.0", - "hashPath": "microsoft.extensions.configuration.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Fls0O54Ielz1DiVYpcmiUpeizN1iKGGI5yAWAoShfmUvMcQ8jAGOK1a+DaflHA5hN9IOKvmSos0yewDYAIY0ZA==", - "path": "microsoft.extensions.configuration.binder/2.1.0", - "hashPath": "microsoft.extensions.configuration.binder.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-8/CtASu80UIoyG+r8FstrmZW5GLtXxzoYpjj3jV0FKZCL5CiFgSH3pAmqut/dC68mu7N1bU6v0UtKKL3gCUQGQ==", - "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.0", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-itv+7XBu58pxi8mykxx9cUO1OOVYe0jmQIZVSZVp5lOcLxB7sSV2bnHiI1RSu6Nxne/s6+oBla3ON5CCMSmwhQ==", - "path": "microsoft.extensions.fileproviders.abstractions/2.1.0", - "hashPath": "microsoft.extensions.fileproviders.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BpMaoBxdXr5VD0yk7rYN6R8lAU9X9JbvsPveNdKT+llIn3J5s4sxpWqaSG/NnzTzTLU5eJE5nrecTl7clg/7dQ==", - "path": "microsoft.extensions.hosting.abstractions/2.1.0", - "hashPath": "microsoft.extensions.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kuZbZMMHb7ibzhLdn9/R1+PAAFKntlF10tOw4loB8VuQkHvSrBE6IzW1rhBLsEdmLXOgi2zFbwcXFrxzSM6ybA==", - "path": "microsoft.extensions.logging/2.1.0", - "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-tIbO45cohqexTJPXBubpwluycDT+6OWy2m7PukG37XMrtQ6Zv4AnoLrgUTaCmpWihSs5RZHKvThiAJFcBlR3AA==", - "path": "microsoft.extensions.objectpool/2.1.0", - "hashPath": "microsoft.extensions.objectpool.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Options/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VOM1pPMi9+7/4Vc9aPLU8btHOBQy1+AvpqxLxFI2OVtqGv+1klPaV59g9R6aSt2U7ijfB3TjvAO4Tc/cn9/hxA==", - "path": "microsoft.extensions.options/2.1.0", - "hashPath": "microsoft.extensions.options.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-gMwH6wgWOPfyfLfMLEP+ZF7/MSJq35e0xxKEYUjt8veEznY45nBVqdfI876+9SFQq2ChcqKf2UyYc2XYj2v27w==", - "path": "microsoft.extensions.primitives/2.1.0", - "hashPath": "microsoft.extensions.primitives.2.1.0.nupkg.sha512" - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-c08F7C7BGgmjrq9cr7382pBRhcimBx24YOv4M4gtzMIuVKmxGoRr5r9A2Hke9v7Nx7zKKCysk6XpuZasZX4oeg==", - "path": "microsoft.net.http.headers/2.1.0", - "hashPath": "microsoft.net.http.headers.2.1.0.nupkg.sha512" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "NEST/6.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZKibeDRBNO1gA+iS/jH0vhrVuGn8aYX++1SGOo2SLBEyjrLEEZDiRjfZa4pgLoR93c5RZCycFxO/M0blRhQyhA==", - "path": "nest/6.5.1", - "hashPath": "nest.6.5.1.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" - }, - "NLog/4.5.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Yni/XrDfbEhaCSXJsDkmW/n5AunhOxZ7OKKb+0U1I1/d8ZaKt3Jjzf20g/xPiKljmYuZKYqI5iI34g138kK8UQ==", - "path": "nlog/4.5.11", - "hashPath": "nlog.4.5.11.nupkg.sha512" - }, - "NLog.Extensions.Logging/1.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XughK7kRM1b+IuG4bZEpShHLweTCRNQb4kDUMsiob03QVpnacgcis6wDS0KlyXYaF/3Itid5b8+VbTBeP4WKhA==", - "path": "nlog.extensions.logging/1.4.0", - "hashPath": "nlog.extensions.logging.1.4.0.nupkg.sha512" - }, - "NLog.Web.AspNetCore/4.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Bs9tHNwdTDA7FFxS+tqxrr0EQAZjcnex6drcjCni9yHEupZdo5wOJP3oSGe+2W1enHo3RjglM2CvVbFuqbhcXA==", - "path": "nlog.web.aspnetcore/4.8.0", - "hashPath": "nlog.web.aspnetcore.4.8.0.nupkg.sha512" - }, - "System.Buffers/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" - }, - "System.Memory/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" - }, - "System.Numerics.Vectors/4.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YrzNWduCDHhUaSRBxHxL11UkM2fD6y8hITHis4/LbQZ6vj3vdRjoH3IoPWWC9uDXK2wHIqn+b5gv1Np/VKyM1g==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" - }, - "System.Text.Encodings.Web/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" - }, - "TomatoLog.Common/1.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll b/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll deleted file mode 100644 index 864e791..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll and /dev/null differ diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll b/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll deleted file mode 100644 index 233a5c5..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll and /dev/null differ diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json b/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json deleted file mode 100644 index 7b73d50..0000000 --- a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json +++ /dev/null @@ -1,566 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "0da8ef336c49dae555859325bbb085ca91317a52" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToFile/1.0.2": { - "dependencies": { - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.1.0" - }, - "runtime": { - "TomatoLog.ToFile.dll": {} - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Server.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.AspNetCore.WebUtilities": "2.1.0", - "Microsoft.Extensions.ObjectPool": "2.1.0", - "Microsoft.Extensions.Options": "2.1.0", - "Microsoft.Net.Http.Headers": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.FileProviders.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" - } - } - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.ObjectPool.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Options/2.1.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } - } - }, - "NLog/4.5.11": { - "runtime": { - "lib/netstandard2.0/NLog.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.5.11.8645" - } - } - }, - "NLog.Extensions.Logging/1.4.0": { - "dependencies": { - "Microsoft.Extensions.Logging": "2.1.0", - "NLog": "4.5.11" - }, - "runtime": { - "lib/netstandard2.0/NLog.Extensions.Logging.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.4.0.867" - } - } - }, - "NLog.Web.AspNetCore/4.8.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http": "2.1.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.1.0", - "NLog.Extensions.Logging": "1.4.0" - }, - "runtime": { - "lib/netstandard2.0/NLog.Web.AspNetCore.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.8.982.0" - } - } - }, - "System.Buffers/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Buffers.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Memory/4.5.0": { - "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Numerics.Vectors/4.4.0": { - "runtime": { - "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" - } - } - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" - } - } - }, - "System.Text.Encodings.Web/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "TomatoLog.Common/1.1.0": { - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "NLog": "4.5.11", - "NLog.Extensions.Logging": "1.4.0", - "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" - }, - "runtime": { - "TomatoLog.Common.dll": {} - } - } - } - }, - "libraries": { - "TomatoLog.ToFile/1.0.2": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1TQgBfd/NPZLR2o/h6l5Cml2ZCF5hsyV4h9WEwWwAIavrbdTnaNozGGcTOd4AOgQvogMM9UM1ajflm9Cwd0jLQ==", - "path": "microsoft.aspnetcore.hosting.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YTKMi2vHX6P+WHEVpW/DS+eFHnwivCSMklkyamcK1ETtc/4j8H3VR0kgW8XIBqukNxhD8k5wYt22P7PhrWSXjQ==", - "path": "microsoft.aspnetcore.hosting.server.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.server.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-eAPryjDRH41EYY2sOMHCu+tHXLI6PUN1AsOPKst6GbiIoMi8wJCiPcE4h9418tKje1oUzmMc2Iz8fFPPVamfaw==", - "path": "microsoft.aspnetcore.http/2.1.0", - "hashPath": "microsoft.aspnetcore.http.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-vbFDyKsSYBnxl3+RABtN79b0vsTcG66fDY8vD6Nqvu9uLtSej70Q5NcbGlnN6bJpZci5orSdgFTHMhBywivDPg==", - "path": "microsoft.aspnetcore.http.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.http.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UmkUePxRjsQW0j5euFFscBwjvTu25b8+qIK/2fI3GvcqQ+mkwgbWNAT8b/Gkoei1m2bTWC07lSdutuRDPPLcJA==", - "path": "microsoft.aspnetcore.http.features/2.1.0", - "hashPath": "microsoft.aspnetcore.http.features.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LXmnHeb3v+HTfn74M46s+4wLaMkplj1Yl2pRf+2mfDDsQ7PN0+h8AFtgip5jpvBvFHQ/Pei7S+cSVsSTHE67fQ==", - "path": "microsoft.aspnetcore.routing.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.routing.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xBy8JGXQ3tVSYzLl/LtN3c9EeB75khFSB2Kw2HWmF+McU0Ltva7R4JBRH0Rb4LgkcjYyyJdf+09PZalQFwsT+Q==", - "path": "microsoft.aspnetcore.webutilities/2.1.0", - "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-SS8ce1GYQTkZoOq5bskqQ+m7xiXQjnKRiGfVNZkkX2SX0HpXNRsKnSUaywRRuCje3v2KT9xeacsM3J9/G2exsQ==", - "path": "microsoft.extensions.configuration/2.1.0", - "hashPath": "microsoft.extensions.configuration.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-lMmUjAKvY9r6QmxCS15iSb6ulhwnh0zp44NtnVJ+HIDLFmu4iej41U+dU58On8NRezmlgRXiQtLnBeZSzYNKQg==", - "path": "microsoft.extensions.configuration.abstractions/2.1.0", - "hashPath": "microsoft.extensions.configuration.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Fls0O54Ielz1DiVYpcmiUpeizN1iKGGI5yAWAoShfmUvMcQ8jAGOK1a+DaflHA5hN9IOKvmSos0yewDYAIY0ZA==", - "path": "microsoft.extensions.configuration.binder/2.1.0", - "hashPath": "microsoft.extensions.configuration.binder.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-8/CtASu80UIoyG+r8FstrmZW5GLtXxzoYpjj3jV0FKZCL5CiFgSH3pAmqut/dC68mu7N1bU6v0UtKKL3gCUQGQ==", - "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.0", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-itv+7XBu58pxi8mykxx9cUO1OOVYe0jmQIZVSZVp5lOcLxB7sSV2bnHiI1RSu6Nxne/s6+oBla3ON5CCMSmwhQ==", - "path": "microsoft.extensions.fileproviders.abstractions/2.1.0", - "hashPath": "microsoft.extensions.fileproviders.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BpMaoBxdXr5VD0yk7rYN6R8lAU9X9JbvsPveNdKT+llIn3J5s4sxpWqaSG/NnzTzTLU5eJE5nrecTl7clg/7dQ==", - "path": "microsoft.extensions.hosting.abstractions/2.1.0", - "hashPath": "microsoft.extensions.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kuZbZMMHb7ibzhLdn9/R1+PAAFKntlF10tOw4loB8VuQkHvSrBE6IzW1rhBLsEdmLXOgi2zFbwcXFrxzSM6ybA==", - "path": "microsoft.extensions.logging/2.1.0", - "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-tIbO45cohqexTJPXBubpwluycDT+6OWy2m7PukG37XMrtQ6Zv4AnoLrgUTaCmpWihSs5RZHKvThiAJFcBlR3AA==", - "path": "microsoft.extensions.objectpool/2.1.0", - "hashPath": "microsoft.extensions.objectpool.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Options/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VOM1pPMi9+7/4Vc9aPLU8btHOBQy1+AvpqxLxFI2OVtqGv+1klPaV59g9R6aSt2U7ijfB3TjvAO4Tc/cn9/hxA==", - "path": "microsoft.extensions.options/2.1.0", - "hashPath": "microsoft.extensions.options.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-gMwH6wgWOPfyfLfMLEP+ZF7/MSJq35e0xxKEYUjt8veEznY45nBVqdfI876+9SFQq2ChcqKf2UyYc2XYj2v27w==", - "path": "microsoft.extensions.primitives/2.1.0", - "hashPath": "microsoft.extensions.primitives.2.1.0.nupkg.sha512" - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-c08F7C7BGgmjrq9cr7382pBRhcimBx24YOv4M4gtzMIuVKmxGoRr5r9A2Hke9v7Nx7zKKCysk6XpuZasZX4oeg==", - "path": "microsoft.net.http.headers/2.1.0", - "hashPath": "microsoft.net.http.headers.2.1.0.nupkg.sha512" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" - }, - "NLog/4.5.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Yni/XrDfbEhaCSXJsDkmW/n5AunhOxZ7OKKb+0U1I1/d8ZaKt3Jjzf20g/xPiKljmYuZKYqI5iI34g138kK8UQ==", - "path": "nlog/4.5.11", - "hashPath": "nlog.4.5.11.nupkg.sha512" - }, - "NLog.Extensions.Logging/1.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XughK7kRM1b+IuG4bZEpShHLweTCRNQb4kDUMsiob03QVpnacgcis6wDS0KlyXYaF/3Itid5b8+VbTBeP4WKhA==", - "path": "nlog.extensions.logging/1.4.0", - "hashPath": "nlog.extensions.logging.1.4.0.nupkg.sha512" - }, - "NLog.Web.AspNetCore/4.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Bs9tHNwdTDA7FFxS+tqxrr0EQAZjcnex6drcjCni9yHEupZdo5wOJP3oSGe+2W1enHo3RjglM2CvVbFuqbhcXA==", - "path": "nlog.web.aspnetcore/4.8.0", - "hashPath": "nlog.web.aspnetcore.4.8.0.nupkg.sha512" - }, - "System.Buffers/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" - }, - "System.Memory/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" - }, - "System.Numerics.Vectors/4.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YrzNWduCDHhUaSRBxHxL11UkM2fD6y8hITHis4/LbQZ6vj3vdRjoH3IoPWWC9uDXK2wHIqn+b5gv1Np/VKyM1g==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" - }, - "System.Text.Encodings.Web/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" - }, - "TomatoLog.Common/1.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll b/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll deleted file mode 100644 index 132662d..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll and /dev/null differ diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll b/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll deleted file mode 100644 index 233a5c5..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll and /dev/null differ diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json b/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json deleted file mode 100644 index 649ad31..0000000 --- a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json +++ /dev/null @@ -1,2021 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "40a317355b0e3095bcb416cd3c220d1f957ce82f" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToMongoDB/1.0.2": { - "dependencies": { - "MongoDB.Driver": "2.8.0", - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.1.0" - }, - "runtime": { - "TomatoLog.ToMongoDB.dll": {} - } - }, - "DnsClient/1.2.0": { - "dependencies": { - "System.Buffers": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/DnsClient.dll": { - "assemblyVersion": "1.2.0.0", - "fileVersion": "1.2.0.0" - } - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Hosting.Server.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", - "Microsoft.AspNetCore.WebUtilities": "2.1.0", - "Microsoft.Extensions.ObjectPool": "2.1.0", - "Microsoft.Extensions.Options": "2.1.0", - "Microsoft.Net.Http.Headers": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Http.Features.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.Routing.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Binder.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.FileProviders.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Configuration.Binder": "2.1.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "Microsoft.Extensions.Options": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" - } - } - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.ObjectPool.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Options/2.1.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Primitives": "2.1.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Options.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { - "assemblyVersion": "2.1.0.0", - "fileVersion": "2.1.0.18136" - } - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "Microsoft.NETCore.Targets/1.1.0": {}, - "Microsoft.Win32.Primitives/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "Microsoft.Win32.Registry/4.0.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "MongoDB.Bson/2.8.0": { - "dependencies": { - "NETStandard.Library": "2.0.3", - "System.Collections.NonGeneric": "4.0.1", - "System.Diagnostics.Process": "4.1.0", - "System.Dynamic.Runtime": "4.0.11", - "System.Reflection.Emit.Lightweight": "4.3.0" - }, - "runtime": { - "lib/netstandard1.5/MongoDB.Bson.dll": { - "assemblyVersion": "2.8.0.0", - "fileVersion": "2.8.0.0" - } - } - }, - "MongoDB.Driver/2.8.0": { - "dependencies": { - "MongoDB.Bson": "2.8.0", - "MongoDB.Driver.Core": "2.8.0", - "NETStandard.Library": "2.0.3", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Linq.Queryable": "4.0.1" - }, - "runtime": { - "lib/netstandard1.5/MongoDB.Driver.dll": { - "assemblyVersion": "2.8.0.0", - "fileVersion": "2.8.0.0" - } - } - }, - "MongoDB.Driver.Core/2.8.0": { - "dependencies": { - "DnsClient": "1.2.0", - "MongoDB.Bson": "2.8.0", - "NETStandard.Library": "2.0.3", - "System.Collections.Specialized": "4.0.1", - "System.Diagnostics.TextWriterTraceListener": "4.0.0", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Net.NameResolution": "4.3.0", - "System.Net.Security": "4.3.2", - "System.Security.SecureString": "4.0.0" - }, - "runtime": { - "lib/netstandard1.5/MongoDB.Driver.Core.dll": { - "assemblyVersion": "2.8.0.0", - "fileVersion": "2.8.0.0" - } - } - }, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } - } - }, - "NLog/4.5.11": { - "runtime": { - "lib/netstandard2.0/NLog.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.5.11.8645" - } - } - }, - "NLog.Extensions.Logging/1.4.0": { - "dependencies": { - "Microsoft.Extensions.Logging": "2.1.0", - "NLog": "4.5.11" - }, - "runtime": { - "lib/netstandard2.0/NLog.Extensions.Logging.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.4.0.867" - } - } - }, - "NLog.Web.AspNetCore/4.8.0": { - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.0", - "Microsoft.AspNetCore.Http": "2.1.0", - "Microsoft.AspNetCore.Routing.Abstractions": "2.1.0", - "NLog.Extensions.Logging": "1.4.0" - }, - "runtime": { - "lib/netstandard2.0/NLog.Web.AspNetCore.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.8.982.0" - } - } - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.native.System/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Http/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Net.Security/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "runtime.native.System.Security.Cryptography.Apple/4.3.0": { - "dependencies": { - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" - } - }, - "runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "dependencies": { - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": {}, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "System.Buffers/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Buffers.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Collections/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Collections.Concurrent/4.3.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Collections.Concurrent.dll": { - "assemblyVersion": "4.0.13.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Collections.NonGeneric/4.0.1": { - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Collections.NonGeneric.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Collections.Specialized/4.0.1": { - "dependencies": { - "System.Collections.NonGeneric": "4.0.1", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Collections.Specialized.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.ComponentModel/4.0.1": { - "dependencies": { - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.ComponentModel.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.ComponentModel.Primitives/4.1.0": { - "dependencies": { - "System.ComponentModel": "4.0.1", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.0/System.ComponentModel.Primitives.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.ComponentModel.TypeConverter/4.1.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Collections.NonGeneric": "4.0.1", - "System.Collections.Specialized": "4.0.1", - "System.ComponentModel": "4.0.1", - "System.ComponentModel.Primitives": "4.1.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.5/System.ComponentModel.TypeConverter.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Diagnostics.Debug/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Diagnostics.Process/4.1.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "Microsoft.Win32.Registry": "4.0.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.0.11", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.Thread": "4.0.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.TextWriterTraceListener/4.0.0": { - "dependencies": { - "System.Diagnostics.TraceSource": "4.0.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Diagnostics.TextWriterTraceListener.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Diagnostics.TraceSource/4.0.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Diagnostics.Tracing/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Dynamic.Runtime/4.0.11": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Dynamic.Runtime.dll": { - "assemblyVersion": "4.0.11.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Globalization/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Calendars/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Globalization.Extensions/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0" - } - }, - "System.IO/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading.Tasks": "4.3.0" - } - }, - "System.IO.FileSystem.Primitives/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.IO.FileSystem.Primitives.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Linq/4.3.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - }, - "runtime": { - "lib/netstandard1.6/System.Linq.dll": { - "assemblyVersion": "4.1.1.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Linq.Expressions/4.1.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Linq": "4.3.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.6/System.Linq.Expressions.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Linq.Queryable/4.0.1": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.0.1", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Linq.Queryable.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Memory/4.5.0": { - "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" - }, - "runtime": { - "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Net.NameResolution/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "runtime.native.System": "4.3.0" - } - }, - "System.Net.Primitives/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Net.Security/4.3.2": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Extensions": "4.3.0", - "System.IO": "4.3.0", - "System.Net.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Claims": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.Principal": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0", - "System.Threading.ThreadPool": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Security": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Numerics.Vectors/4.4.0": { - "runtime": { - "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" - } - } - }, - "System.ObjectModel/4.0.12": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.ObjectModel.dll": { - "assemblyVersion": "4.0.12.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Reflection/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Emit/4.0.1": { - "dependencies": { - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Reflection.Emit.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Reflection.Emit.ILGeneration/4.3.0": { - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Reflection.Emit.ILGeneration.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Reflection.Emit.Lightweight/4.3.0": { - "dependencies": { - "System.Reflection": "4.3.0", - "System.Reflection.Emit.ILGeneration": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Reflection.Emit.Lightweight.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Reflection.Extensions/4.0.1": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.Primitives/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Reflection.TypeExtensions/4.1.0": { - "dependencies": { - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.5/System.Reflection.TypeExtensions.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Resources.ResourceManager/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Globalization": "4.3.0", - "System.Reflection": "4.3.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" - } - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" - } - } - }, - "System.Runtime.Extensions/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.Handles/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Runtime.InteropServices/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - } - }, - "System.Runtime.Numerics/4.3.0": { - "dependencies": { - "System.Globalization": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Runtime.Numerics.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Security.Claims/4.3.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Security.Principal": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Security.Claims.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Security.Cryptography.Algorithms/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.Apple": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Security.Cryptography.Cng/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Security.Cryptography.Csp/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.IO": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.Cryptography.Encoding/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Collections.Concurrent": "4.3.0", - "System.Linq": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Security.Cryptography.OpenSsl/4.3.0": { - "dependencies": { - "System.Collections": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - }, - "runtime": { - "lib/netstandard1.6/System.Security.Cryptography.OpenSsl.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Security.Cryptography.Primitives/4.3.0": { - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.IO": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Security.Cryptography.Primitives.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Security.Cryptography.X509Certificates/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Globalization": "4.3.0", - "System.Globalization.Calendars": "4.3.0", - "System.IO": "4.3.0", - "System.IO.FileSystem": "4.3.0", - "System.IO.FileSystem.Primitives": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Runtime.Numerics": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Cng": "4.3.0", - "System.Security.Cryptography.Csp": "4.3.0", - "System.Security.Cryptography.Encoding": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0", - "runtime.native.System": "4.3.0", - "runtime.native.System.Net.Http": "4.3.0", - "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" - } - }, - "System.Security.Principal/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.0/System.Security.Principal.dll": { - "assemblyVersion": "4.0.2.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Security.Principal.Windows/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.Win32.Primitives": "4.3.0", - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Reflection": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Claims": "4.3.0", - "System.Security.Principal": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Security.SecureString/4.0.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0", - "System.Text.Encoding": "4.3.0", - "System.Threading": "4.3.0" - } - }, - "System.Text.Encoding/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Text.Encoding.Extensions/4.0.11": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0", - "System.Text.Encoding": "4.3.0" - } - }, - "System.Text.Encodings.Web/4.5.0": { - "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" - } - } - }, - "System.Threading/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Threading.Tasks": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Threading.dll": { - "assemblyVersion": "4.0.12.0", - "fileVersion": "4.6.24705.1" - } - } - }, - "System.Threading.Tasks/4.3.0": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0", - "System.Runtime": "4.3.0" - } - }, - "System.Threading.Thread/4.0.0": { - "dependencies": { - "System.Runtime": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Threading.Thread.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "1.0.24212.1" - } - } - }, - "System.Threading.ThreadPool/4.3.0": { - "dependencies": { - "System.Runtime": "4.3.0", - "System.Runtime.Handles": "4.3.0" - }, - "runtime": { - "lib/netstandard1.3/System.Threading.ThreadPool.dll": { - "assemblyVersion": "4.0.11.0", - "fileVersion": "4.6.24702.1" - } - } - }, - "TomatoLog.Common/1.1.0": { - "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", - "NLog": "4.5.11", - "NLog.Extensions.Logging": "1.4.0", - "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" - }, - "runtime": { - "TomatoLog.Common.dll": {} - } - } - } - }, - "libraries": { - "TomatoLog.ToMongoDB/1.0.2": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "DnsClient/1.2.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-P34wUkeqU4FoQiOMV8OjpdeDZKs4d3r+VlHuKJ6eO5feiZgna3+9MF5orHRUn3DAv1g/HPE5hlkGucmxmsFfBw==", - "path": "dnsclient/1.2.0", - "hashPath": "dnsclient.1.2.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1TQgBfd/NPZLR2o/h6l5Cml2ZCF5hsyV4h9WEwWwAIavrbdTnaNozGGcTOd4AOgQvogMM9UM1ajflm9Cwd0jLQ==", - "path": "microsoft.aspnetcore.hosting.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YTKMi2vHX6P+WHEVpW/DS+eFHnwivCSMklkyamcK1ETtc/4j8H3VR0kgW8XIBqukNxhD8k5wYt22P7PhrWSXjQ==", - "path": "microsoft.aspnetcore.hosting.server.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.hosting.server.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-eAPryjDRH41EYY2sOMHCu+tHXLI6PUN1AsOPKst6GbiIoMi8wJCiPcE4h9418tKje1oUzmMc2Iz8fFPPVamfaw==", - "path": "microsoft.aspnetcore.http/2.1.0", - "hashPath": "microsoft.aspnetcore.http.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-vbFDyKsSYBnxl3+RABtN79b0vsTcG66fDY8vD6Nqvu9uLtSej70Q5NcbGlnN6bJpZci5orSdgFTHMhBywivDPg==", - "path": "microsoft.aspnetcore.http.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.http.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Http.Features/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UmkUePxRjsQW0j5euFFscBwjvTu25b8+qIK/2fI3GvcqQ+mkwgbWNAT8b/Gkoei1m2bTWC07lSdutuRDPPLcJA==", - "path": "microsoft.aspnetcore.http.features/2.1.0", - "hashPath": "microsoft.aspnetcore.http.features.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.Routing.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LXmnHeb3v+HTfn74M46s+4wLaMkplj1Yl2pRf+2mfDDsQ7PN0+h8AFtgip5jpvBvFHQ/Pei7S+cSVsSTHE67fQ==", - "path": "microsoft.aspnetcore.routing.abstractions/2.1.0", - "hashPath": "microsoft.aspnetcore.routing.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.AspNetCore.WebUtilities/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xBy8JGXQ3tVSYzLl/LtN3c9EeB75khFSB2Kw2HWmF+McU0Ltva7R4JBRH0Rb4LgkcjYyyJdf+09PZalQFwsT+Q==", - "path": "microsoft.aspnetcore.webutilities/2.1.0", - "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-SS8ce1GYQTkZoOq5bskqQ+m7xiXQjnKRiGfVNZkkX2SX0HpXNRsKnSUaywRRuCje3v2KT9xeacsM3J9/G2exsQ==", - "path": "microsoft.extensions.configuration/2.1.0", - "hashPath": "microsoft.extensions.configuration.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-lMmUjAKvY9r6QmxCS15iSb6ulhwnh0zp44NtnVJ+HIDLFmu4iej41U+dU58On8NRezmlgRXiQtLnBeZSzYNKQg==", - "path": "microsoft.extensions.configuration.abstractions/2.1.0", - "hashPath": "microsoft.extensions.configuration.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Configuration.Binder/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Fls0O54Ielz1DiVYpcmiUpeizN1iKGGI5yAWAoShfmUvMcQ8jAGOK1a+DaflHA5hN9IOKvmSos0yewDYAIY0ZA==", - "path": "microsoft.extensions.configuration.binder/2.1.0", - "hashPath": "microsoft.extensions.configuration.binder.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-8/CtASu80UIoyG+r8FstrmZW5GLtXxzoYpjj3jV0FKZCL5CiFgSH3pAmqut/dC68mu7N1bU6v0UtKKL3gCUQGQ==", - "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.0", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.FileProviders.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-itv+7XBu58pxi8mykxx9cUO1OOVYe0jmQIZVSZVp5lOcLxB7sSV2bnHiI1RSu6Nxne/s6+oBla3ON5CCMSmwhQ==", - "path": "microsoft.extensions.fileproviders.abstractions/2.1.0", - "hashPath": "microsoft.extensions.fileproviders.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Hosting.Abstractions/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BpMaoBxdXr5VD0yk7rYN6R8lAU9X9JbvsPveNdKT+llIn3J5s4sxpWqaSG/NnzTzTLU5eJE5nrecTl7clg/7dQ==", - "path": "microsoft.extensions.hosting.abstractions/2.1.0", - "hashPath": "microsoft.extensions.hosting.abstractions.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kuZbZMMHb7ibzhLdn9/R1+PAAFKntlF10tOw4loB8VuQkHvSrBE6IzW1rhBLsEdmLXOgi2zFbwcXFrxzSM6ybA==", - "path": "microsoft.extensions.logging/2.1.0", - "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" - }, - "Microsoft.Extensions.ObjectPool/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-tIbO45cohqexTJPXBubpwluycDT+6OWy2m7PukG37XMrtQ6Zv4AnoLrgUTaCmpWihSs5RZHKvThiAJFcBlR3AA==", - "path": "microsoft.extensions.objectpool/2.1.0", - "hashPath": "microsoft.extensions.objectpool.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Options/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VOM1pPMi9+7/4Vc9aPLU8btHOBQy1+AvpqxLxFI2OVtqGv+1klPaV59g9R6aSt2U7ijfB3TjvAO4Tc/cn9/hxA==", - "path": "microsoft.extensions.options/2.1.0", - "hashPath": "microsoft.extensions.options.2.1.0.nupkg.sha512" - }, - "Microsoft.Extensions.Primitives/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-gMwH6wgWOPfyfLfMLEP+ZF7/MSJq35e0xxKEYUjt8veEznY45nBVqdfI876+9SFQq2ChcqKf2UyYc2XYj2v27w==", - "path": "microsoft.extensions.primitives/2.1.0", - "hashPath": "microsoft.extensions.primitives.2.1.0.nupkg.sha512" - }, - "Microsoft.Net.Http.Headers/2.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-c08F7C7BGgmjrq9cr7382pBRhcimBx24YOv4M4gtzMIuVKmxGoRr5r9A2Hke9v7Nx7zKKCysk6XpuZasZX4oeg==", - "path": "microsoft.net.http.headers/2.1.0", - "hashPath": "microsoft.net.http.headers.2.1.0.nupkg.sha512" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "Microsoft.NETCore.Targets/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==", - "path": "microsoft.netcore.targets/1.1.0", - "hashPath": "microsoft.netcore.targets.1.1.0.nupkg.sha512" - }, - "Microsoft.Win32.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-9ZQKCWxH7Ijp9BfahvL2Zyf1cJIk8XYLF6Yjzr2yi0b2cOut/HQ31qf1ThHAgCc3WiZMdnWcfJCgN82/0UunxA==", - "path": "microsoft.win32.primitives/4.3.0", - "hashPath": "microsoft.win32.primitives.4.3.0.nupkg.sha512" - }, - "Microsoft.Win32.Registry/4.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-q+eLtROUAQ3OxYA5mpQrgyFgzLQxIyrfT2eLpYX5IEPlHmIio2nh4F5bgOaQoGOV865kFKZZso9Oq9RlazvXtg==", - "path": "microsoft.win32.registry/4.0.0", - "hashPath": "microsoft.win32.registry.4.0.0.nupkg.sha512" - }, - "MongoDB.Bson/2.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-a9XGMkSvTvR5wPaQGv2LxgxOSn5qJ2Ygq3RGnjo09ajkM4szyz8dDPpMmXEBE8E3do+LdZOX0neiRLEmCBr8Og==", - "path": "mongodb.bson/2.8.0", - "hashPath": "mongodb.bson.2.8.0.nupkg.sha512" - }, - "MongoDB.Driver/2.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-CJ42SoZ7ul5l/NHcnrAkFyUsZXwbIHGtLskcLcHKBpCHeXxMUCQH76XnfQU/VzPh7RchvGTkRwxWJEf7ftZgAQ==", - "path": "mongodb.driver/2.8.0", - "hashPath": "mongodb.driver.2.8.0.nupkg.sha512" - }, - "MongoDB.Driver.Core/2.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-i+jDZN7nOnTGeCWcPdqopUx8dqxEsL2zGRBLWXTji4w+95kH9hEAuXmyMF129YEbojZwZ0xJ0/KL8+5bO3fM3Q==", - "path": "mongodb.driver.core/2.8.0", - "hashPath": "mongodb.driver.core.2.8.0.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" - }, - "NLog/4.5.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Yni/XrDfbEhaCSXJsDkmW/n5AunhOxZ7OKKb+0U1I1/d8ZaKt3Jjzf20g/xPiKljmYuZKYqI5iI34g138kK8UQ==", - "path": "nlog/4.5.11", - "hashPath": "nlog.4.5.11.nupkg.sha512" - }, - "NLog.Extensions.Logging/1.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XughK7kRM1b+IuG4bZEpShHLweTCRNQb4kDUMsiob03QVpnacgcis6wDS0KlyXYaF/3Itid5b8+VbTBeP4WKhA==", - "path": "nlog.extensions.logging/1.4.0", - "hashPath": "nlog.extensions.logging.1.4.0.nupkg.sha512" - }, - "NLog.Web.AspNetCore/4.8.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Bs9tHNwdTDA7FFxS+tqxrr0EQAZjcnex6drcjCni9yHEupZdo5wOJP3oSGe+2W1enHo3RjglM2CvVbFuqbhcXA==", - "path": "nlog.web.aspnetcore/4.8.0", - "hashPath": "nlog.web.aspnetcore.4.8.0.nupkg.sha512" - }, - "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==", - "path": "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==", - "path": "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==", - "path": "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.native.System/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", - "path": "runtime.native.system/4.3.0", - "hashPath": "runtime.native.system.4.3.0.nupkg.sha512" - }, - "runtime.native.System.Net.Http/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", - "path": "runtime.native.system.net.http/4.3.0", - "hashPath": "runtime.native.system.net.http.4.3.0.nupkg.sha512" - }, - "runtime.native.System.Net.Security/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-zjSIBdddAnHaNrPk1b5ILBgTR9Sdwi+EAC+24tRV3qVq4xdij7mx6wR4XbbLa9t92zbnfT9D0S9LFp876dfeEQ==", - "path": "runtime.native.system.net.security/4.3.0", - "hashPath": "runtime.native.system.net.security.4.3.0.nupkg.sha512" - }, - "runtime.native.System.Security.Cryptography.Apple/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", - "path": "runtime.native.system.security.cryptography.apple/4.3.0", - "hashPath": "runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512" - }, - "runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", - "path": "runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==", - "path": "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==", - "path": "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==", - "path": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0", - "hashPath": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512" - }, - "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==", - "path": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==", - "path": "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==", - "path": "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==", - "path": "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==", - "path": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2", - "hashPath": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" - }, - "System.Buffers/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" - }, - "System.Collections/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==", - "path": "system.collections/4.3.0", - "hashPath": "system.collections.4.3.0.nupkg.sha512" - }, - "System.Collections.Concurrent/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", - "path": "system.collections.concurrent/4.3.0", - "hashPath": "system.collections.concurrent.4.3.0.nupkg.sha512" - }, - "System.Collections.NonGeneric/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-hMxFT2RhhlffyCdKLDXjx8WEC5JfCvNozAZxCablAuFRH74SCV4AgzE8yJCh/73bFnEoZgJ9MJmkjQ0dJmnKqA==", - "path": "system.collections.nongeneric/4.0.1", - "hashPath": "system.collections.nongeneric.4.0.1.nupkg.sha512" - }, - "System.Collections.Specialized/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/HKQyVP0yH1I0YtK7KJL/28snxHNH/bi+0lgk/+MbURF6ULhAE31MDI+NZDerNWu264YbxklXCCygISgm+HMug==", - "path": "system.collections.specialized/4.0.1", - "hashPath": "system.collections.specialized.4.0.1.nupkg.sha512" - }, - "System.ComponentModel/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-oBZFnm7seFiVfugsIyOvQCWobNZs7FzqDV/B7tx20Ep/l3UUFCPDkdTnCNaJZTU27zjeODmy2C/cP60u3D4c9w==", - "path": "system.componentmodel/4.0.1", - "hashPath": "system.componentmodel.4.0.1.nupkg.sha512" - }, - "System.ComponentModel.Primitives/4.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-sc/7eVCdxPrp3ljpgTKVaQGUXiW05phNWvtv/m2kocXqrUQvTVWKou1Edas2aDjTThLPZOxPYIGNb/HN0QjURg==", - "path": "system.componentmodel.primitives/4.1.0", - "hashPath": "system.componentmodel.primitives.4.1.0.nupkg.sha512" - }, - "System.ComponentModel.TypeConverter/4.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-MnDAlaeJZy9pdB5ZdOlwdxfpI+LJQ6e0hmH7d2+y2LkiD8DRJynyDYl4Xxf3fWFm7SbEwBZh4elcfzONQLOoQw==", - "path": "system.componentmodel.typeconverter/4.1.0", - "hashPath": "system.componentmodel.typeconverter.4.1.0.nupkg.sha512" - }, - "System.Diagnostics.Debug/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==", - "path": "system.diagnostics.debug/4.3.0", - "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512" - }, - "System.Diagnostics.Process/4.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-mpVZ5bnlSs3tTeJ6jYyDJEIa6tavhAd88lxq1zbYhkkCu0Pno2+gHXcvZcoygq2d8JxW3gojXqNJMTAshduqZA==", - "path": "system.diagnostics.process/4.1.0", - "hashPath": "system.diagnostics.process.4.1.0.nupkg.sha512" - }, - "System.Diagnostics.TextWriterTraceListener/4.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-w36Dr8yKy8xP150qPANe7Td+/zOI3G62ImRcHDIEW+oUXUuTKZHd4DHmqRx5+x8RXd85v3tXd1uhNTfsr+yxjA==", - "path": "system.diagnostics.textwritertracelistener/4.0.0", - "hashPath": "system.diagnostics.textwritertracelistener.4.0.0.nupkg.sha512" - }, - "System.Diagnostics.TraceSource/4.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-6WVCczFZKXwpWpzd/iJkYnsmWTSFFiU24Xx/YdHXBcu+nFI/ehTgeqdJQFbtRPzbrO3KtRNjvkhtj4t5/WwWsA==", - "path": "system.diagnostics.tracesource/4.0.0", - "hashPath": "system.diagnostics.tracesource.4.0.0.nupkg.sha512" - }, - "System.Diagnostics.Tracing/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", - "path": "system.diagnostics.tracing/4.3.0", - "hashPath": "system.diagnostics.tracing.4.3.0.nupkg.sha512" - }, - "System.Dynamic.Runtime/4.0.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "path": "system.dynamic.runtime/4.0.11", - "hashPath": "system.dynamic.runtime.4.0.11.nupkg.sha512" - }, - "System.Globalization/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", - "path": "system.globalization/4.3.0", - "hashPath": "system.globalization.4.3.0.nupkg.sha512" - }, - "System.Globalization.Calendars/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", - "path": "system.globalization.calendars/4.3.0", - "hashPath": "system.globalization.calendars.4.3.0.nupkg.sha512" - }, - "System.Globalization.Extensions/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-FhKmdR6MPG+pxow6wGtNAWdZh7noIOpdD5TwQ3CprzgIE1bBBoim0vbR1+AWsWjQmU7zXHgQo4TWSP6lCeiWcQ==", - "path": "system.globalization.extensions/4.3.0", - "hashPath": "system.globalization.extensions.4.3.0.nupkg.sha512" - }, - "System.IO/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==", - "path": "system.io/4.3.0", - "hashPath": "system.io.4.3.0.nupkg.sha512" - }, - "System.IO.FileSystem/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", - "path": "system.io.filesystem/4.3.0", - "hashPath": "system.io.filesystem.4.3.0.nupkg.sha512" - }, - "System.IO.FileSystem.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==", - "path": "system.io.filesystem.primitives/4.3.0", - "hashPath": "system.io.filesystem.primitives.4.3.0.nupkg.sha512" - }, - "System.Linq/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==", - "path": "system.linq/4.3.0", - "hashPath": "system.linq.4.3.0.nupkg.sha512" - }, - "System.Linq.Expressions/4.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-u2hTii1wBVnvBT4tMNCDGTEKHN47Q02gyYjl6CNNM7nrLJImWNVsWL6uAzLE8IGop7SDpHfiHs+5mO0hYOXc7w==", - "path": "system.linq.expressions/4.1.0", - "hashPath": "system.linq.expressions.4.1.0.nupkg.sha512" - }, - "System.Linq.Queryable/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Yn/WfYe9RoRfmSLvUt2JerP0BTGGykCZkQPgojaxgzF2N0oPo+/AhB8TXOpdCcNlrG3VRtsamtK2uzsp3cqRVw==", - "path": "system.linq.queryable/4.0.1", - "hashPath": "system.linq.queryable.4.0.1.nupkg.sha512" - }, - "System.Memory/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" - }, - "System.Net.NameResolution/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UyodRGthX/86+QYdo4ACZ2XONj5Ec045YVwElpA891N8+/T0QaF+R8VEO8jn3yeumho4/WfYrRfk7TkluRynsw==", - "path": "system.net.nameresolution/4.3.0", - "hashPath": "system.net.nameresolution.4.3.0.nupkg.sha512" - }, - "System.Net.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", - "path": "system.net.primitives/4.3.0", - "hashPath": "system.net.primitives.4.3.0.nupkg.sha512" - }, - "System.Net.Security/4.3.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xT2jbYpbBo3ha87rViHoTA6WdvqOAW37drmqyx/6LD8p7HEPT2qgdxoimRzWtPg8Jh4X5G9BV2seeTv4x6FYlA==", - "path": "system.net.security/4.3.2", - "hashPath": "system.net.security.4.3.2.nupkg.sha512" - }, - "System.Numerics.Vectors/4.4.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" - }, - "System.ObjectModel/4.0.12": { - "type": "package", - "serviceable": true, - "sha512": "sha512-tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "path": "system.objectmodel/4.0.12", - "hashPath": "system.objectmodel.4.0.12.nupkg.sha512" - }, - "System.Reflection/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==", - "path": "system.reflection/4.3.0", - "hashPath": "system.reflection.4.3.0.nupkg.sha512" - }, - "System.Reflection.Emit/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "path": "system.reflection.emit/4.0.1", - "hashPath": "system.reflection.emit.4.0.1.nupkg.sha512" - }, - "System.Reflection.Emit.ILGeneration/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", - "path": "system.reflection.emit.ilgeneration/4.3.0", - "hashPath": "system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512" - }, - "System.Reflection.Emit.Lightweight/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==", - "path": "system.reflection.emit.lightweight/4.3.0", - "hashPath": "system.reflection.emit.lightweight.4.3.0.nupkg.sha512" - }, - "System.Reflection.Extensions/4.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "path": "system.reflection.extensions/4.0.1", - "hashPath": "system.reflection.extensions.4.0.1.nupkg.sha512" - }, - "System.Reflection.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==", - "path": "system.reflection.primitives/4.3.0", - "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512" - }, - "System.Reflection.TypeExtensions/4.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "path": "system.reflection.typeextensions/4.1.0", - "hashPath": "system.reflection.typeextensions.4.1.0.nupkg.sha512" - }, - "System.Resources.ResourceManager/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==", - "path": "system.resources.resourcemanager/4.3.0", - "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512" - }, - "System.Runtime/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==", - "path": "system.runtime/4.3.0", - "hashPath": "system.runtime.4.3.0.nupkg.sha512" - }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-YrzNWduCDHhUaSRBxHxL11UkM2fD6y8hITHis4/LbQZ6vj3vdRjoH3IoPWWC9uDXK2wHIqn+b5gv1Np/VKyM1g==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" - }, - "System.Runtime.Extensions/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==", - "path": "system.runtime.extensions/4.3.0", - "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512" - }, - "System.Runtime.Handles/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==", - "path": "system.runtime.handles/4.3.0", - "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512" - }, - "System.Runtime.InteropServices/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==", - "path": "system.runtime.interopservices/4.3.0", - "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512" - }, - "System.Runtime.Numerics/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", - "path": "system.runtime.numerics/4.3.0", - "hashPath": "system.runtime.numerics.4.3.0.nupkg.sha512" - }, - "System.Security.Claims/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-n/MC2TCXDjHjOdU8UQnWhM9FgE5e++z8m6HW4xrum+jV/ZH0SuCYQt/hyPyJiDODo3grEWOVzhW29mAL7VpAiA==", - "path": "system.security.claims/4.3.0", - "hashPath": "system.security.claims.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.Algorithms/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", - "path": "system.security.cryptography.algorithms/4.3.0", - "hashPath": "system.security.cryptography.algorithms.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.Cng/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", - "path": "system.security.cryptography.cng/4.3.0", - "hashPath": "system.security.cryptography.cng.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.Csp/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", - "path": "system.security.cryptography.csp/4.3.0", - "hashPath": "system.security.cryptography.csp.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.Encoding/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", - "path": "system.security.cryptography.encoding/4.3.0", - "hashPath": "system.security.cryptography.encoding.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.OpenSsl/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", - "path": "system.security.cryptography.openssl/4.3.0", - "hashPath": "system.security.cryptography.openssl.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.Primitives/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", - "path": "system.security.cryptography.primitives/4.3.0", - "hashPath": "system.security.cryptography.primitives.4.3.0.nupkg.sha512" - }, - "System.Security.Cryptography.X509Certificates/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", - "path": "system.security.cryptography.x509certificates/4.3.0", - "hashPath": "system.security.cryptography.x509certificates.4.3.0.nupkg.sha512" - }, - "System.Security.Principal/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-xfm+bWtDSCgnbHJVpZIPqBcsq9zeTq9yXIz8Bjgw15QeNqqbq8Bq3foFfdJch/Z1horX/qJj4bP6bx2aG0XU9g==", - "path": "system.security.principal/4.3.0", - "hashPath": "system.security.principal.4.3.0.nupkg.sha512" - }, - "System.Security.Principal.Windows/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZEGSd3zUKgPl791nTMIp5pXQ9KyMhPsyKf011fp3J0Q16K8w7I4AWXj7dzsS8jeBqtEN1zampREG1g9EZNijbQ==", - "path": "system.security.principal.windows/4.3.0", - "hashPath": "system.security.principal.windows.4.3.0.nupkg.sha512" - }, - "System.Security.SecureString/4.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-sqzq9GD6/b0yqPuMpgIKBuoLf4VKAj8oAfh4kXSzPaN6eoKY3hRi9C5L27uip25qlU+BGPfb0xh2Rmbwc4jFVA==", - "path": "system.security.securestring/4.0.0", - "hashPath": "system.security.securestring.4.0.0.nupkg.sha512" - }, - "System.Text.Encoding/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", - "path": "system.text.encoding/4.3.0", - "hashPath": "system.text.encoding.4.3.0.nupkg.sha512" - }, - "System.Text.Encoding.Extensions/4.0.11": { - "type": "package", - "serviceable": true, - "sha512": "sha512-jtbiTDtvfLYgXn8PTfWI+SiBs51rrmO4AAckx4KR6vFK9Wzf6tI8kcRdsYQNwriUeQ1+CtQbM1W4cMbLXnj/OQ==", - "path": "system.text.encoding.extensions/4.0.11", - "hashPath": "system.text.encoding.extensions.4.0.11.nupkg.sha512" - }, - "System.Text.Encodings.Web/4.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Xg4G4Indi4dqP1iuAiMSwpiWS54ZghzR644OtsRCm/m/lBMG8dUBhLVN7hLm8NNrNTR+iGbshCPTwrvxZPlm4g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" - }, - "System.Threading/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==", - "path": "system.threading/4.3.0", - "hashPath": "system.threading.4.3.0.nupkg.sha512" - }, - "System.Threading.Tasks/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==", - "path": "system.threading.tasks/4.3.0", - "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512" - }, - "System.Threading.Thread/4.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-gIdJqDXlOr5W9zeqFErLw3dsOsiShSCYtF9SEHitACycmvNvY8odf9kiKvp6V7aibc8C4HzzNBkWXjyfn7plbQ==", - "path": "system.threading.thread/4.0.0", - "hashPath": "system.threading.thread.4.0.0.nupkg.sha512" - }, - "System.Threading.ThreadPool/4.3.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-575wMrVtWOgxHlyHqSH3PUbN4RyMWSFfSipCvK3vmCrt1Q6GGRPKbs3mSwJnHrZVy4L91S9HeLr7VVEdKQaXSQ==", - "path": "system.threading.threadpool/4.3.0", - "hashPath": "system.threading.threadpool.4.3.0.nupkg.sha512" - }, - "TomatoLog.Common/1.1.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll b/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll deleted file mode 100644 index 25563c9..0000000 Binary files a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll and /dev/null differ diff --git a/TomatoLog.sln b/TomatoLog.sln index 95016ea..c24cb94 100644 --- a/TomatoLog.sln +++ b/TomatoLog.sln @@ -20,8 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "samples\Example\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TomatoLog.Common", "src\TomatoLog.Common\TomatoLog.Common.csproj", "{C21E96DA-BC42-4DEF-A2B9-AFDA98F0A207}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TomatoLog.Server", "src\TomatoLog.Server\TomatoLog.Server.csproj", "{776BA613-7BFC-40B5-8CB6-E070CCF85128}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{429764D8-8D21-45EB-A13D-71A580D8BF1C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{354CF735-FC8A-4F97-9962-B071184176F1}" @@ -56,6 +54,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TomatoLog.Client.Kafka", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TomatoLog.Client.Kafka.XUnitTest", "test\clients\TomatoLog.Client.Kafka.XUnitTest\TomatoLog.Client.Kafka.XUnitTest.csproj", "{76007F20-1E3E-4628-8E42-C54440924EAB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TomatoLog.Server", "src\TomatoLog.Server\TomatoLog.Server.csproj", "{152249F0-90C4-4E4A-9850-9804A1DF6E8D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -70,10 +70,6 @@ Global {C21E96DA-BC42-4DEF-A2B9-AFDA98F0A207}.Debug|Any CPU.Build.0 = Debug|Any CPU {C21E96DA-BC42-4DEF-A2B9-AFDA98F0A207}.Release|Any CPU.ActiveCfg = Release|Any CPU {C21E96DA-BC42-4DEF-A2B9-AFDA98F0A207}.Release|Any CPU.Build.0 = Release|Any CPU - {776BA613-7BFC-40B5-8CB6-E070CCF85128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {776BA613-7BFC-40B5-8CB6-E070CCF85128}.Debug|Any CPU.Build.0 = Debug|Any CPU - {776BA613-7BFC-40B5-8CB6-E070CCF85128}.Release|Any CPU.ActiveCfg = Release|Any CPU - {776BA613-7BFC-40B5-8CB6-E070CCF85128}.Release|Any CPU.Build.0 = Release|Any CPU {5EF304C4-A7A2-4A79-93A8-0EE5720F5CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5EF304C4-A7A2-4A79-93A8-0EE5720F5CDB}.Debug|Any CPU.Build.0 = Debug|Any CPU {5EF304C4-A7A2-4A79-93A8-0EE5720F5CDB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -126,6 +122,10 @@ Global {76007F20-1E3E-4628-8E42-C54440924EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU {76007F20-1E3E-4628-8E42-C54440924EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU {76007F20-1E3E-4628-8E42-C54440924EAB}.Release|Any CPU.Build.0 = Release|Any CPU + {152249F0-90C4-4E4A-9850-9804A1DF6E8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {152249F0-90C4-4E4A-9850-9804A1DF6E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {152249F0-90C4-4E4A-9850-9804A1DF6E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {152249F0-90C4-4E4A-9850-9804A1DF6E8D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -133,7 +133,6 @@ Global GlobalSection(NestedProjects) = preSolution {4193C277-166D-43A7-AD87-DD96C1F86D58} = {D309F82B-8776-4BDB-A2F0-D6D20E6C67A5} {C21E96DA-BC42-4DEF-A2B9-AFDA98F0A207} = {299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB} - {776BA613-7BFC-40B5-8CB6-E070CCF85128} = {299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB} {429764D8-8D21-45EB-A13D-71A580D8BF1C} = {299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB} {354CF735-FC8A-4F97-9962-B071184176F1} = {299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB} {5EF304C4-A7A2-4A79-93A8-0EE5720F5CDB} = {354CF735-FC8A-4F97-9962-B071184176F1} @@ -151,6 +150,7 @@ Global {8C4412F5-920F-459C-AF86-0763FFCBD410} = {00E8288E-183B-4091-95C6-4CB89AEDEB3A} {F05B796C-672E-4D9F-8E2E-95E457138334} = {429764D8-8D21-45EB-A13D-71A580D8BF1C} {76007F20-1E3E-4628-8E42-C54440924EAB} = {A6BBD0C7-C5A8-4D2C-AD06-2CF6CAFB5817} + {152249F0-90C4-4E4A-9850-9804A1DF6E8D} = {299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {4D09D4E2-2C4A-4568-A894-61269497475C} diff --git a/samples/Example/Example.csproj b/samples/Example/Example.csproj index 741f048..8d9dacc 100644 --- a/samples/Example/Example.csproj +++ b/samples/Example/Example.csproj @@ -1,15 +1,11 @@ - netcoreapp2.2 + net5.0 InProcess + MIT - - - - - - + diff --git a/samples/Example/Startup.cs b/samples/Example/Startup.cs index 7efa689..46bff30 100644 --- a/samples/Example/Startup.cs +++ b/samples/Example/Startup.cs @@ -9,11 +9,12 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Newtonsoft.Json; +using System.Text.Json; using TomatoLog.Client.RabbitMQ; using TomatoLog.Common.Config; using TomatoLog.Common.Interface; using TomatoLog.Client.Extensions; +using Microsoft.Extensions.Hosting; namespace Example { @@ -36,19 +37,24 @@ public void ConfigureServices(IServiceCollection services) return client; }); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); + services.AddControllers(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory factory, ITomatoLogClient logClient) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory factory, ITomatoLogClient logClient) { factory.UseTomatoLogger(logClient); - if (env.IsDevelopment()) + if (env.EnvironmentName == Environments.Development) { app.UseDeveloperExceptionPage(); } - app.UseMvc(); + app.UseEndpoints(endpoints => + { + endpoints.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); + }); } } } diff --git a/src/TomatoLog.Common/TomatoLog.Common.csproj b/src/TomatoLog.Common/TomatoLog.Common.csproj index 7a0a1b5..8061ffd 100644 --- a/src/TomatoLog.Common/TomatoLog.Common.csproj +++ b/src/TomatoLog.Common/TomatoLog.Common.csproj @@ -1,23 +1,24 @@  - netstandard2.0 + netstandard2.1 true true - https://github.com/lianggx/TomatoLog/blob/master/LICENSE - 1.1.0 + + 2.0 lianggx TomatoLog https://github.com/lianggx/TomatoLog https://github.com/lianggx/TomatoLog.git git + MIT - - + + diff --git a/src/TomatoLog.Common/Utilities/Check.cs b/src/TomatoLog.Common/Utilities/Check.cs index 6ff54a9..fbdd4d9 100644 --- a/src/TomatoLog.Common/Utilities/Check.cs +++ b/src/TomatoLog.Common/Utilities/Check.cs @@ -6,7 +6,7 @@ public class Check { public static T NotNull(T value, string parameterName) { - if (ReferenceEquals(value, null)) + if (value == null) { NotEmpty(parameterName, nameof(parameterName)); diff --git a/src/TomatoLog.Common/Utilities/JsonConverterDateTimeParse.cs b/src/TomatoLog.Common/Utilities/JsonConverterDateTimeParse.cs new file mode 100644 index 0000000..1c8b533 --- /dev/null +++ b/src/TomatoLog.Common/Utilities/JsonConverterDateTimeParse.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace TomatoLog.Common.Utilities +{ + public class JsonConverterDateTimeParse : JsonConverter + { + public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + return DateTime.Parse(reader.GetString()); + } + public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss.FFFF")); + } + } +} diff --git a/src/TomatoLog.Common/Utilities/LogMessage.cs b/src/TomatoLog.Common/Utilities/LogMessage.cs index 7bd0aca..7944959 100644 --- a/src/TomatoLog.Common/Utilities/LogMessage.cs +++ b/src/TomatoLog.Common/Utilities/LogMessage.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Logging; using System; +using System.Text.Json.Serialization; namespace TomatoLog.Common.Utilities { @@ -8,6 +9,7 @@ public class LogMessage public int EventId { get; set; } public string ProjectName { get; set; } public string ProjectLabel { get; set; } + [JsonConverter(typeof(JsonStringEnumConverter))] public LogLevel LogLevel { get; set; } public string Version { get; set; } public string IP { get; set; } @@ -16,6 +18,7 @@ public class LogMessage public string ThreadId { get; set; } public string ProcessId { get; set; } public string ProcessName { get; set; } + [JsonConverter(typeof(JsonConverterDateTimeParse))] public DateTime Timestamp { get; set; } public string UserName { get; set; } public string ErrorMessage { get; set; } diff --git a/src/TomatoLog.Server/BLL/BaseConfigManager.cs b/src/TomatoLog.Server/BLL/BaseConfigManager.cs index 72adcf0..0d3eddc 100644 --- a/src/TomatoLog.Server/BLL/BaseConfigManager.cs +++ b/src/TomatoLog.Server/BLL/BaseConfigManager.cs @@ -1,11 +1,5 @@ using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using TomatoLog.Server.Models; +using System.Text.Json; namespace TomatoLog.Server.BLL { @@ -22,7 +16,7 @@ public BaseConfigManager(IConfiguration configuration) public T Load() { var json = System.IO.File.ReadAllText(ConfigFile); - this.ConfigObject = JsonConvert.DeserializeObject(json); + this.ConfigObject = JsonSerializer.Deserialize(json); return ConfigObject; } @@ -30,7 +24,7 @@ public T Load() public void Save() { var json = System.IO.File.ReadAllText(ConfigFile); - System.IO.File.WriteAllText(ConfigFile, JsonConvert.SerializeObject(this.ConfigObject)); + System.IO.File.WriteAllText(ConfigFile, JsonSerializer.Serialize(this.ConfigObject)); } public abstract string ConfigFile { get; } diff --git a/src/TomatoLog.Server/BLL/FilterService.cs b/src/TomatoLog.Server/BLL/FilterService.cs index f90ee42..612723f 100644 --- a/src/TomatoLog.Server/BLL/FilterService.cs +++ b/src/TomatoLog.Server/BLL/FilterService.cs @@ -16,14 +16,21 @@ public class FilterService private readonly SysConfigManager sysManager; private readonly ProConfigManager proManager; private readonly ILogger logger; + private readonly HttpClient httpClient; - public FilterService(IConfiguration configuration, IDistributedCache cache, SysConfigManager sysManager, ProConfigManager proManager, ILogger logger) + public FilterService(IConfiguration configuration, + IDistributedCache cache, + SysConfigManager sysManager, + ProConfigManager proManager, + ILogger logger, + HttpClient httpClient) { this.configuration = configuration; this.cache = cache; this.sysManager = sysManager; this.proManager = proManager; this.logger = logger; + this.httpClient = httpClient; } public async void Filter(LogMessage log) @@ -44,7 +51,7 @@ public async void Filter(LogMessage log) if (sett.Levels != null && sett.Levels.Contains(log.LogLevel.ToString())) { var key = $"{log.ProjectName}_{log.LogLevel}"; - var count = await cache.GetObjectAsync(key); + int.TryParse(await cache.GetStringAsync(key), out int count); if ((count + 1) >= sett.Count) { Notifier(reportModel, configuration, log); @@ -58,18 +65,17 @@ public async void Filter(LogMessage log) { AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(sett.Time) }; - await cache.SetObjectAsync(key, ++count, options); + await cache.SetStringAsync(key, (++count).ToString(), options); } else - await cache.SetObjectAsync(key, ++count); + await cache.SetStringAsync(key, (++count).ToString()); } } } private void Notifier(ReportViewModel repportModel, IConfiguration configuration, LogMessage log) { - var client = HttpClientFactory.Create(); - var notify = new NotifyMonitor(client, configuration, logger, repportModel); + var notify = new NotifyMonitor(httpClient, configuration, logger, repportModel); notify.SendSms(log); notify.SendEmail(log); } diff --git a/src/TomatoLog.Server/BLL/NotifyMonitor.cs b/src/TomatoLog.Server/BLL/NotifyMonitor.cs index 55ab403..a2fe179 100644 --- a/src/TomatoLog.Server/BLL/NotifyMonitor.cs +++ b/src/TomatoLog.Server/BLL/NotifyMonitor.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Newtonsoft.Json.Linq; using System; using System.Net.Http; using System.Net.Mail; @@ -8,16 +7,17 @@ using System.Text.RegularExpressions; using TomatoLog.Common.Utilities; using TomatoLog.Server.Models; +using System.Linq; namespace TomatoLog.Server.BLL { public class NotifyMonitor { - private Regex regex = new Regex(@"{[^}]+}"); - private IConfiguration cfg; - private HttpClient httpClient; - private ILogger log; - private ReportViewModel report; + private readonly Regex regex = new Regex(@"{[^}]+}"); + private readonly IConfiguration cfg; + private readonly HttpClient httpClient; + private readonly ILogger log; + private readonly ReportViewModel report; public NotifyMonitor(HttpClient httpClient, IConfiguration cfg, ILogger log, ReportViewModel report) { @@ -37,12 +37,12 @@ public async void SendSms(LogMessage msg) { var data = CreateContent(msg, report.Sms.Content); HttpMethod method = HttpMethod.Get; - switch (report.Sms.Method.ToUpper()) + method = (report.Sms.Method.ToUpper()) switch { - case "POST": method = HttpMethod.Post; break; - case "GET": method = HttpMethod.Get; break; - default: throw new NotSupportedException(nameof(HttpMethod)); - } + "POST" => HttpMethod.Post, + "GET" => HttpMethod.Get, + _ => throw new NotSupportedException(nameof(HttpMethod)), + }; var res = await HttpHelper.HttpRequest(httpClient, report.Sms.Url, method, data, report.Sms.ContentType); log?.LogDebug($"SendSms:{report.Sms.Url} | {data} | {res}"); } @@ -62,40 +62,37 @@ public void SendEmail(LogMessage msg) { var title = CreateContent(msg, email.Title); var data = CreateContent(msg, email.Content); - using ( - MailMessage message = new MailMessage(email.UserName, email.Receiver, title, data) - { - IsBodyHtml = true, - SubjectEncoding = Encoding.UTF8, - BodyEncoding = Encoding.UTF8, - Priority = MailPriority.High - }) + using MailMessage message = new MailMessage(email.UserName, email.Receiver, title, data) + { + IsBodyHtml = true, + SubjectEncoding = Encoding.UTF8, + BodyEncoding = Encoding.UTF8, + Priority = MailPriority.High + }; + if (email.CC != null) { - if (email.CC != null) + foreach (var c in email.CC.Split(";")) { - foreach (var c in email.CC.Split(";")) - { - message.CC.Add(c); - } + message.CC.Add(c); } + } - SmtpClient smtpClient = new SmtpClient(email.Host, email.Port) - { - DeliveryMethod = SmtpDeliveryMethod.Network, - Credentials = new System.Net.NetworkCredential(email.UserName, email.Password), - EnableSsl = email.SSL - }; + SmtpClient smtpClient = new SmtpClient(email.Host, email.Port) + { + DeliveryMethod = SmtpDeliveryMethod.Network, + Credentials = new System.Net.NetworkCredential(email.UserName, email.Password), + EnableSsl = email.SSL + }; - smtpClient.SendCompleted += (sender, e) => - { - if (e.Error != null) - log.LogError(e.Error.Message, e.Error); - }; + smtpClient.SendCompleted += (sender, e) => + { + if (e.Error != null) + log.LogError(e.Error.Message, e.Error); + }; - log?.LogDebug($"SendEmail:{email.Host} | {email.Port} | {email.Receiver} | {email.CC} | {title} | {data}"); - smtpClient.Send(message); - } + log?.LogDebug($"SendEmail:{email.Host} | {email.Port} | {email.Receiver} | {email.CC} | {title} | {data}"); + smtpClient.Send(message); } catch (Exception ex) { @@ -112,16 +109,15 @@ public void SendEmail(LogMessage msg) private string CreateContent(LogMessage msg, string content) { - var ht = JToken.FromObject(msg); - + var pis = typeof(LogMessage).GetProperties(); var matchs = regex.Matches(content); for (int i = 0; i < matchs.Count; i++) { var key = matchs[i].Value.Replace("{", "").Replace("}", ""); - var field = ht[key]; + var field = pis.Where(f => f.Name == key).FirstOrDefault(); if (field != null) { - var value = field.Value(); + var value = field.GetValue(msg)?.ToString(); content = content.Replace(matchs[i].Value, value); } } diff --git a/src/TomatoLog.Server/BLL/ProConfigManager.cs b/src/TomatoLog.Server/BLL/ProConfigManager.cs index 67a6bab..740ed7f 100644 --- a/src/TomatoLog.Server/BLL/ProConfigManager.cs +++ b/src/TomatoLog.Server/BLL/ProConfigManager.cs @@ -1,10 +1,5 @@ using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; -using System; using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; using TomatoLog.Server.Models; namespace TomatoLog.Server.BLL diff --git a/src/TomatoLog.Server/BLL/SysConfigManager.cs b/src/TomatoLog.Server/BLL/SysConfigManager.cs index 50b8a54..f150fa6 100644 --- a/src/TomatoLog.Server/BLL/SysConfigManager.cs +++ b/src/TomatoLog.Server/BLL/SysConfigManager.cs @@ -1,10 +1,4 @@ using Microsoft.Extensions.Configuration; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; using TomatoLog.Server.Models; namespace TomatoLog.Server.BLL diff --git a/src/TomatoLog.Server/Config/ProConfig.json b/src/TomatoLog.Server/Config/ProConfig.json index 8007aaf..fb61be4 100644 --- a/src/TomatoLog.Server/Config/ProConfig.json +++ b/src/TomatoLog.Server/Config/ProConfig.json @@ -1,58 +1 @@ -[ - { - "Setting": { - "ProjectName": "TomatoLog", - "On": true, - "Time": 60, - "Count": 5, - "Levels": "Warning;Error" - }, - "Sms": { - "On": true, - "Url": null, - "Method": "GET", - "Content": " At IP={IP} Message= {ErrorMessage} Project= {ProjectName}", - "ContentType": "application/json" - }, - "Email": { - "On": false, - "Host": "smtp.qq.com", - "Port": 587, - "UserName": "xxxxxxxx@qq.com", - "Password": "xxxxxxxxxxxxxxxx", - "Receiver": null, - "CC": "xxxxxxxxxxx@163.com;xxxxxxxx@126.com", - "Title": "Test Send Mail Subject.{ErrorMessage}", - "Content": "At {IP} throw Exception {ErrorMessage}

ProjectName:

{ProjectName}
", - "SSL": true - } - }, - { - "Setting": { - "ProjectName": "TomatoLog2", - "On": false, - "Time": 0, - "Count": 0, - "Levels": null - }, - "Sms": { - "On": false, - "Url": null, - "Method": null, - "Content": null, - "ContentType": null - }, - "Email": { - "On": false, - "Host": null, - "Port": 0, - "UserName": null, - "Password": null, - "Receiver": null, - "CC": null, - "Title": null, - "Content": null, - "SSL": false - } - } -] \ No newline at end of file +[{"Setting":{"ProjectName":"TomatoLog","On":true,"Time":60,"Count":5,"Levels":"Warning;Error"},"Sms":{"On":true,"Url":null,"Method":"GET","Content":" At IP={IP} Message= {ErrorMessage} Project= {ProjectName}","ContentType":"application/json"},"Email":{"On":false,"Host":"smtp.qq.com","Port":587,"UserName":"xxxxxxxx@qq.com","Password":"xxxxxxxxxxxxxxxx","Receiver":null,"CC":"xxxxxxxxxxx@163.com;xxxxxxxx@126.com","Title":"Test Send Mail Subject.{ErrorMessage}","Content":"At {IP} throw Exception {ErrorMessage} \u003Ch2\u003EProjectName:\u003C/h2\u003E\u003Cdiv\u003E{ProjectName}\u003C/div\u003E","SSL":true}},{"Setting":{"ProjectName":"TomatoLog2","On":false,"Time":0,"Count":0,"Levels":null},"Sms":{"On":false,"Url":null,"Method":null,"Content":null,"ContentType":null},"Email":{"On":false,"Host":null,"Port":0,"UserName":null,"Password":null,"Receiver":null,"CC":null,"Title":null,"Content":null,"SSL":false}}] \ No newline at end of file diff --git a/src/TomatoLog.Server/Config/SysConfig.json b/src/TomatoLog.Server/Config/SysConfig.json index 9bbb759..185ee47 100644 --- a/src/TomatoLog.Server/Config/SysConfig.json +++ b/src/TomatoLog.Server/Config/SysConfig.json @@ -1,28 +1 @@ -{ - "Setting": { - "ProjectName": null, - "On": true, - "Time": 60, - "Count": 1, - "Levels": "Warning;Error" - }, - "Sms": { - "On": true, - "Url": null, - "Method": "GET", - "Content": "IP=On {IP} Message= {ErrorMessage} Project= {ProjectName}", - "ContentType": "application/json" - }, - "Email": { - "On": true, - "Host": "smtp.qq.com", - "Port": 587, - "UserName": "2272256480@qq.com", - "Password": "uookijihtpwedhhg", - "Receiver": "386497093@qq.com", - "CC": null, - "Title": "Test Send Mail Subject.{ErrorMessage}", - "Content": "At {IP} throw Exception {ErrorMessage}

ProjectName:

{ProjectName}
", - "SSL": true - } -} \ No newline at end of file +{"Setting":{"ProjectName":null,"On":true,"Time":60,"Count":1,"Levels":"Warning;Error"},"Sms":{"On":true,"Url":null,"Method":"GET","Content":"IP=On {IP} Message= {ErrorMessage} Project= {ProjectName}","ContentType":"application/json"},"Email":{"On":true,"Host":"smtp.qq.com","Port":587,"UserName":"2272256480@qq.com","Password":"uookijihtpwedhhg","Receiver":"386497093@qq.com","CC":null,"Title":"Test Send Mail Subject.{ErrorMessage}","Content":"At {IP} throw Exception {ErrorMessage} \u003Ch2\u003E ProjectName:\u003C/h2\u003E\u003Cdiv\u003E{ProjectName}\u003C/div\u003E","SSL":true}} \ No newline at end of file diff --git a/src/TomatoLog.Server/Controllers/ConfigController.cs b/src/TomatoLog.Server/Controllers/ConfigController.cs index 135149c..cace37c 100644 --- a/src/TomatoLog.Server/Controllers/ConfigController.cs +++ b/src/TomatoLog.Server/Controllers/ConfigController.cs @@ -22,21 +22,21 @@ public IActionResult Index() } [HttpPost("Setting")] - public IActionResult Setting([FromForm]SettingModel model) + public IActionResult Setting([FromForm] SettingModel model) { sysConfigManager.ConfigObject.Setting = model; return Save(); } [HttpPost("Sms")] - public IActionResult Sms([FromForm]SmsModel model) + public IActionResult Sms([FromForm] SmsModel model) { sysConfigManager.ConfigObject.Sms = model; return Save(); } [HttpPost("Email")] - public IActionResult Email([FromForm]EmailModel model) + public IActionResult Email([FromForm] EmailModel model) { sysConfigManager.ConfigObject.Email = model; return Save(); diff --git a/src/TomatoLog.Server/Controllers/HomeController.cs b/src/TomatoLog.Server/Controllers/HomeController.cs index 70ccd68..1d3ff64 100644 --- a/src/TomatoLog.Server/Controllers/HomeController.cs +++ b/src/TomatoLog.Server/Controllers/HomeController.cs @@ -2,15 +2,15 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using System.Collections.Generic; using System.Diagnostics; using System.Net.Http; +using System.Text.Json; using System.Threading.Tasks; using TomatoLog.Common.Interface; +using TomatoLog.Common.Utilities; using TomatoLog.Server.Models; using TomatoLog.Server.ViewModels; -using System.Collections.Generic; -using TomatoLog.Common.Utilities; -using Newtonsoft.Json; namespace TomatoLog.Server.Controllers { @@ -20,7 +20,7 @@ public class HomeController : BaseController private ILogWriter logWriter; private HttpClient client; private IConfiguration cfg; - public HomeController(ILogWriter logWriter, HttpClient client, IConfiguration cfg, ILogger logger) : base(cfg, logger) + public HomeController(ILogWriter logWriter, HttpClient client, IConfiguration cfg, ILogger logger) : base(cfg, logger) { this.logWriter = logWriter; this.client = client; @@ -34,20 +34,20 @@ public async Task Index() return View(); } - public async Task Labels([FromQuery]string proj) + public async Task Labels([FromQuery] string proj) { ViewBag.Proj = proj; var labels = await logWriter.GetLabels(proj); List list = new List(); labels.ForEach(s => { - var obj = JsonConvert.DeserializeObject(s); + var obj = JsonSerializer.Deserialize(s); list.Add(obj); }); return View(list); } - public async Task Detail([FromQuery]MessageViewModel model) + public async Task Detail([FromQuery] MessageViewModel model) { ViewBag.Message = model; ViewBag.FIELDS = FIELDS; @@ -56,7 +56,7 @@ public async Task Detail([FromQuery]MessageViewModel model) } [HttpPost] - public IActionResult Detail([FromForm]string[] fields, [FromForm]MessageViewModel model) + public IActionResult Detail([FromForm] string[] fields, [FromForm] MessageViewModel model) { FIELDS = fields; return RedirectToAction("Detail", model); diff --git a/src/TomatoLog.Server/Controllers/ProConfigController.cs b/src/TomatoLog.Server/Controllers/ProConfigController.cs index 0b72c96..bbb0d63 100644 --- a/src/TomatoLog.Server/Controllers/ProConfigController.cs +++ b/src/TomatoLog.Server/Controllers/ProConfigController.cs @@ -27,7 +27,7 @@ public IActionResult Index() } [HttpGet("Detail")] - public IActionResult Detail([FromQuery]string projectName) + public IActionResult Detail([FromQuery] string projectName) { ViewBag.IsValid = ControllerContext.ModelState.IsValid; @@ -67,7 +67,7 @@ public IActionResult Detail([FromQuery]string projectName) } [HttpPost("Detail")] - public IActionResult Detail([FromForm]ProjectConfigViewModel model) + public IActionResult Detail([FromForm] ProjectConfigViewModel model) { if (!string.IsNullOrEmpty(model.Setting_ProjectName)) { @@ -143,7 +143,7 @@ public IActionResult Detail([FromForm]ProjectConfigViewModel model) } [HttpPost("Delete")] - public IActionResult Delete([FromBody]ProjectViewModel model) + public IActionResult Delete([FromBody] ProjectViewModel model) { if (string.IsNullOrEmpty(model.ProjectName)) { diff --git a/src/TomatoLog.Server/Extensions/StartupExtension.cs b/src/TomatoLog.Server/Extensions/StartupExtension.cs index 24a9612..21eb137 100644 --- a/src/TomatoLog.Server/Extensions/StartupExtension.cs +++ b/src/TomatoLog.Server/Extensions/StartupExtension.cs @@ -1,16 +1,18 @@ - -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using NLog.Extensions.Logging; +using StackExchange.Redis; using System; using System.IO; +using System.Net.Http; using System.Reflection; using System.Runtime.Loader; +using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading; using TomatoLog.Common.Config; using TomatoLog.Common.Interface; @@ -26,12 +28,32 @@ public static class StartupExtension private static ILogWriter logWriter = null; private static SysConfigManager sysConfigManager = null; private static FilterService filterService = null; - private static IApplicationLifetime lifeTime = null; + private static IHostApplicationLifetime lifeTime = null; private static ILogger logger = null; + public static IServiceCollection AddCustomerDistributedCache(this IServiceCollection services, IConfiguration configuration) + { + var distributedConfig = configuration["TomatoLog:Cache-Redis"]; + if (string.IsNullOrEmpty(distributedConfig)) + { + services.AddDistributedMemoryCache(); + } + else + { + services.AddStackExchangeRedisCache(options => + { + options.Configuration = distributedConfig; + options.InstanceName = "TomatoLog"; + options.ConfigurationOptions.ClientName = "TomatoLogServer"; + }); + } + + return services; + } + public static IServiceCollection AddLogWriter(this IServiceCollection service, IConfiguration configuration) { - logFactory = new LoggerFactory().AddNLog().AddConsole(); + logFactory = new LoggerFactory().AddNLog(); logger = logFactory.CreateLogger(); StorageOptions storage = configuration.GetSection("TomatoLog:Storage").Get(); Check.NotNull(storage, nameof(StorageOptions)); @@ -60,8 +82,9 @@ public static IServiceCollection AddLogWriter(this IServiceCollection service, I } if (logWriter == null) - throw new ArgumentOutOfRangeException("The Storage:Type required!"); - service.AddSingleton(logWriter); + throw new ArgumentOutOfRangeException(paramName: "The Storage:Type required!"); + + service.AddSingleton(logWriter); } catch (Exception ex) { @@ -75,16 +98,17 @@ public static IApplicationBuilder UseTomatoLog(this IApplicationBuilder app, IDistributedCache cache, SysConfigManager sysManager, ProConfigManager proManager, - IApplicationLifetime lifetime) + IHostApplicationLifetime lifetime, + HttpClient httpClient) { lifeTime = lifetime; sysConfigManager = sysManager; - filterService = new FilterService(configuration, cache, sysManager, proManager, logger); + filterService = new FilterService(configuration, cache, sysManager, proManager, logger, httpClient); var flowType = configuration.GetSection("TomatoLog:Flow:Type").Get(); switch (flowType) { default: - UseRedis(configuration, cache); + UseRedis(configuration); break; case FlowType.RabbitMQ: UseRabbitMQ(configuration); @@ -96,32 +120,28 @@ public static IApplicationBuilder UseTomatoLog(this IApplicationBuilder app, return app; } - private static void UseRedis(IConfiguration configuration, IDistributedCache cache) + private static ConnectionMultiplexer multiplexer; + private static void UseRedis(IConfiguration configuration) { var connectionString = configuration["TomatoLog:Flow:Redis:Connection"]; - var channel = configuration["TomatoLog:Flow:Redis:Channel"]; + var channelName = configuration["TomatoLog:Flow:Redis:Channel"]; Check.NotNull(connectionString, "TomatoLog:Flow:Redis:Connection"); - Check.NotNull(channel, "TomatoLog:Flow:Redis:Channel"); + Check.NotNull(channelName, "TomatoLog:Flow:Redis:Channel"); - RedisHelper.Initialization(new CSRedis.CSRedisClient(connectionString)); - RedisHelper.Subscribe((channel, data => + multiplexer = ConnectionMultiplexer.Connect(connectionString); + var channel = multiplexer.GetSubscriber().Subscribe(channelName); + channel.OnMessage(message => + { + try { - try - { - LogMessage log = JsonConvert.DeserializeObject(data.Body); - logWriter.Write(log); - filterService.Filter(log); - } - catch (Exception ex) - { - logger.LogError(ex.Message + "|" + data.Body, ex); - } + LogMessage log = JsonSerializer.Deserialize(message.Message); + logWriter.Write(log); + filterService.Filter(log); + } + catch (Exception ex) + { + logger.LogError(ex.Message + "|" + message.Message, ex); } - )); - - lifeTime.ApplicationStopping.Register(() => - { - RedisHelper.Instance.Dispose(); }); } @@ -139,7 +159,7 @@ private static void UseRabbitMQ(IConfiguration configuration) }); } - static CancellationTokenSource cts_kafka = new CancellationTokenSource(); + private readonly static CancellationTokenSource cts_kafka = new CancellationTokenSource(); private static void UseKafka(IConfiguration configuration) { lifeTime.ApplicationStarted.Register(() => @@ -153,32 +173,30 @@ private static void UseKafka(IConfiguration configuration) AutoOffsetReset = Confluent.Kafka.AutoOffsetReset.Earliest }; - using (var consumer = new Confluent.Kafka.ConsumerBuilder(conf).Build()) - { - var topic = configuration["TomatoLog:Flow:Kafka:Topic"]; - consumer.Subscribe(topic); + using var consumer = new Confluent.Kafka.ConsumerBuilder(conf).Build(); + var topic = configuration["TomatoLog:Flow:Kafka:Topic"]; + consumer.Subscribe(topic); - logger.LogInformation($"Kafka Consume started."); + logger.LogInformation($"Kafka Consume started."); - var cancellationToken = cts_kafka.Token; - while (!cancellationToken.IsCancellationRequested) + var cancellationToken = cts_kafka.Token; + while (!cancellationToken.IsCancellationRequested) + { + Confluent.Kafka.ConsumeResult result = null; + try + { + result = consumer.Consume(cancellationToken); + LogMessage log = JsonSerializer.Deserialize(result.Message.Value); + logWriter.Write(log); + filterService.Filter(log); + } + catch (Exception e) + { + logger.LogError($"Error occured: {e.Message}{e.StackTrace}"); + } + finally { - Confluent.Kafka.ConsumeResult result = null; - try - { - result = consumer.Consume(cancellationToken); - LogMessage log = JsonConvert.DeserializeObject(result.Value); - logWriter.Write(log); - filterService.Filter(log); - } - catch (Exception e) - { - logger.LogError($"Error occured: {e.Message}{e.StackTrace}"); - } - finally - { - consumer.Commit(result); - } + consumer.Commit(result); } } } diff --git a/src/TomatoLog.Server/MQHelper/LogService.cs b/src/TomatoLog.Server/MQHelper/LogService.cs index 3f58adc..fc0f5b0 100644 --- a/src/TomatoLog.Server/MQHelper/LogService.cs +++ b/src/TomatoLog.Server/MQHelper/LogService.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using System; +using System.Text.Json; using TomatoLog.Common.Interface; using TomatoLog.Common.Utilities; using TomatoLog.Server.BLL; @@ -35,7 +35,7 @@ public void SmsLog_OnReceived(MessageBody message) } try { - var log = JsonConvert.DeserializeObject(message.Content); + var log = JsonSerializer.Deserialize(message.Content); logWriter.Write(log); filterService.Filter(log); } diff --git a/src/TomatoLog.Server/MQHelper/MQChannel.cs b/src/TomatoLog.Server/MQHelper/MQChannel.cs index ffc619e..4ccc021 100644 --- a/src/TomatoLog.Server/MQHelper/MQChannel.cs +++ b/src/TomatoLog.Server/MQHelper/MQChannel.cs @@ -1,11 +1,7 @@ using RabbitMQ.Client; using RabbitMQ.Client.Events; -using RabbitMQ.Client.Framing; using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace TomatoLog.Server.MQHelper { @@ -26,10 +22,8 @@ public class MQChannel public void Publish(string content) { byte[] body = MQConnection.UTF8.GetBytes(content); - IBasicProperties prop = new BasicProperties - { - DeliveryMode = 1 - }; + IBasicProperties prop = Consumer.Model.CreateBasicProperties(); + prop.DeliveryMode = 1; Consumer.Model.BasicPublish(this.ExchangeName, this.RoutekeyName, false, prop, body); } @@ -38,7 +32,7 @@ internal void Receive(object sender, BasicDeliverEventArgs e) MessageBody msgBody = new MessageBody(); try { - string content = MQConnection.UTF8.GetString(e.Body); + string content = MQConnection.UTF8.GetString(e.Body.Span); msgBody.Content = content; msgBody.Consumer = (EventingBasicConsumer)sender; msgBody.BasicDeliver = e; diff --git a/src/TomatoLog.Server/MQHelper/MQConnection.cs b/src/TomatoLog.Server/MQHelper/MQConnection.cs index 63388ec..19ea0b5 100644 --- a/src/TomatoLog.Server/MQHelper/MQConnection.cs +++ b/src/TomatoLog.Server/MQHelper/MQConnection.cs @@ -1,10 +1,9 @@ -using System; +using Microsoft.Extensions.Logging; using RabbitMQ.Client; -using RabbitMQ.Util; -using System.Text; using RabbitMQ.Client.Events; +using System; using System.Collections.Generic; -using Microsoft.Extensions.Logging; +using System.Text; namespace TomatoLog.Server.MQHelper { @@ -74,9 +73,9 @@ public MQChannel CreateReceiveChannel(string exchangeType, string exchange, stri IModel model = this.CreateModel(exchangeType, exchange, queue, routekey); model.BasicQos(0, 1, false); EventingBasicConsumer consumer = this.Receive(model, queue); - consumer.Registered += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已注册消费队列，{e.ConsumerTag}"); }; + consumer.Registered += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已注册消费队列，{e.ConsumerTags}"); }; consumer.Shutdown += (object sender, ShutdownEventArgs e) => { _logger?.LogDebug($"已关闭消费队列，{e.ReplyCode}，{e.ReplyText}"); }; - consumer.ConsumerCancelled += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已退出消费队列，{e.ConsumerTag}"); }; + consumer.ConsumerCancelled += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已退出消费队列，{e.ConsumerTags}"); }; MQChannel channel = new MQChannel() { diff --git a/src/TomatoLog.Server/MQHelper/MQServcieManager.cs b/src/TomatoLog.Server/MQHelper/MQServcieManager.cs index 3617daf..0f10232 100644 --- a/src/TomatoLog.Server/MQHelper/MQServcieManager.cs +++ b/src/TomatoLog.Server/MQHelper/MQServcieManager.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Threading; diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Elasticsearch.Net.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Elasticsearch.Net.dll deleted file mode 100644 index d148d49..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Elasticsearch.Net.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Infrastructure.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Infrastructure.dll deleted file mode 100644 index 09dabb1..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Infrastructure.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Nest.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Nest.dll deleted file mode 100644 index 5dd97e9..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/Nest.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll index 1a197c7..5583e5e 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.Common.dll differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.deps.json b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.deps.json deleted file mode 100644 index 373de8a..0000000 --- a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.deps.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "57a0932e921d2908d6581db5c157f03d832933e9" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ES/1.0.0": { - "dependencies": { - "NEST": "6.5.1", - "NETStandard.Library": "2.0.3" - }, - "runtime": { - "TomatoLog.ES.dll": {} - } - }, - "Elasticsearch.Net/6.5.1": { - "runtime": { - "lib/netstandard2.0/Elasticsearch.Net.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.5.1.0" - } - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "NEST/6.5.1": { - "dependencies": { - "Elasticsearch.Net": "6.5.1" - }, - "runtime": { - "lib/netstandard2.0/Nest.dll": { - "assemblyVersion": "6.0.0.0", - "fileVersion": "6.5.1.0" - } - } - }, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - } - } - }, - "libraries": { - "TomatoLog.ES/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Elasticsearch.Net/6.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-N3B4ignGMsWZEcofG3NEXLzuYAn2gZo+x0JJe7wMKuEtkJaB5A3HBKz4z3gK+xVfmbBl0KkHfe7+byvS2udj/w==", - "path": "elasticsearch.net/6.5.1", - "hashPath": "elasticsearch.net.6.5.1.nupkg.sha512" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "NEST/6.5.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ZKibeDRBNO1gA+iS/jH0vhrVuGn8aYX++1SGOo2SLBEyjrLEEZDiRjfZa4pgLoR93c5RZCycFxO/M0blRhQyhA==", - "path": "nest/6.5.1", - "hashPath": "nest.6.5.1.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.dll deleted file mode 100644 index 9a48b6b..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ES.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json index fbaebc1..865710e 100644 --- a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json +++ b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.deps.json @@ -1,17 +1,16 @@ { "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "2bbb9b701bcbe15bf3ca46f43106b2c49d5939ad" + "name": ".NETStandard,Version=v2.1/", + "signature": "" }, "compilationOptions": {}, "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToES/1.0.2": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "TomatoLog.ToES/2.0": { "dependencies": { "NEST": "6.5.1", - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.0.2" + "TomatoLog.Common": "2.0.0" }, "runtime": { "TomatoLog.ToES.dll": {} @@ -68,7 +67,7 @@ "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { "dependencies": { "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { @@ -102,7 +101,7 @@ "Microsoft.AspNetCore.WebUtilities/2.1.0": { "dependencies": { "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { @@ -111,6 +110,14 @@ } } }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "runtime": { + "lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, "Microsoft.Extensions.Configuration/2.1.0": { "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" @@ -168,7 +175,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" + "Microsoft.Extensions.Logging.Abstractions": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { @@ -181,7 +188,7 @@ "dependencies": { "Microsoft.Extensions.Configuration.Binder": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "Microsoft.Extensions.Options": "2.1.0" }, "runtime": { @@ -191,11 +198,11 @@ } } }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -221,8 +228,8 @@ }, "Microsoft.Extensions.Primitives/2.1.0": { "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { @@ -234,7 +241,7 @@ "Microsoft.Net.Http.Headers/2.1.0": { "dependencies": { "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" + "System.Buffers": "4.5.1" }, "runtime": { "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { @@ -243,7 +250,6 @@ } } }, - "Microsoft.NETCore.Platforms/1.1.0": {}, "NEST/6.5.1": { "dependencies": { "Elasticsearch.Net": "6.5.1" @@ -255,19 +261,6 @@ } } }, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } - } - }, "NLog/4.5.11": { "runtime": { "lib/netstandard2.0/NLog.dll": { @@ -302,58 +295,86 @@ } } }, - "System.Buffers/4.5.0": { + "System.Buffers/4.5.1": { "runtime": { "lib/netstandard2.0/System.Buffers.dll": { "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "fileVersion": "4.6.28619.1" } } }, - "System.Memory/4.5.0": { + "System.Memory/4.5.4": { "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.28619.1" } } }, - "System.Numerics.Vectors/4.4.0": { + "System.Numerics.Vectors/4.5.0": { "runtime": { "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" + "assemblyVersion": "4.1.4.0", + "fileVersion": "4.6.26515.6" } } }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "runtime": { "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, - "System.Text.Encodings.Web/4.5.0": { + "System.Text.Encodings.Web/5.0.0": { "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "lib/netstandard2.1/System.Text.Encodings.Web.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.Json/5.0.0": { + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Json.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Threading.Tasks.Extensions/4.5.4": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Threading.Tasks.Extensions.dll": { + "assemblyVersion": "4.2.0.1", + "fileVersion": "4.6.28619.1" } } }, - "TomatoLog.Common/1.0.2": { + "TomatoLog.Common/2.0.0": { "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "NLog": "4.5.11", "NLog.Extensions.Logging": "1.4.0", "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" + "System.Text.Json": "5.0.0" }, "runtime": { "TomatoLog.Common.dll": {} @@ -362,7 +383,7 @@ } }, "libraries": { - "TomatoLog.ToES/1.0.2": { + "TomatoLog.ToES/2.0": { "type": "project", "serviceable": false, "sha512": "" @@ -423,6 +444,13 @@ "path": "microsoft.aspnetcore.webutilities/2.1.0", "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "path": "microsoft.bcl.asyncinterfaces/5.0.0", + "hashPath": "microsoft.bcl.asyncinterfaces.5.0.0.nupkg.sha512" + }, "Microsoft.Extensions.Configuration/2.1.0": { "type": "package", "serviceable": true, @@ -472,12 +500,12 @@ "path": "microsoft.extensions.logging/2.1.0", "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-9/ERS0/w8MRdWYC9Nv230+2DIYbCv+jr5JwlVyFXrNRerKN9mHShlSfCUjq2S9Wa8ORsztbe5Txz2CuA8pr2bA==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" }, "Microsoft.Extensions.ObjectPool/2.1.0": { "type": "package", @@ -507,13 +535,6 @@ "path": "microsoft.net.http.headers/2.1.0", "hashPath": "microsoft.net.http.headers.2.1.0.nupkg.sha512" }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, "NEST/6.5.1": { "type": "package", "serviceable": true, @@ -521,20 +542,6 @@ "path": "nest/6.5.1", "hashPath": "nest.6.5.1.nupkg.sha512" }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" - }, "NLog/4.5.11": { "type": "package", "serviceable": true, @@ -556,42 +563,56 @@ "path": "nlog.web.aspnetcore/4.8.0", "hashPath": "nlog.web.aspnetcore.4.8.0.nupkg.sha512" }, - "System.Buffers/4.5.0": { + "System.Buffers/4.5.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", + "path": "system.buffers/4.5.1", + "hashPath": "system.buffers.4.5.1.nupkg.sha512" + }, + "System.Memory/4.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "path": "system.memory/4.5.4", + "hashPath": "system.memory.4.5.4.nupkg.sha512" + }, + "System.Numerics.Vectors/4.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-xpHYjjtyTEpzMwtSQBWdVc3dPjLdQtvyUg6fBlBqcLl1r2Y7gDG/W/enAYOB98nG3oD3Q153Y2FBO8JDWd+0Xw==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" + "sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", + "path": "system.numerics.vectors/4.5.0", + "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" }, - "System.Memory/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" + "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==", + "path": "system.runtime.compilerservices.unsafe/5.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512" }, - "System.Numerics.Vectors/4.4.0": { + "System.Text.Encodings.Web/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + "sha512": "sha512-EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==", + "path": "system.text.encodings.web/5.0.0", + "hashPath": "system.text.encodings.web.5.0.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Text.Json/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6zBxkHYemB0kQiHP3vGXGRXejZVoNVuMn2paUuqKKi5Wyjkxfkp+D0rd0c3VrGwotidRINt6KpOi2smL4VkJKw==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" + "sha512": "sha512-+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==", + "path": "system.text.json/5.0.0", + "hashPath": "system.text.json.5.0.0.nupkg.sha512" }, - "System.Text.Encodings.Web/4.5.0": { + "System.Threading.Tasks.Extensions/4.5.4": { "type": "package", "serviceable": true, - "sha512": "sha512-aGaXMErXX1ZOgZJHzNv8y+XvXX5W7rWOtmDdLMHcFKeQ5t18cSmjkAnmDoglU+2Z0FJCkE3SG6uapsqM8FIq0g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" + "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "path": "system.threading.tasks.extensions/4.5.4", + "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "TomatoLog.Common/1.0.2": { + "TomatoLog.Common/2.0.0": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll index 41816c0..d26d634 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToES/TomatoLog.ToES.dll differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/Infrastructure.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/Infrastructure.dll deleted file mode 100644 index 09dabb1..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/Infrastructure.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll index 1a197c7..5583e5e 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.Common.dll differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json index b23765d..0bebedf 100644 --- a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json +++ b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.deps.json @@ -1,16 +1,15 @@ { "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "0da8ef336c49dae555859325bbb085ca91317a52" + "name": ".NETStandard,Version=v2.1/", + "signature": "" }, "compilationOptions": {}, "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToFile/1.0.2": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "TomatoLog.ToFile/2.0": { "dependencies": { - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.0.2" + "TomatoLog.Common": "2.0.0" }, "runtime": { "TomatoLog.ToFile.dll": {} @@ -59,7 +58,7 @@ "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { "dependencies": { "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { @@ -93,7 +92,7 @@ "Microsoft.AspNetCore.WebUtilities/2.1.0": { "dependencies": { "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { @@ -102,6 +101,14 @@ } } }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "runtime": { + "lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, "Microsoft.Extensions.Configuration/2.1.0": { "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" @@ -159,7 +166,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" + "Microsoft.Extensions.Logging.Abstractions": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { @@ -172,7 +179,7 @@ "dependencies": { "Microsoft.Extensions.Configuration.Binder": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "Microsoft.Extensions.Options": "2.1.0" }, "runtime": { @@ -182,11 +189,11 @@ } } }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -212,8 +219,8 @@ }, "Microsoft.Extensions.Primitives/2.1.0": { "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { @@ -225,7 +232,7 @@ "Microsoft.Net.Http.Headers/2.1.0": { "dependencies": { "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" + "System.Buffers": "4.5.1" }, "runtime": { "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { @@ -234,20 +241,6 @@ } } }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } - } - }, "NLog/4.5.11": { "runtime": { "lib/netstandard2.0/NLog.dll": { @@ -282,58 +275,86 @@ } } }, - "System.Buffers/4.5.0": { + "System.Buffers/4.5.1": { "runtime": { "lib/netstandard2.0/System.Buffers.dll": { "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "fileVersion": "4.6.28619.1" } } }, - "System.Memory/4.5.0": { + "System.Memory/4.5.4": { "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.28619.1" } } }, - "System.Numerics.Vectors/4.4.0": { + "System.Numerics.Vectors/4.5.0": { "runtime": { "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" + "assemblyVersion": "4.1.4.0", + "fileVersion": "4.6.26515.6" } } }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "runtime": { "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, - "System.Text.Encodings.Web/4.5.0": { + "System.Text.Encodings.Web/5.0.0": { "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "lib/netstandard2.1/System.Text.Encodings.Web.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.Json/5.0.0": { + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Json.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Threading.Tasks.Extensions/4.5.4": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Threading.Tasks.Extensions.dll": { + "assemblyVersion": "4.2.0.1", + "fileVersion": "4.6.28619.1" } } }, - "TomatoLog.Common/1.0.2": { + "TomatoLog.Common/2.0.0": { "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "NLog": "4.5.11", "NLog.Extensions.Logging": "1.4.0", "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" + "System.Text.Json": "5.0.0" }, "runtime": { "TomatoLog.Common.dll": {} @@ -342,7 +363,7 @@ } }, "libraries": { - "TomatoLog.ToFile/1.0.2": { + "TomatoLog.ToFile/2.0": { "type": "project", "serviceable": false, "sha512": "" @@ -396,6 +417,13 @@ "path": "microsoft.aspnetcore.webutilities/2.1.0", "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "path": "microsoft.bcl.asyncinterfaces/5.0.0", + "hashPath": "microsoft.bcl.asyncinterfaces.5.0.0.nupkg.sha512" + }, "Microsoft.Extensions.Configuration/2.1.0": { "type": "package", "serviceable": true, @@ -445,12 +473,12 @@ "path": "microsoft.extensions.logging/2.1.0", "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-9/ERS0/w8MRdWYC9Nv230+2DIYbCv+jr5JwlVyFXrNRerKN9mHShlSfCUjq2S9Wa8ORsztbe5Txz2CuA8pr2bA==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" }, "Microsoft.Extensions.ObjectPool/2.1.0": { "type": "package", @@ -480,27 +508,6 @@ "path": "microsoft.net.http.headers/2.1.0", "hashPath": "microsoft.net.http.headers.2.1.0.nupkg.sha512" }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" - }, "NLog/4.5.11": { "type": "package", "serviceable": true, @@ -522,42 +529,56 @@ "path": "nlog.web.aspnetcore/4.8.0", "hashPath": "nlog.web.aspnetcore.4.8.0.nupkg.sha512" }, - "System.Buffers/4.5.0": { + "System.Buffers/4.5.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", + "path": "system.buffers/4.5.1", + "hashPath": "system.buffers.4.5.1.nupkg.sha512" + }, + "System.Memory/4.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "path": "system.memory/4.5.4", + "hashPath": "system.memory.4.5.4.nupkg.sha512" + }, + "System.Numerics.Vectors/4.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-xpHYjjtyTEpzMwtSQBWdVc3dPjLdQtvyUg6fBlBqcLl1r2Y7gDG/W/enAYOB98nG3oD3Q153Y2FBO8JDWd+0Xw==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" + "sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", + "path": "system.numerics.vectors/4.5.0", + "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" }, - "System.Memory/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" + "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==", + "path": "system.runtime.compilerservices.unsafe/5.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512" }, - "System.Numerics.Vectors/4.4.0": { + "System.Text.Encodings.Web/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + "sha512": "sha512-EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==", + "path": "system.text.encodings.web/5.0.0", + "hashPath": "system.text.encodings.web.5.0.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Text.Json/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6zBxkHYemB0kQiHP3vGXGRXejZVoNVuMn2paUuqKKi5Wyjkxfkp+D0rd0c3VrGwotidRINt6KpOi2smL4VkJKw==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" + "sha512": "sha512-+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==", + "path": "system.text.json/5.0.0", + "hashPath": "system.text.json.5.0.0.nupkg.sha512" }, - "System.Text.Encodings.Web/4.5.0": { + "System.Threading.Tasks.Extensions/4.5.4": { "type": "package", "serviceable": true, - "sha512": "sha512-aGaXMErXX1ZOgZJHzNv8y+XvXX5W7rWOtmDdLMHcFKeQ5t18cSmjkAnmDoglU+2Z0FJCkE3SG6uapsqM8FIq0g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" + "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "path": "system.threading.tasks.extensions/4.5.4", + "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" }, - "TomatoLog.Common/1.0.2": { + "TomatoLog.Common/2.0.0": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll index 4c3045f..94dc63f 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/Infrastructure.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/Infrastructure.dll deleted file mode 100644 index 09dabb1..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/Infrastructure.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Bson.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Bson.dll deleted file mode 100644 index 4abfe32..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Bson.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.Core.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.Core.dll deleted file mode 100644 index a19fc9a..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.Core.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.dll deleted file mode 100644 index eee97b3..0000000 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/MongoDB.Driver.dll and /dev/null differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll index 1a197c7..5583e5e 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.Common.dll differ diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json index 37379c8..2ce47b1 100644 --- a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json +++ b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json @@ -1,17 +1,16 @@ { "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "40a317355b0e3095bcb416cd3c220d1f957ce82f" + "name": ".NETStandard,Version=v2.1/", + "signature": "" }, "compilationOptions": {}, "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "TomatoLog.ToMongoDB/1.0.2": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "TomatoLog.ToMongoDB/2.0": { "dependencies": { "MongoDB.Driver": "2.8.0", - "NETStandard.Library": "2.0.3", - "TomatoLog.Common": "1.0.2" + "TomatoLog.Common": "2.0.0" }, "runtime": { "TomatoLog.ToMongoDB.dll": {} @@ -19,7 +18,7 @@ }, "DnsClient/1.2.0": { "dependencies": { - "System.Buffers": "4.5.0" + "System.Buffers": "4.5.1" }, "runtime": { "lib/netstandard2.0/DnsClient.dll": { @@ -71,7 +70,7 @@ "Microsoft.AspNetCore.Http.Abstractions/2.1.0": { "dependencies": { "Microsoft.AspNetCore.Http.Features": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.Http.Abstractions.dll": { @@ -105,7 +104,7 @@ "Microsoft.AspNetCore.WebUtilities/2.1.0": { "dependencies": { "Microsoft.Net.Http.Headers": "2.1.0", - "System.Text.Encodings.Web": "4.5.0" + "System.Text.Encodings.Web": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.AspNetCore.WebUtilities.dll": { @@ -114,6 +113,14 @@ } } }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "runtime": { + "lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, "Microsoft.Extensions.Configuration/2.1.0": { "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "2.1.0" @@ -171,7 +178,7 @@ "Microsoft.Extensions.Configuration.Abstractions": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", "Microsoft.Extensions.FileProviders.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0" + "Microsoft.Extensions.Logging.Abstractions": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Hosting.Abstractions.dll": { @@ -184,7 +191,7 @@ "dependencies": { "Microsoft.Extensions.Configuration.Binder": "2.1.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.0", - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "Microsoft.Extensions.Options": "2.1.0" }, "runtime": { @@ -194,11 +201,11 @@ } } }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "2.2.0.0", - "fileVersion": "2.2.0.18315" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -224,8 +231,8 @@ }, "Microsoft.Extensions.Primitives/2.1.0": { "dependencies": { - "System.Memory": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Memory": "4.5.4", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll": { @@ -237,7 +244,7 @@ "Microsoft.Net.Http.Headers/2.1.0": { "dependencies": { "Microsoft.Extensions.Primitives": "2.1.0", - "System.Buffers": "4.5.0" + "System.Buffers": "4.5.1" }, "runtime": { "lib/netstandard2.0/Microsoft.Net.Http.Headers.dll": { @@ -269,7 +276,7 @@ }, "MongoDB.Bson/2.8.0": { "dependencies": { - "NETStandard.Library": "2.0.3", + "NETStandard.Library": "1.6.1", "System.Collections.NonGeneric": "4.0.1", "System.Diagnostics.Process": "4.1.0", "System.Dynamic.Runtime": "4.0.11", @@ -286,7 +293,7 @@ "dependencies": { "MongoDB.Bson": "2.8.0", "MongoDB.Driver.Core": "2.8.0", - "NETStandard.Library": "2.0.3", + "NETStandard.Library": "1.6.1", "System.ComponentModel.TypeConverter": "4.1.0", "System.Linq.Queryable": "4.0.1" }, @@ -301,7 +308,7 @@ "dependencies": { "DnsClient": "1.2.0", "MongoDB.Bson": "2.8.0", - "NETStandard.Library": "2.0.3", + "NETStandard.Library": "1.6.1", "System.Collections.Specialized": "4.0.1", "System.Diagnostics.TextWriterTraceListener": "4.0.0", "System.Diagnostics.TraceSource": "4.0.0", @@ -316,17 +323,52 @@ } } }, - "NETStandard.Library/2.0.3": { + "NETStandard.Library/1.6.1": { "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/12.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "12.0.0.0", - "fileVersion": "12.0.1.22727" - } + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.Win32.Primitives": "4.3.0", + "System.AppContext": "4.3.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Console": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.Compression.ZipFile": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Linq": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.Net.Http": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Net.Sockets": "4.3.0", + "System.ObjectModel": "4.3.0", + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Reflection.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Timer": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0", + "System.Xml.XDocument": "4.3.0" } }, "NLog/4.5.11": { @@ -372,6 +414,12 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, + "runtime.native.System.IO.Compression/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, "runtime.native.System.Net.Http/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -411,11 +459,22 @@ "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.2": {}, - "System.Buffers/4.5.0": { + "System.AppContext/4.3.0": { + "dependencies": { + "System.Runtime": "4.3.0" + }, + "runtime": { + "lib/netstandard1.6/System.AppContext.dll": { + "assemblyVersion": "4.1.1.0", + "fileVersion": "4.6.24705.1" + } + } + }, + "System.Buffers/4.5.1": { "runtime": { "lib/netstandard2.0/System.Buffers.dll": { "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "fileVersion": "4.6.28619.1" } } }, @@ -513,9 +572,9 @@ "System.Globalization": "4.3.0", "System.Linq": "4.3.0", "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Extensions": "4.3.0", "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", + "System.Reflection.TypeExtensions": "4.3.0", "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0", "System.Runtime.Extensions": "4.3.0", @@ -528,6 +587,15 @@ } } }, + "System.Console/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Runtime": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, "System.Diagnostics.Debug/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -535,6 +603,21 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource/4.3.0": { + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + }, + "runtime": { + "lib/netstandard1.3/System.Diagnostics.DiagnosticSource.dll": { + "assemblyVersion": "4.0.1.0", + "fileVersion": "4.6.24705.1" + } + } + }, "System.Diagnostics.Process/4.1.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -552,7 +635,7 @@ "System.Runtime.Handles": "4.3.0", "System.Runtime.InteropServices": "4.3.0", "System.Text.Encoding": "4.3.0", - "System.Text.Encoding.Extensions": "4.0.11", + "System.Text.Encoding.Extensions": "4.3.0", "System.Threading": "4.3.0", "System.Threading.Tasks": "4.3.0", "System.Threading.Thread": "4.0.0", @@ -576,6 +659,13 @@ } } }, + "System.Diagnostics.Tools/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Diagnostics.TraceSource/4.0.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -602,13 +692,13 @@ "System.Diagnostics.Debug": "4.3.0", "System.Globalization": "4.3.0", "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", + "System.Linq.Expressions": "4.3.0", + "System.ObjectModel": "4.3.0", "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit": "4.3.0", "System.Reflection.Emit.ILGeneration": "4.3.0", "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", + "System.Reflection.TypeExtensions": "4.3.0", "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0", "System.Runtime.Extensions": "4.3.0", @@ -655,6 +745,44 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.Compression/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Buffers": "4.5.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.IO.Compression": "4.3.0" + } + }, + "System.IO.Compression.ZipFile/4.3.0": { + "dependencies": { + "System.Buffers": "4.5.1", + "System.IO": "4.3.0", + "System.IO.Compression": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0" + }, + "runtime": { + "lib/netstandard1.3/System.IO.Compression.ZipFile.dll": { + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.6.24705.1" + } + } + }, "System.IO.FileSystem/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -693,21 +821,21 @@ } } }, - "System.Linq.Expressions/4.1.0": { + "System.Linq.Expressions/4.3.0": { "dependencies": { "System.Collections": "4.3.0", "System.Diagnostics.Debug": "4.3.0", "System.Globalization": "4.3.0", "System.IO": "4.3.0", "System.Linq": "4.3.0", - "System.ObjectModel": "4.0.12", + "System.ObjectModel": "4.3.0", "System.Reflection": "4.3.0", - "System.Reflection.Emit": "4.0.1", + "System.Reflection.Emit": "4.3.0", "System.Reflection.Emit.ILGeneration": "4.3.0", "System.Reflection.Emit.Lightweight": "4.3.0", - "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Extensions": "4.3.0", "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.1.0", + "System.Reflection.TypeExtensions": "4.3.0", "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0", "System.Runtime.Extensions": "4.3.0", @@ -715,8 +843,8 @@ }, "runtime": { "lib/netstandard1.6/System.Linq.Expressions.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" + "assemblyVersion": "4.1.1.0", + "fileVersion": "4.6.24705.1" } } }, @@ -725,9 +853,9 @@ "System.Collections": "4.3.0", "System.Diagnostics.Debug": "4.3.0", "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.1.0", + "System.Linq.Expressions": "4.3.0", "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.0.1", + "System.Reflection.Extensions": "4.3.0", "System.Resources.ResourceManager": "4.3.0", "System.Runtime": "4.3.0" }, @@ -738,19 +866,49 @@ } } }, - "System.Memory/4.5.0": { + "System.Memory/4.5.4": { "dependencies": { - "System.Buffers": "4.5.0", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.0" + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" }, "runtime": { "lib/netstandard2.0/System.Memory.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "4.6.26515.6" + "assemblyVersion": "4.0.1.1", + "fileVersion": "4.6.28619.1" } } }, + "System.Net.Http/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, "System.Net.NameResolution/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", @@ -809,15 +967,25 @@ "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" } }, - "System.Numerics.Vectors/4.4.0": { + "System.Net.Sockets/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Numerics.Vectors/4.5.0": { "runtime": { "lib/netstandard2.0/System.Numerics.Vectors.dll": { - "assemblyVersion": "4.1.3.0", - "fileVersion": "4.6.25519.3" + "assemblyVersion": "4.1.4.0", + "fileVersion": "4.6.26515.6" } } }, - "System.ObjectModel/4.0.12": { + "System.ObjectModel/4.3.0": { "dependencies": { "System.Collections": "4.3.0", "System.Diagnostics.Debug": "4.3.0", @@ -827,8 +995,8 @@ }, "runtime": { "lib/netstandard1.3/System.ObjectModel.dll": { - "assemblyVersion": "4.0.12.0", - "fileVersion": "1.0.24212.1" + "assemblyVersion": "4.0.13.0", + "fileVersion": "4.6.24705.1" } } }, @@ -841,7 +1009,7 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit/4.0.1": { + "System.Reflection.Emit/4.3.0": { "dependencies": { "System.IO": "4.3.0", "System.Reflection": "4.3.0", @@ -851,8 +1019,8 @@ }, "runtime": { "lib/netstandard1.3/System.Reflection.Emit.dll": { - "assemblyVersion": "4.0.1.0", - "fileVersion": "1.0.24212.1" + "assemblyVersion": "4.0.2.0", + "fileVersion": "4.6.24705.1" } } }, @@ -883,7 +1051,7 @@ } } }, - "System.Reflection.Extensions/4.0.1": { + "System.Reflection.Extensions/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", @@ -898,15 +1066,15 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions/4.1.0": { + "System.Reflection.TypeExtensions/4.3.0": { "dependencies": { "System.Reflection": "4.3.0", "System.Runtime": "4.3.0" }, "runtime": { "lib/netstandard1.5/System.Reflection.TypeExtensions.dll": { - "assemblyVersion": "4.1.0.0", - "fileVersion": "1.0.24212.1" + "assemblyVersion": "4.1.1.0", + "fileVersion": "4.6.24705.1" } } }, @@ -925,11 +1093,11 @@ "Microsoft.NETCore.Targets": "1.1.0" } }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "runtime": { "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { - "assemblyVersion": "4.0.4.0", - "fileVersion": "0.0.0.0" + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" } } }, @@ -957,6 +1125,23 @@ "System.Runtime.Handles": "4.3.0" } }, + "System.Runtime.InteropServices.RuntimeInformation/4.3.0": { + "dependencies": { + "System.Reflection": "4.3.0", + "System.Reflection.Extensions": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0" + }, + "runtime": { + "lib/netstandard1.1/System.Runtime.InteropServices.RuntimeInformation.dll": { + "assemblyVersion": "4.0.1.0", + "fileVersion": "4.6.24705.1" + } + } + }, "System.Runtime.Numerics/4.3.0": { "dependencies": { "System.Globalization": "4.3.0", @@ -1171,7 +1356,7 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.Extensions/4.0.11": { + "System.Text.Encoding.Extensions/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", "Microsoft.NETCore.Targets": "1.1.0", @@ -1179,11 +1364,44 @@ "System.Text.Encoding": "4.3.0" } }, - "System.Text.Encodings.Web/4.5.0": { + "System.Text.Encodings.Web/5.0.0": { "runtime": { - "lib/netstandard2.0/System.Text.Encodings.Web.dll": { - "assemblyVersion": "4.0.3.0", - "fileVersion": "4.6.26515.6" + "lib/netstandard2.1/System.Text.Encodings.Web.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.Json/5.0.0": { + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard2.0/System.Text.Json.dll": { + "assemblyVersion": "5.0.0.0", + "fileVersion": "5.0.20.51904" + } + } + }, + "System.Text.RegularExpressions/4.3.0": { + "dependencies": { + "System.Collections": "4.3.0", + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0" + }, + "runtime": { + "lib/netstandard1.6/System.Text.RegularExpressions.dll": { + "assemblyVersion": "4.1.1.0", + "fileVersion": "4.6.24705.1" } } }, @@ -1206,6 +1424,17 @@ "System.Runtime": "4.3.0" } }, + "System.Threading.Tasks.Extensions/4.5.4": { + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Threading.Tasks.Extensions.dll": { + "assemblyVersion": "4.2.0.1", + "fileVersion": "4.6.28619.1" + } + } + }, "System.Threading.Thread/4.0.0": { "dependencies": { "System.Runtime": "4.3.0" @@ -1229,13 +1458,67 @@ } } }, - "TomatoLog.Common/1.0.2": { + "System.Threading.Timer/4.3.0": { + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, + "System.Xml.ReaderWriter/4.3.0": { + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Text.Encoding.Extensions": "4.3.0", + "System.Text.RegularExpressions": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "System.Threading.Tasks.Extensions": "4.5.4" + }, + "runtime": { + "lib/netstandard1.3/System.Xml.ReaderWriter.dll": { + "assemblyVersion": "4.1.0.0", + "fileVersion": "4.6.24705.1" + } + } + }, + "System.Xml.XDocument/4.3.0": { + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tools": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Xml.ReaderWriter": "4.3.0" + }, + "runtime": { + "lib/netstandard1.3/System.Xml.XDocument.dll": { + "assemblyVersion": "4.0.12.0", + "fileVersion": "4.6.24705.1" + } + } + }, + "TomatoLog.Common/2.0.0": { "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "2.2.0", + "Microsoft.Extensions.Logging.Abstractions": "5.0.0", "NLog": "4.5.11", "NLog.Extensions.Logging": "1.4.0", "NLog.Web.AspNetCore": "4.8.0", - "Newtonsoft.Json": "12.0.1" + "System.Text.Json": "5.0.0" }, "runtime": { "TomatoLog.Common.dll": {} @@ -1244,7 +1527,7 @@ } }, "libraries": { - "TomatoLog.ToMongoDB/1.0.2": { + "TomatoLog.ToMongoDB/2.0": { "type": "project", "serviceable": false, "sha512": "" @@ -1305,6 +1588,13 @@ "path": "microsoft.aspnetcore.webutilities/2.1.0", "hashPath": "microsoft.aspnetcore.webutilities.2.1.0.nupkg.sha512" }, + "Microsoft.Bcl.AsyncInterfaces/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==", + "path": "microsoft.bcl.asyncinterfaces/5.0.0", + "hashPath": "microsoft.bcl.asyncinterfaces.5.0.0.nupkg.sha512" + }, "Microsoft.Extensions.Configuration/2.1.0": { "type": "package", "serviceable": true, @@ -1354,12 +1644,12 @@ "path": "microsoft.extensions.logging/2.1.0", "hashPath": "microsoft.extensions.logging.2.1.0.nupkg.sha512" }, - "Microsoft.Extensions.Logging.Abstractions/2.2.0": { + "Microsoft.Extensions.Logging.Abstractions/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-9/ERS0/w8MRdWYC9Nv230+2DIYbCv+jr5JwlVyFXrNRerKN9mHShlSfCUjq2S9Wa8ORsztbe5Txz2CuA8pr2bA==", - "path": "microsoft.extensions.logging.abstractions/2.2.0", - "hashPath": "microsoft.extensions.logging.abstractions.2.2.0.nupkg.sha512" + "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", + "path": "microsoft.extensions.logging.abstractions/5.0.0", + "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" }, "Microsoft.Extensions.ObjectPool/2.1.0": { "type": "package", @@ -1392,7 +1682,7 @@ "Microsoft.NETCore.Platforms/1.1.0": { "type": "package", "serviceable": true, - "sha512": "sha512-bLpT1f/SFlO1CzqXG12KnJzpZs6lv24uX2Rzi4Fmm0noJpNlnWRVryuO3yK18Ca04t/YHcO1e1Z0WDfjseqNzw==", + "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", "path": "microsoft.netcore.platforms/1.1.0", "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" }, @@ -1438,19 +1728,12 @@ "path": "mongodb.driver.core/2.8.0", "hashPath": "mongodb.driver.core.2.8.0.nupkg.sha512" }, - "NETStandard.Library/2.0.3": { + "NETStandard.Library/1.6.1": { "type": "package", "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/12.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-pBR3wCgYWZGiaZDYP+HHYnalVnPJlpP1q55qvVb+adrDHmFMDc1NAKio61xTwftK3Pw5h7TZJPJEEVMd6ty8rg==", - "path": "newtonsoft.json/12.0.1", - "hashPath": "newtonsoft.json.12.0.1.nupkg.sha512" + "sha512": "sha512-WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", + "path": "netstandard.library/1.6.1", + "hashPath": "netstandard.library.1.6.1.nupkg.sha512" }, "NLog/4.5.11": { "type": "package", @@ -1501,6 +1784,13 @@ "path": "runtime.native.system/4.3.0", "hashPath": "runtime.native.system.4.3.0.nupkg.sha512" }, + "runtime.native.System.IO.Compression/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", + "path": "runtime.native.system.io.compression/4.3.0", + "hashPath": "runtime.native.system.io.compression.4.3.0.nupkg.sha512" + }, "runtime.native.System.Net.Http/4.3.0": { "type": "package", "serviceable": true, @@ -1511,14 +1801,14 @@ "runtime.native.System.Net.Security/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-M2nN92ePS8BgQ2oi6Jj3PlTUzadYSIWLdZrHY1n1ZcW9o4wAQQ6W+aQ2lfq1ysZQfVCgDwY58alUdowrzezztg==", + "sha512": "sha512-zjSIBdddAnHaNrPk1b5ILBgTR9Sdwi+EAC+24tRV3qVq4xdij7mx6wR4XbbLa9t92zbnfT9D0S9LFp876dfeEQ==", "path": "runtime.native.system.net.security/4.3.0", "hashPath": "runtime.native.system.net.security.4.3.0.nupkg.sha512" }, "runtime.native.System.Security.Cryptography.Apple/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-jwjwlEL0Elv6gwoyaokRn12nv/JE+UW/DXJEbzhjCPvGbef36StnHKc9XaZD/rGWqYicrphZ7eumR/jdmNcjRg==", + "sha512": "sha512-DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", "path": "runtime.native.system.security.cryptography.apple/4.3.0", "hashPath": "runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512" }, @@ -1585,12 +1875,19 @@ "path": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.2", "hashPath": "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512" }, - "System.Buffers/4.5.0": { + "System.AppContext/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-fKC+rmaLfeIzUhagxY17Q9siv/sPrjjKcfNg1Ic8IlQkZLipo8ljcaZQu4VtI4Jqbzjc2VTjzGLF6WmsRXAEgA==", + "path": "system.appcontext/4.3.0", + "hashPath": "system.appcontext.4.3.0.nupkg.sha512" + }, + "System.Buffers/4.5.1": { "type": "package", "serviceable": true, - "sha512": "sha512-xpHYjjtyTEpzMwtSQBWdVc3dPjLdQtvyUg6fBlBqcLl1r2Y7gDG/W/enAYOB98nG3oD3Q153Y2FBO8JDWd+0Xw==", - "path": "system.buffers/4.5.0", - "hashPath": "system.buffers.4.5.0.nupkg.sha512" + "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", + "path": "system.buffers/4.5.1", + "hashPath": "system.buffers.4.5.1.nupkg.sha512" }, "System.Collections/4.3.0": { "type": "package", @@ -1641,6 +1938,13 @@ "path": "system.componentmodel.typeconverter/4.1.0", "hashPath": "system.componentmodel.typeconverter.4.1.0.nupkg.sha512" }, + "System.Console/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-DHDrIxiqk1h03m6khKWV2X8p/uvN79rgSqpilL6uzpmSfxfU5ng8VcPtW4qsDsQDHiTv6IPV9TmD5M/vElPNLg==", + "path": "system.console/4.3.0", + "hashPath": "system.console.4.3.0.nupkg.sha512" + }, "System.Diagnostics.Debug/4.3.0": { "type": "package", "serviceable": true, @@ -1648,6 +1952,13 @@ "path": "system.diagnostics.debug/4.3.0", "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512" }, + "System.Diagnostics.DiagnosticSource/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "path": "system.diagnostics.diagnosticsource/4.3.0", + "hashPath": "system.diagnostics.diagnosticsource.4.3.0.nupkg.sha512" + }, "System.Diagnostics.Process/4.1.0": { "type": "package", "serviceable": true, @@ -1662,6 +1973,13 @@ "path": "system.diagnostics.textwritertracelistener/4.0.0", "hashPath": "system.diagnostics.textwritertracelistener.4.0.0.nupkg.sha512" }, + "System.Diagnostics.Tools/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==", + "path": "system.diagnostics.tools/4.3.0", + "hashPath": "system.diagnostics.tools.4.3.0.nupkg.sha512" + }, "System.Diagnostics.TraceSource/4.0.0": { "type": "package", "serviceable": true, @@ -1711,6 +2029,20 @@ "path": "system.io/4.3.0", "hashPath": "system.io.4.3.0.nupkg.sha512" }, + "System.IO.Compression/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==", + "path": "system.io.compression/4.3.0", + "hashPath": "system.io.compression.4.3.0.nupkg.sha512" + }, + "System.IO.Compression.ZipFile/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==", + "path": "system.io.compression.zipfile/4.3.0", + "hashPath": "system.io.compression.zipfile.4.3.0.nupkg.sha512" + }, "System.IO.FileSystem/4.3.0": { "type": "package", "serviceable": true, @@ -1732,12 +2064,12 @@ "path": "system.linq/4.3.0", "hashPath": "system.linq.4.3.0.nupkg.sha512" }, - "System.Linq.Expressions/4.1.0": { + "System.Linq.Expressions/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "path": "system.linq.expressions/4.1.0", - "hashPath": "system.linq.expressions.4.1.0.nupkg.sha512" + "sha512": "sha512-PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==", + "path": "system.linq.expressions/4.3.0", + "hashPath": "system.linq.expressions.4.3.0.nupkg.sha512" }, "System.Linq.Queryable/4.0.1": { "type": "package", @@ -1746,17 +2078,24 @@ "path": "system.linq.queryable/4.0.1", "hashPath": "system.linq.queryable.4.0.1.nupkg.sha512" }, - "System.Memory/4.5.0": { + "System.Memory/4.5.4": { "type": "package", "serviceable": true, - "sha512": "sha512-m0psCSpUxTGfvwyO0i03ajXVhgBqyXlibXz0Mo1dtKGjaHrXFLnuQ8rNBTmWRqbfRjr4eC6Wah4X5FfuFDu5og==", - "path": "system.memory/4.5.0", - "hashPath": "system.memory.4.5.0.nupkg.sha512" + "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==", + "path": "system.memory/4.5.4", + "hashPath": "system.memory.4.5.4.nupkg.sha512" + }, + "System.Net.Http/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-sYg+FtILtRQuYWSIAuNOELwVuVsxVyJGWQyOnlAzhV4xvhyFnON1bAzYYC+jjRW8JREM45R0R5Dgi8MTC5sEwA==", + "path": "system.net.http/4.3.0", + "hashPath": "system.net.http.4.3.0.nupkg.sha512" }, "System.Net.NameResolution/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-AFYl08R7MrsrEjqpQWTZWBadqXyTzNDaWpMqyxhb0d6sGhV6xMDKueuBXlLL30gz+DIRY6MpdgnHWlCh5wmq9w==", + "sha512": "sha512-UyodRGthX/86+QYdo4ACZ2XONj5Ec045YVwElpA891N8+/T0QaF+R8VEO8jn3yeumho4/WfYrRfk7TkluRynsw==", "path": "system.net.nameresolution/4.3.0", "hashPath": "system.net.nameresolution.4.3.0.nupkg.sha512" }, @@ -1774,19 +2113,26 @@ "path": "system.net.security/4.3.2", "hashPath": "system.net.security.4.3.2.nupkg.sha512" }, - "System.Numerics.Vectors/4.4.0": { + "System.Net.Sockets/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", - "path": "system.numerics.vectors/4.4.0", - "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + "sha512": "sha512-m6icV6TqQOAdgt5N/9I5KNpjom/5NFtkmGseEH+AK/hny8XrytLH3+b5M8zL/Ycg3fhIocFpUMyl/wpFnVRvdw==", + "path": "system.net.sockets/4.3.0", + "hashPath": "system.net.sockets.4.3.0.nupkg.sha512" }, - "System.ObjectModel/4.0.12": { + "System.Numerics.Vectors/4.5.0": { "type": "package", "serviceable": true, - "sha512": "sha512-tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "path": "system.objectmodel/4.0.12", - "hashPath": "system.objectmodel.4.0.12.nupkg.sha512" + "sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==", + "path": "system.numerics.vectors/4.5.0", + "hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512" + }, + "System.ObjectModel/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==", + "path": "system.objectmodel/4.3.0", + "hashPath": "system.objectmodel.4.3.0.nupkg.sha512" }, "System.Reflection/4.3.0": { "type": "package", @@ -1795,17 +2141,17 @@ "path": "system.reflection/4.3.0", "hashPath": "system.reflection.4.3.0.nupkg.sha512" }, - "System.Reflection.Emit/4.0.1": { + "System.Reflection.Emit/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "path": "system.reflection.emit/4.0.1", - "hashPath": "system.reflection.emit.4.0.1.nupkg.sha512" + "sha512": "sha512-228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==", + "path": "system.reflection.emit/4.3.0", + "hashPath": "system.reflection.emit.4.3.0.nupkg.sha512" }, "System.Reflection.Emit.ILGeneration/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-+rD+UzHYxfXsT+YrMI0njdFaP/o1cnmSnRWy4os/NaWJC7FyCHrCOwiAKUwz+smQ3cPKZ8pAAv5zM5DDBG4K4w==", + "sha512": "sha512-59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==", "path": "system.reflection.emit.ilgeneration/4.3.0", "hashPath": "system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512" }, @@ -1816,12 +2162,12 @@ "path": "system.reflection.emit.lightweight/4.3.0", "hashPath": "system.reflection.emit.lightweight.4.3.0.nupkg.sha512" }, - "System.Reflection.Extensions/4.0.1": { + "System.Reflection.Extensions/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "path": "system.reflection.extensions/4.0.1", - "hashPath": "system.reflection.extensions.4.0.1.nupkg.sha512" + "sha512": "sha512-rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==", + "path": "system.reflection.extensions/4.3.0", + "hashPath": "system.reflection.extensions.4.3.0.nupkg.sha512" }, "System.Reflection.Primitives/4.3.0": { "type": "package", @@ -1830,12 +2176,12 @@ "path": "system.reflection.primitives/4.3.0", "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512" }, - "System.Reflection.TypeExtensions/4.1.0": { + "System.Reflection.TypeExtensions/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "path": "system.reflection.typeextensions/4.1.0", - "hashPath": "system.reflection.typeextensions.4.1.0.nupkg.sha512" + "sha512": "sha512-7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==", + "path": "system.reflection.typeextensions/4.3.0", + "hashPath": "system.reflection.typeextensions.4.3.0.nupkg.sha512" }, "System.Resources.ResourceManager/4.3.0": { "type": "package", @@ -1851,12 +2197,12 @@ "path": "system.runtime/4.3.0", "hashPath": "system.runtime.4.3.0.nupkg.sha512" }, - "System.Runtime.CompilerServices.Unsafe/4.5.0": { + "System.Runtime.CompilerServices.Unsafe/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-6zBxkHYemB0kQiHP3vGXGRXejZVoNVuMn2paUuqKKi5Wyjkxfkp+D0rd0c3VrGwotidRINt6KpOi2smL4VkJKw==", - "path": "system.runtime.compilerservices.unsafe/4.5.0", - "hashPath": "system.runtime.compilerservices.unsafe.4.5.0.nupkg.sha512" + "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==", + "path": "system.runtime.compilerservices.unsafe/5.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512" }, "System.Runtime.Extensions/4.3.0": { "type": "package", @@ -1879,6 +2225,13 @@ "path": "system.runtime.interopservices/4.3.0", "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512" }, + "System.Runtime.InteropServices.RuntimeInformation/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==", + "path": "system.runtime.interopservices.runtimeinformation/4.3.0", + "hashPath": "system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512" + }, "System.Runtime.Numerics/4.3.0": { "type": "package", "serviceable": true, @@ -1889,7 +2242,7 @@ "System.Security.Claims/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-P/+BR/2lnc4PNDHt/TPBAWHVMLMRHsyYZbU1NphW4HIWzCggz8mJbTQQ3MKljFE7LS3WagmVFuBgoLcFzYXlkA==", + "sha512": "sha512-n/MC2TCXDjHjOdU8UQnWhM9FgE5e++z8m6HW4xrum+jV/ZH0SuCYQt/hyPyJiDODo3grEWOVzhW29mAL7VpAiA==", "path": "system.security.claims/4.3.0", "hashPath": "system.security.claims.4.3.0.nupkg.sha512" }, @@ -1924,7 +2277,7 @@ "System.Security.Cryptography.OpenSsl/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-vOYy7Jv9KsG3ld2hLt0GoERd82SZi4BelrbXLwI9yFBYX7kpbvUCWYo4eyevk47cuJXZ9ZLVAryANcc7iY71aA==", + "sha512": "sha512-h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", "path": "system.security.cryptography.openssl/4.3.0", "hashPath": "system.security.cryptography.openssl.4.3.0.nupkg.sha512" }, @@ -1945,14 +2298,14 @@ "System.Security.Principal/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-I1tkfQlAoMM2URscUtpcRo/hX0jinXx6a/KUtEQoz3owaYwl3qwsO8cbzYVVnjxrzxjHo3nJC+62uolgeGIS9A==", + "sha512": "sha512-xfm+bWtDSCgnbHJVpZIPqBcsq9zeTq9yXIz8Bjgw15QeNqqbq8Bq3foFfdJch/Z1horX/qJj4bP6bx2aG0XU9g==", "path": "system.security.principal/4.3.0", "hashPath": "system.security.principal.4.3.0.nupkg.sha512" }, "System.Security.Principal.Windows/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-HVL1rvqYtnRCxFsYag/2le/ZfKLK4yMw79+s6FmKXbSCNN0JeAhrYxnRAHFoWRa0dEojsDcbBSpH3l22QxAVyw==", + "sha512": "sha512-ZEGSd3zUKgPl791nTMIp5pXQ9KyMhPsyKf011fp3J0Q16K8w7I4AWXj7dzsS8jeBqtEN1zampREG1g9EZNijbQ==", "path": "system.security.principal.windows/4.3.0", "hashPath": "system.security.principal.windows.4.3.0.nupkg.sha512" }, @@ -1970,19 +2323,33 @@ "path": "system.text.encoding/4.3.0", "hashPath": "system.text.encoding.4.3.0.nupkg.sha512" }, - "System.Text.Encoding.Extensions/4.0.11": { + "System.Text.Encoding.Extensions/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YVMK0Bt/A43RmwizJoZ22ei2nmrhobgeiYwFzC4YAN+nue8RF6djXDMog0UCn+brerQoYVyaS+ghy9P/MUVcmw==", + "path": "system.text.encoding.extensions/4.3.0", + "hashPath": "system.text.encoding.extensions.4.3.0.nupkg.sha512" + }, + "System.Text.Encodings.Web/5.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==", + "path": "system.text.encodings.web/5.0.0", + "hashPath": "system.text.encodings.web.5.0.0.nupkg.sha512" + }, + "System.Text.Json/5.0.0": { "type": "package", "serviceable": true, - "sha512": "sha512-jtbiTDtvfLYgXn8PTfWI+SiBs51rrmO4AAckx4KR6vFK9Wzf6tI8kcRdsYQNwriUeQ1+CtQbM1W4cMbLXnj/OQ==", - "path": "system.text.encoding.extensions/4.0.11", - "hashPath": "system.text.encoding.extensions.4.0.11.nupkg.sha512" + "sha512": "sha512-+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==", + "path": "system.text.json/5.0.0", + "hashPath": "system.text.json.5.0.0.nupkg.sha512" }, - "System.Text.Encodings.Web/4.5.0": { + "System.Text.RegularExpressions/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-aGaXMErXX1ZOgZJHzNv8y+XvXX5W7rWOtmDdLMHcFKeQ5t18cSmjkAnmDoglU+2Z0FJCkE3SG6uapsqM8FIq0g==", - "path": "system.text.encodings.web/4.5.0", - "hashPath": "system.text.encodings.web.4.5.0.nupkg.sha512" + "sha512": "sha512-RpT2DA+L660cBt1FssIE9CAGpLFdFPuheB7pLpKpn6ZXNby7jDERe8Ua/Ne2xGiwLVG2JOqziiaVCGDon5sKFA==", + "path": "system.text.regularexpressions/4.3.0", + "hashPath": "system.text.regularexpressions.4.3.0.nupkg.sha512" }, "System.Threading/4.3.0": { "type": "package", @@ -1998,6 +2365,13 @@ "path": "system.threading.tasks/4.3.0", "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512" }, + "System.Threading.Tasks.Extensions/4.5.4": { + "type": "package", + "serviceable": true, + "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "path": "system.threading.tasks.extensions/4.5.4", + "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512" + }, "System.Threading.Thread/4.0.0": { "type": "package", "serviceable": true, @@ -2008,11 +2382,32 @@ "System.Threading.ThreadPool/4.3.0": { "type": "package", "serviceable": true, - "sha512": "sha512-SrCOmTvvOOCmJT4BBxdZcwhz6XEMsjBGZvGSVorOxdCznaUNeVotEjDfXGIZ8gcGo00qgPbTV6puHDgcFYl6Iw==", + "sha512": "sha512-575wMrVtWOgxHlyHqSH3PUbN4RyMWSFfSipCvK3vmCrt1Q6GGRPKbs3mSwJnHrZVy4L91S9HeLr7VVEdKQaXSQ==", "path": "system.threading.threadpool/4.3.0", "hashPath": "system.threading.threadpool.4.3.0.nupkg.sha512" }, - "TomatoLog.Common/1.0.2": { + "System.Threading.Timer/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Z6YfyYTCg7lOZjJzBjONJTFKGN9/NIYKSxhU5GRd+DTwHSZyvWp1xuI5aR+dLg+ayyC5Xv57KiY4oJ0tMO89fQ==", + "path": "system.threading.timer/4.3.0", + "hashPath": "system.threading.timer.4.3.0.nupkg.sha512" + }, + "System.Xml.ReaderWriter/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-GrprA+Z0RUXaR4N7/eW71j1rgMnEnEVlgii49GZyAjTH7uliMnrOU3HNFBr6fEDBCJCIdlVNq9hHbaDR621XBA==", + "path": "system.xml.readerwriter/4.3.0", + "hashPath": "system.xml.readerwriter.4.3.0.nupkg.sha512" + }, + "System.Xml.XDocument/4.3.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-5zJ0XDxAIg8iy+t4aMnQAu0MqVbqyvfoUVl1yDV61xdo3Vth45oA2FoY4pPkxYAH5f8ixpmTqXeEIya95x0aCQ==", + "path": "system.xml.xdocument/4.3.0", + "hashPath": "system.xml.xdocument.4.3.0.nupkg.sha512" + }, + "TomatoLog.Common/2.0.0": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll index be1e576..c01c375 100644 Binary files a/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll and b/src/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.dll differ diff --git a/src/TomatoLog.Server/Program.cs b/src/TomatoLog.Server/Program.cs index 8f72d4f..a5c04d4 100644 --- a/src/TomatoLog.Server/Program.cs +++ b/src/TomatoLog.Server/Program.cs @@ -1,10 +1,15 @@ -using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using NLog.Web; using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.Json; using System.Threading.Tasks; +using TomatoLog.Common.Utilities; +using System.Text.Json.Serialization; namespace TomatoLog.Server { @@ -12,42 +17,40 @@ public class Program { public static void Main(string[] args) { - TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException; - var logger = NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger(); + var logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger(); try { logger.Debug("init main"); - BuildWebHost(args).Build().Run(); + CreateHostBuilder(args).Build().Run(); } catch (Exception ex) { + //NLog: catch setup errors logger.Error(ex, "Stopped program because of exception"); throw; } finally { + // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux) NLog.LogManager.Shutdown(); } } - private static void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e) - { - Console.WriteLine(e.Exception); - } - - public static IWebHostBuilder BuildWebHost(string[] args) - { - var builder = new ConfigurationBuilder().AddJsonFile("hosting.json").Build(); + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + var hostport = new ConfigurationBuilder().AddJsonFile("hosting.json").Build(); + webBuilder.UseStartup(); + webBuilder.UseConfiguration(hostport); + webBuilder.UseKestrel(); + }); + } - return WebHost.CreateDefaultBuilder(args) - .UseStartup() - .UseConfiguration(builder) - .ConfigureLogging(logging => - { - logging.ClearProviders(); - logging.SetMinimumLevel(LogLevel.Trace); - }) - .UseNLog(); - } + public class TestModel + { + public string[] IPList { get; set; } + public LogLevel Level { get; set; } + public DateTime DT { get; set; } } } diff --git a/src/TomatoLog.Server/Properties/launchSettings.json b/src/TomatoLog.Server/Properties/launchSettings.json index 1c36ff1..b8df4b4 100644 --- a/src/TomatoLog.Server/Properties/launchSettings.json +++ b/src/TomatoLog.Server/Properties/launchSettings.json @@ -1,12 +1,13 @@ -{ +{ "profiles": { "TomatoLog.Server": { "commandName": "Project", + "dotnetRunMessages": "true", "launchBrowser": true, + "applicationUrl": "http://0.0.0.0:20272", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:20272/" + } } } -} \ No newline at end of file +} diff --git a/src/TomatoLog.Server/Startup.cs b/src/TomatoLog.Server/Startup.cs index b1862e0..f5eceb8 100644 --- a/src/TomatoLog.Server/Startup.cs +++ b/src/TomatoLog.Server/Startup.cs @@ -1,15 +1,19 @@ -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; using NLog.Extensions.Logging; -using System.Net.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.Caching.StackExchangeRedis; using TomatoLog.Server.BLL; using TomatoLog.Server.Extensions; +using System.Net.Http; +using Microsoft.Extensions.Caching.Distributed; namespace TomatoLog.Server { @@ -18,16 +22,6 @@ public class Startup public Startup(IConfiguration configuration) { Configuration = configuration; - JsonConvert.DefaultSettings = () => - { - var st = new JsonSerializerSettings - { - Formatting = Formatting.Indented - }; - st.Converters.Add(new StringEnumConverter()); - - return st; - }; } public IConfiguration Configuration { get; } @@ -40,32 +34,21 @@ public void ConfigureServices(IServiceCollection services) builder.AddConfiguration(Configuration); builder.AddNLog().AddConsole().AddDebug(); }); - var disCache = this.Configuration["TomatoLog:Cache-Redis"]; - if (string.IsNullOrEmpty(disCache)) - { - services.AddDistributedMemoryCache(); - } - else - { - RedisHelper.Initialization(new CSRedis.CSRedisClient(disCache)); - services.AddSingleton(new Microsoft.Extensions.Caching.Redis.CSRedisCache(RedisHelper.Instance)); - } - services.AddSingleton(new SysConfigManager(this.Configuration)); - services.AddSingleton(new ProConfigManager(this.Configuration)); - services.AddLogWriter(this.Configuration); - services.AddSingleton(); - services.AddMvc(); + services.AddCustomerDistributedCache(Configuration) + .AddSingleton() + .AddSingleton() + .AddHttpClient() + .AddLogWriter(this.Configuration) + .AddSingleton() + .AddControllersWithViews(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, - IHostingEnvironment env, - ILoggerFactory factory, - IDistributedCache cache, + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, HttpClient httpClient, IDistributedCache cache, SysConfigManager sysConfig, ProConfigManager proConfig, - IApplicationLifetime lifetime) + IHostApplicationLifetime lifetime) { if (env.IsDevelopment()) { @@ -76,13 +59,14 @@ public void Configure(IApplicationBuilder app, app.UseExceptionHandler("/Home/Error"); } app.UseStaticFiles(); - app.UseTomatoLog(this.Configuration, cache, sysConfig, proConfig, lifetime); - - app.UseMvc(routes => + app.UseRouting(); + app.UseAuthorization(); + app.UseTomatoLog(this.Configuration, cache, sysConfig, proConfig, lifetime, httpClient); + app.UseEndpoints(endpoints => { - routes.MapRoute( + endpoints.MapControllerRoute( name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + pattern: "{controller=Home}/{action=Index}/{id?}"); }); } } diff --git a/src/TomatoLog.Server/TomatoLog.Server.csproj b/src/TomatoLog.Server/TomatoLog.Server.csproj index fcd31fe..563dce3 100644 --- a/src/TomatoLog.Server/TomatoLog.Server.csproj +++ b/src/TomatoLog.Server/TomatoLog.Server.csproj @@ -1,124 +1,61 @@ - + - netcoreapp2.2 - Linux - https://github.com/lianggx/TomatoLog/blob/master/LICENSE - 1.1.0 - lianggx - TomatoLog - https://github.com/lianggx/TomatoLog - https://github.com/lianggx/TomatoLog.git - git + net5.0 + 2.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - + PreserveNewest - + PreserveNewest - - Always + + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - - \ No newline at end of file + diff --git a/src/TomatoLog.Server/Views/Config/Index.cshtml b/src/TomatoLog.Server/Views/Config/Index.cshtml index c4e4734..8d8738c 100644 --- a/src/TomatoLog.Server/Views/Config/Index.cshtml +++ b/src/TomatoLog.Server/Views/Config/Index.cshtml @@ -83,8 +83,7 @@ - - @Html.Partial("SysVariables") + @section Scripts{ @if (show) diff --git a/src/TomatoLog.Server/Views/Home/Detail.cshtml b/src/TomatoLog.Server/Views/Home/Detail.cshtml index cf3c515..09cd803 100644 --- a/src/TomatoLog.Server/Views/Home/Detail.cshtml +++ b/src/TomatoLog.Server/Views/Home/Detail.cshtml @@ -23,7 +23,7 @@ - @Html.Partial("DetailPage", msgView, ViewData) + @@ -49,7 +49,7 @@ @foreach (var log in Model) { LogMessage msg = null; - try { msg = JsonConvert.DeserializeObject(log); } + try { msg = System.Text.Json.JsonSerializer.Deserialize(log); } catch { } if (msg != null) { @@ -74,7 +74,9 @@ }
- @Html.Partial("DetailPage", msgView, ViewData) + + +