diff --git a/src/jcdcdev.Umbraco.ReadingTime.TestSite/jcdcdev.Umbraco.ReadingTime.TestSite.csproj b/src/jcdcdev.Umbraco.ReadingTime.TestSite/jcdcdev.Umbraco.ReadingTime.TestSite.csproj index db723f2..c5f8763 100644 --- a/src/jcdcdev.Umbraco.ReadingTime.TestSite/jcdcdev.Umbraco.ReadingTime.TestSite.csproj +++ b/src/jcdcdev.Umbraco.ReadingTime.TestSite/jcdcdev.Umbraco.ReadingTime.TestSite.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/jcdcdev.Umbraco.ReadingTime.TestSite/packages.lock.json b/src/jcdcdev.Umbraco.ReadingTime.TestSite/packages.lock.json index 4da2f26..73382db 100644 --- a/src/jcdcdev.Umbraco.ReadingTime.TestSite/packages.lock.json +++ b/src/jcdcdev.Umbraco.ReadingTime.TestSite/packages.lock.json @@ -17,16 +17,16 @@ }, "Umbraco.Cms": { "type": "Direct", - "requested": "[15.0.0-rc2, )", - "resolved": "15.0.0-rc2", - "contentHash": "O/nWjgM0muZcRNjW3ON+ULTPThQUJUKIZTja5MjWh+NwBtqy5n5demXVtNUtZylFYiPgOS9FUDu9HTzgKnroIw==", + "requested": "[15.0.0-rc3, )", + "resolved": "15.0.0-rc3", + "contentHash": "efAb0/v+qeb5e5C7PKBoMU+Ktafah8xbOWWm5r0e2W6Xb+E8s0CXElbrlU1WgUew6FcorpHeprBkqqUjYFPPjw==", "dependencies": { - "Umbraco.Cms.Imaging.ImageSharp": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Persistence.EFCore.SqlServer": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Persistence.EFCore.Sqlite": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Persistence.SqlServer": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Persistence.Sqlite": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Targets": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Imaging.ImageSharp": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Persistence.EFCore.SqlServer": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Persistence.EFCore.Sqlite": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Persistence.SqlServer": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Persistence.Sqlite": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Targets": "[15.0.0-rc3, 16.0.0)" } }, "Asp.Versioning.Abstractions": { @@ -63,30 +63,29 @@ }, "Azure.Core": { "type": "Transitive", - "resolved": "1.40.0", - "contentHash": "eOx6wk3kQ3SCnoAj7IytAu/d99l07PdarmUc+RmMkVOTkcQ3s+UQEaGzMyEqC2Ua4SKnOW4Xw/klLeB5V2PiSA==", + "resolved": "1.44.1", + "contentHash": "YyznXLQZCregzHvioip07/BkzjuWNXogJEVz9T5W6TwjNr17ax41YGzYMptlo2G10oLCuVPoyva62y0SIRDixg==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.1", - "System.ClientModel": "1.0.0", + "Microsoft.Bcl.AsyncInterfaces": "6.0.0", + "System.ClientModel": "1.1.0", "System.Diagnostics.DiagnosticSource": "6.0.1", - "System.Memory.Data": "1.0.2", + "System.Memory.Data": "6.0.0", "System.Numerics.Vectors": "4.5.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2", + "System.Text.Encodings.Web": "6.0.0", + "System.Text.Json": "6.0.10", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Azure.Identity": { "type": "Transitive", - "resolved": "1.12.1", - "contentHash": "7j7ksn+1X2swW2DDDEEywK5wxuYImzMIXnunZTB83E3mwzBbyHOob1hO1wOG5fMZYTGe/+9gyc/qurcozaSm1A==", + "resolved": "1.13.1", + "contentHash": "4eeK9XztjTmvA4WN+qAvlUCSxSv45+LqTMeC8XT2giGGZHKthTMU2IuXcHjAOf5VLH3wE3Bo6EwhIcJxVB8RmQ==", "dependencies": { - "Azure.Core": "1.40.0", - "Microsoft.Identity.Client": "4.65.0", - "Microsoft.Identity.Client.Extensions.Msal": "4.65.0", - "System.Memory": "4.5.4", - "System.Security.Cryptography.ProtectedData": "4.7.0", - "System.Text.Json": "4.7.2", + "Azure.Core": "1.44.1", + "Microsoft.Identity.Client": "4.66.1", + "Microsoft.Identity.Client.Extensions.Msal": "4.66.1", + "System.Memory": "4.5.5", + "System.Text.Json": "6.0.10", "System.Threading.Tasks.Extensions": "4.5.4" } }, @@ -114,19 +113,19 @@ }, "Examine": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "w5H1YTIJVnT32XR4PqTDBSfPm20NoCDJtdX0sUUO6DJ2qi5fHT8PE8zZKVAklTctG2+sHSUSR9Qydm5YTHVnQw==", + "resolved": "3.4.0", + "contentHash": "Vmk7lbnsjBMobMhw+cM1BMmfpFYwIb6zGlBLHraqYSA8fChODqF0GKAlLiqhNqgiih8bb1CdAmtR9cgVGCDI0w==", "dependencies": { - "Examine.Core": "3.3.0", - "Examine.Lucene": "3.3.0", + "Examine.Core": "3.4.0", + "Examine.Lucene": "3.4.0", "Microsoft.AspNetCore.DataProtection": "8.0.4", "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.1" } }, "Examine.Core": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "f0uiXYuXQH1rWRxNVUi5+MGgJX+LYye+fmxyVa1Aw+NCY52dPf9eEuDMCf1zSVHQoC23o0ADNLhdSfg1kBPkGA==", + "resolved": "3.4.0", + "contentHash": "RAhjvT3lZZByyoCdPFPwA212VXuY0S+OubrS3Rg6cZPCyODaJGW8ugIiDLcoqTuribaD8QJ6qgft8iNrEWt3Ag==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.1", "Microsoft.Extensions.Options": "8.0.2" @@ -134,10 +133,10 @@ }, "Examine.Lucene": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "fXfh0+oHvHFRHGQdRQZP/K3FfxZMjem8vFEFcyB2v1ssesHEm2nTCc+XgCpUC5HfwyL5aqHbwOs7IqM1EZPfLg==", + "resolved": "3.4.0", + "contentHash": "fSkZWyoOQJEb0V2iv5mO7guAAesugBu7KSSKdaT7K5+Ofe+1e8hRCsvSXMvQTM+20Ca/OYc+w+KT/GUHm7ke8w==", "dependencies": { - "Examine.Core": "3.3.0", + "Examine.Core": "3.4.0", "Lucene.Net.QueryParser": "4.8.0-beta00016", "Lucene.Net.Replicator": "4.8.0-beta00016", "System.Threading": "4.3.0", @@ -146,8 +145,8 @@ }, "HtmlAgilityPack": { "type": "Transitive", - "resolved": "1.11.67", - "contentHash": "xnt6f8E56oK9nLqgkF42bsVSAkUuIuJnSfvzimK7GwvbhdXWRmGsx4A8AKmLOlCUq1rVSUADKalxnSMizHt4Mg==" + "resolved": "1.11.70", + "contentHash": "lwCgdq4H+WXH+lkM7TvJhyEs5uNGzoTud1VmXz2jr30/yOTRtG/oMCour5JMTN0t0fU4uFwFYIrDd98FH2RKsQ==" }, "Humanizer": { "type": "Transitive", @@ -595,15 +594,15 @@ }, "J2N": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "M5bwDajAARZiyqupU+rHQJnsVLxNBOHJ8vKYHd8LcLIb1FgLfzzcJvc31Qo5Xz/GEHFjDF9ScjKL/ks/zRTXuA==" + "resolved": "2.1.0", + "contentHash": "Vooz1wbnnqWuS+u93tADXK5Owxo8vLJhSrZ9Ac+KpgDF3GJq9TybXXTF1TFcWILgEtRThc8AOBENEzB0TQH1JA==" }, "jcdcdev.Umbraco.Core": { "type": "Transitive", - "resolved": "15.0.0-alpha0005", - "contentHash": "ylSeZfMtd0bTzD3tJoOhV8HZVnqdNCFf4mR+PNvz1L0v1rpc2L+MT2hKEk5mqxrZpr+KszOmnkLIgYfk05ni9Q==", + "resolved": "15.0.0-alpha0007", + "contentHash": "gEHBvjx15D3N0FYs9t/du7+otBjMB/b5472CC+8o3O2t+gthqi6jIBTtHZxJSbMnfAbTFCsaYwuTj+9bdiVk0Q==", "dependencies": { - "Umbraco.Cms.Web.Common": "15.0.0-rc2" + "Umbraco.Cms.Web.Common": "15.0.0-rc3" } }, "Json.More.Net": { @@ -635,11 +634,11 @@ }, "Lucene.Net": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "DCtUbE/NIrisNI7hRwU+UKS3Cr6S2vH1XB9wvEHHI3anu5OUpX1Fkr/PDC7oFCaol/QCvzVLbLZVizAT1aTLpA==", + "resolved": "4.8.0-beta00017", + "contentHash": "7LLWS9nNwx01AyE/KXMh+qdAlzDkRANE8407AO/wEmLL1InzVKFwfsRdRmwg4ILOMFui4xZ1Y54eqvzo3Tf9Vw==", "dependencies": { - "J2N": "2.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.0.0" + "J2N": "[2.1.0, 3.0.0)", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Lucene.Net.Analysis.Common": { @@ -652,36 +651,36 @@ }, "Lucene.Net.Facet": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "O1MrRfhb9BMfRQHooyEFrkgNwYbTEbK/AkKhz26sy+xO+zAldJ8YKS/IsydHsE+frklIAWT0jyv0c3Dh9qBXSA==", + "resolved": "4.8.0-beta00017", + "contentHash": "LVxGwgRAVq9XdwvNfgCB8OH+ou40I0E1NYN53muPjQK5oUY+HpkgkFUhTFSHdajWWj7xFI1f+UFB23iweoVf2w==", "dependencies": { - "Lucene.Net.Join": "4.8.0-beta00016", - "Lucene.Net.Queries": "4.8.0-beta00016" + "Lucene.Net.Join": "4.8.0-beta00017", + "Lucene.Net.Queries": "4.8.0-beta00017" } }, "Lucene.Net.Grouping": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "y7QSEYfSnz7gEJS30xHsf8P0oMIreGGO08qC+UzKre29IAoUXdLLE2+vUfByGkcPuoGMIpZVBP51P6O647grBg==", + "resolved": "4.8.0-beta00017", + "contentHash": "nzMGvz0b1cedS8KKOlglJQJpyz8fT0ojgXFkgSkLLhwPNbMPwVoBsR7RlZs1FrF60Oz369O3Pm1a+MIr52KcLQ==", "dependencies": { - "Lucene.Net": "4.8.0-beta00016", - "Lucene.Net.Queries": "4.8.0-beta00016" + "Lucene.Net": "4.8.0-beta00017", + "Lucene.Net.Queries": "4.8.0-beta00017" } }, "Lucene.Net.Join": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "trUiWhV3QPgW4TNPrEP29AsTXE29ACR5+Vz22xjbPtFTwyXMozl95NELVG5aUVMTqdwyMhJ9Lj82QeoHDnN0jw==", + "resolved": "4.8.0-beta00017", + "contentHash": "WcJl4O6t3iXiXwXHnhmbVCO7C6ilPxabBCsdW/auQN0lrDpbVIcHorCxwd199fGBEQnk7wbl5pPnk8nw/VK4eQ==", "dependencies": { - "Lucene.Net.Grouping": "4.8.0-beta00016" + "Lucene.Net.Grouping": "4.8.0-beta00017" } }, "Lucene.Net.Queries": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "XBzdMDlan68V2ZlhAlP8Fd+Xx2Le8ec7cEN1kFF45Sipa3Q8L/tilJfwS9VHvMTvGkwPM/yj62eGbfGBgIMR8Q==", + "resolved": "4.8.0-beta00017", + "contentHash": "RVpZCfa/7pgvytFw64zLqinvZPQt4TojvcFghdAA5vhnpSs5GTbtciPIxFH3wwH3f2dYJywiqYKo1h3JBCXRBA==", "dependencies": { - "Lucene.Net": "4.8.0-beta00016" + "Lucene.Net": "4.8.0-beta00017" } }, "Lucene.Net.QueryParser": { @@ -696,13 +695,13 @@ }, "Lucene.Net.Replicator": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "BP007m7TtHfOFNGoipn1Y3kgHir0yvDfyCW9g7P6PQIo7nNkyyHuEK9slVEkPhLq+21Q2EnnHl7jMGeh0aK2eA==", + "resolved": "4.8.0-beta00017", + "contentHash": "YGZcKkQhuLweZ+M4UgA/Uok3Vl3HOTlvZpUmTZMS4J9cBdvTevG0e6rn/pZrfONUpp0TtbXe494oGA1rScouOA==", "dependencies": { - "J2N": "2.0.0", - "Lucene.Net": "4.8.0-beta00016", - "Lucene.Net.Facet": "4.8.0-beta00016", - "Newtonsoft.Json": "10.0.1" + "J2N": "[2.1.0, 3.0.0)", + "Lucene.Net": "4.8.0-beta00017", + "Lucene.Net.Facet": "4.8.0-beta00017", + "Newtonsoft.Json": "13.0.1" } }, "Lucene.Net.Sandbox": { @@ -734,17 +733,17 @@ }, "MessagePack": { "type": "Transitive", - "resolved": "2.5.172", - "contentHash": "tO/SIeix4UjmHo0J7Z1IRMvHEfqLlN9FAQCzwGcoG50mt7gPyYsAuMU9Ngu9iDSv0ak/YZOyobs0BidFde+gDw==", + "resolved": "2.5.187", + "contentHash": "uW4j8m4Nc+2Mk5n6arOChavJ9bLjkis0qWASOj2h2OwmfINuzYv+mjCHUymrYhmyyKTu3N+ObtTXAY4uQ7jIhg==", "dependencies": { - "MessagePack.Annotations": "2.5.172", + "MessagePack.Annotations": "2.5.187", "Microsoft.NET.StringTools": "17.6.3" } }, "MessagePack.Annotations": { "type": "Transitive", - "resolved": "2.5.172", - "contentHash": "LJWMr5BDpvLaIfsUXufFWQW3VRFg7EKnGAHjArbwCaSeTIWEXaRoClkQtPaXvtVPZk5ZIpc9SBQd/WJD/m99Ww==" + "resolved": "2.5.187", + "contentHash": "/IvvMMS8opvlHjEJ/fR2Cal4Co726Kj77Z8KiohFhuHfLHHmb9uUxW5+tSCL4ToKFfkQlrS3HD638mRq83ySqA==" }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", @@ -856,8 +855,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "1.1.1", - "contentHash": "yuvf07qFWFqtK3P/MRkEKLhn5r2UbSpVueRziSqj0yJQIKFwG1pq9mOayK3zE5qZCTs0CbrwL9M6R8VwqyGy2w==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.Bcl.TimeProvider": { "type": "Transitive", @@ -1415,8 +1414,8 @@ }, "Microsoft.Identity.Client": { "type": "Transitive", - "resolved": "4.65.0", - "contentHash": "RV35ZcJ5/P7n+Zu6J3wmtiDdK6MW5h6EpZ0ojjB9sMwNhGHEJCv829cb3kZ4PZ664llYFv8sbUITWWGvBTqv0Q==", + "resolved": "4.66.1", + "contentHash": "mE+m3pZ7zSKocSubKXxwZcUrCzLflC86IdLxrVjS8tialy0b1L+aECBqRBC/ykcPlB4y7skg49TaTiA+O2UfDw==", "dependencies": { "Microsoft.IdentityModel.Abstractions": "6.35.0", "System.Diagnostics.DiagnosticSource": "6.0.1" @@ -1424,10 +1423,10 @@ }, "Microsoft.Identity.Client.Extensions.Msal": { "type": "Transitive", - "resolved": "4.65.0", - "contentHash": "JIOBFMAyVSqGWP4dNoST+A9BRJMGC8m73BNbR1oKA8nUjGyR8Fd4eOOME/VDrd26I5JWU4RtmWqpt20lpp2r5w==", + "resolved": "4.66.1", + "contentHash": "osgt1J9Rve3LO7wXqpWoFx9UFjl0oeqoUMK/xEru7dvafQ28RgV1A17CoCGCCRSUbgDQ4Arg5FgGK2lQ3lXR4A==", "dependencies": { - "Microsoft.Identity.Client": "4.65.0", + "Microsoft.Identity.Client": "4.66.1", "System.Security.Cryptography.ProtectedData": "4.5.0" } }, @@ -1992,19 +1991,19 @@ }, "Serilog": { "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "Vehq4uNYtURe/OnHEpWGvMgrvr5Vou7oZLdn3BuEH5FSCeHXDpNJtpzWoqywXsSvCTuiv0I65mZDRnJSeUvisA==" + "resolved": "4.1.0", + "contentHash": "u1aZI8HZ62LWlq5dZLFwm6jMax/sUwnWZSw5lkPsCt518cJBxFKoNmc7oSxe5aA5BgSkzy9rzwFGR/i/acnSPw==" }, "Serilog.AspNetCore": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "LNUd1bHsik2E7jSoCQFdeMGAWXjH7eUQ6c2pqm5vl+jGqvxdabYXxlrfaqApjtX5+BfAjW9jTA2EKmPwxknpIA==", + "resolved": "8.0.3", + "contentHash": "Y5at41mc0OV982DEJslBKHd6uzcWO6POwR3QceJ6gtpMPxCzm4+FElGPF0RdaTD7MGsP6XXE05LMbSi0NO+sXg==", "dependencies": { "Microsoft.Extensions.Logging": "8.0.0", "Serilog": "3.1.1", "Serilog.Extensions.Hosting": "8.0.0", "Serilog.Formatting.Compact": "2.0.0", - "Serilog.Settings.Configuration": "8.0.2", + "Serilog.Settings.Configuration": "8.0.4", "Serilog.Sinks.Console": "5.0.0", "Serilog.Sinks.Debug": "2.0.0", "Serilog.Sinks.File": "5.0.0" @@ -2084,10 +2083,10 @@ }, "Serilog.Sinks.Async": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "a+kTyUUxPAOZWKJiNbDqCPMiP0BWBWzObyTpRmGLrgCecgc/YJ+HqYGjsQoS6Sj9cRVXB9hH5O1mTZ0DiewG2w==", + "resolved": "2.1.0", + "contentHash": "SnmRknWsSMgyo9wDXeZZCqSp48kkQYy44taSM6vcpxfiRICzSf09oLKEmVr0RCwQnfd8mJQ2WNN6nvhqf0RowQ==", "dependencies": { - "Serilog": "4.0.0" + "Serilog": "4.1.0" } }, "Serilog.Sinks.Console": { @@ -2168,35 +2167,35 @@ }, "Swashbuckle.AspNetCore": { "type": "Transitive", - "resolved": "6.8.1", - "contentHash": "JN6ccH37QKtNOwBrvSxc+jBYIB+cw6RlZie2IKoJhjjf6HzBH+2kPJCpxmJ5EHIqmxvq6aQG+0A8XklGx9rAxA==", + "resolved": "6.9.0", + "contentHash": "lvI+XHF21tkwXd2nDCLGJsdhdUYsY3Ax2fWUlvw81Oa6EedtnIAf5tThy8ZnPcz/9/TwsLgjgtX9ifOCIjbEPA==", "dependencies": { "Microsoft.Extensions.ApiDescription.Server": "6.0.5", - "Swashbuckle.AspNetCore.Swagger": "6.8.1", - "Swashbuckle.AspNetCore.SwaggerGen": "6.8.1", - "Swashbuckle.AspNetCore.SwaggerUI": "6.8.1" + "Swashbuckle.AspNetCore.Swagger": "6.9.0", + "Swashbuckle.AspNetCore.SwaggerGen": "6.9.0", + "Swashbuckle.AspNetCore.SwaggerUI": "6.9.0" } }, "Swashbuckle.AspNetCore.Swagger": { "type": "Transitive", - "resolved": "6.8.1", - "contentHash": "eOkdM4bsWBU5Ty3kWbyq5O9L+05kZT0vOdGh4a92vIb/LLQGQTPLRHXuJdnUBNIPNC8XfKWfSbtRfqzI6nnbqw==", + "resolved": "6.9.0", + "contentHash": "P316kpxx5DnDvJwNWW8iTAXkh9DVenAxFGe9v4OUS0gil+vitH7F1feXhCtVeHN/616EFNTMh4pV2lcr9kkw/w==", "dependencies": { "Microsoft.OpenApi": "1.6.14" } }, "Swashbuckle.AspNetCore.SwaggerGen": { "type": "Transitive", - "resolved": "6.8.1", - "contentHash": "TjBPxsN0HeJzxEXZYeDXBNNMSyhg+TYXtkbwX+Cn8GH/y5ZeoB/chw0p71kRo5tR2sNshbKwL24T6f9pTF9PHg==", + "resolved": "6.9.0", + "contentHash": "FjeMR3fBzwVc5plfYjoHw9ptf8SOWMupvO9X35J5EgzT3L9dRqSxa+cBKzL8PwCyemY0xNrggQSB5+MFWx1axg==", "dependencies": { - "Swashbuckle.AspNetCore.Swagger": "6.8.1" + "Swashbuckle.AspNetCore.Swagger": "6.9.0" } }, "Swashbuckle.AspNetCore.SwaggerUI": { "type": "Transitive", - "resolved": "6.8.1", - "contentHash": "lpEszYJ7vZaTTE5Dp8MrsbSHrgDfjhDMjzW1qOA1Xs1Dnj3ZRBJAcPZUTsa5Bva+nLaw91JJ8OI8FkSg8hhIyA==" + "resolved": "6.9.0", + "contentHash": "0OxlWBFLl2gUESZX/K7QCTz9KctKy0VxHTvLIBcyWGD4z/fv5MCMW02qzYGcReLJr4yBnNDRzApKtLh6oBpe9A==" }, "System.AppContext": { "type": "Transitive", @@ -2220,11 +2219,11 @@ }, "System.ClientModel": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==", + "resolved": "1.1.0", + "contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==", "dependencies": { "System.Memory.Data": "1.0.2", - "System.Text.Json": "4.7.2" + "System.Text.Json": "6.0.9" } }, "System.Collections": { @@ -2552,16 +2551,15 @@ }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==" + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" }, "System.Memory.Data": { "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==", + "resolved": "6.0.0", + "contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==", "dependencies": { - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.6.0" + "System.Text.Json": "6.0.0" } }, "System.Net.Http": { @@ -3152,44 +3150,44 @@ }, "Umbraco.Cms.Api.Common": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "O9OsfDDJjLQVEqkwlDWgjqAYxlIydJAjlWkDuB9J0hBFHLF9OFBa2iJZ3WhMQM08FNzhVhX/q89mO1dYS5kRyw==", + "resolved": "15.0.0-rc3", + "contentHash": "ajwwhqR69JLK5K4qYqqfy1oD9oY5ONrgTspaPLAa6CXgKlgvkrF5SZhjX9U6W5vFNuu7hlGVTHOxRCZ2h/o5nQ==", "dependencies": { "Asp.Versioning.Mvc": "8.1.0", "Asp.Versioning.Mvc.ApiExplorer": "8.1.0", "Microsoft.IdentityModel.JsonWebTokens": "8.1.2", "OpenIddict.Abstractions": "6.0.0-preview1.24504.78", "OpenIddict.AspNetCore": "6.0.0-preview1.24504.78", - "Swashbuckle.AspNetCore": "6.8.1", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, 16.0.0)" + "Swashbuckle.AspNetCore": "6.9.0", + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Api.Delivery": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "UZul55zjY5FaH2PWD6vj4Fq/OejJEHtm6qNFoZFFWABgxz1YE5635IE0C2+/mMmIQ7fvvfdkY7AHhmX98Cy8tQ==", + "resolved": "15.0.0-rc3", + "contentHash": "ux37/LjlyUS9ZoGn3/vljR1bVFXJgWxF7J4W3ziyMXe67INtAv2KdPUgJVBj1Ve0XmsrJZSdTF0P52HY93mV+g==", "dependencies": { - "Umbraco.Cms.Api.Common": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Api.Common": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Api.Management": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "z59gb/wzUmkxAah9gDQJAuJ2Xa+G7+zjaxPTqsUijRAn3Tn+7NqVGA9RDw5YIdaQgL5HAURv37EX7seIUlXkcg==", + "resolved": "15.0.0-rc3", + "contentHash": "04+Nlg61C7HUTj7V7g8+Znx/AnOZgfj1Gw/Zw9FcTCyV6tFfQSDk90jLFufZOVuqBfbUy3qg4MdjmJxWXE7DGA==", "dependencies": { "JsonPatch.Net": "3.1.1", - "Swashbuckle.AspNetCore": "6.8.1", - "Umbraco.Cms.Api.Common": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc2, 16.0.0)" + "Swashbuckle.AspNetCore": "6.9.0", + "Umbraco.Cms.Api.Common": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "+REtqEDIDmNzPGcYmi8g3RSVBtXrDlJCdVY6ozy7fSadW8xwLUAZn40BhI9/owb3OBl0xRcg2CC0HRZKmhQtDQ==", + "resolved": "15.0.0-rc3", + "contentHash": "58o5tPxDjCnxBlv5NhOr/BOwEceSntLlvRPk+gxExocOh4D68lgA0zlON7Xl/P2fvSRMjTkfIpFqyGDua8+QMA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "9.0.0-rc.2.24473.5", "Microsoft.Extensions.Caching.Memory": "9.0.0-rc.2.24473.5", @@ -3206,31 +3204,32 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "IQBqpCVCeEs7yPdzD/WBlL7UKOfmcLW7wiY0daNU59dQxMfw9r+zBUZ7vC6qdSryhVsa1fJJ7c1fbpxyIl70ng==", + "resolved": "15.0.0-rc3", + "contentHash": "pzP8j9As1rKqhJf0iStcyTESnVqnzG3y/QIAZt9RsPqcekSUrBrAO+OnaNk393BWfaze3goasyrqDzthMtpMVg==", "dependencies": { - "Examine": "3.3.0", + "Examine": "3.4.0", + "Lucene.Net.Replicator": "4.8.0-beta00017", "System.Security.Cryptography.Xml": "9.0.0-rc.2.24473.5", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Imaging.ImageSharp": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "UcXTKI0x87UJ+jDZhC8GEmkXNRxazcQa/w6Ot6FLhWFTjmPOIgmm11WxKIFVhiq4JIxIl0YzfH9OLXnBqlHiDQ==", + "resolved": "15.0.0-rc3", + "contentHash": "zK/9i1G1UBbryX+GUnseFFCw+TIkHlYqjEAhmsXwgoVlo5JtgjD/NRc7CfKGz/CuGdwRijGZqArngxhgZnen9g==", "dependencies": { "SixLabors.ImageSharp": "3.1.5", "SixLabors.ImageSharp.Web": "3.1.3", - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "X1uSFSS4EcdCCKQZA440uV+hhDDMipz5S5Gwt0i85DInG6niOV8d7HDsfsaQmf5SJCBRyQUaKVgocoS6+LNcjg==", + "resolved": "15.0.0-rc3", + "contentHash": "F1UWBDkGEGszOKfTq7/H1jkUsIT/9KR9S6wW48a70ZQNaOuV/nU/A7BO4AR60IOJZj1uwsJZcHxP5ZoiE5BE6w==", "dependencies": { - "Examine.Core": "3.3.0", - "HtmlAgilityPack": "1.11.67", + "Examine.Core": "3.4.0", + "HtmlAgilityPack": "1.11.70", "MailKit": "4.8.0", "Markdown": "2.2.1", "Microsoft.CodeAnalysis.CSharp": "4.10.0", @@ -3242,7 +3241,7 @@ "MiniProfiler.Shared": "4.3.8", "NPoco": "5.7.1", "OpenIddict.Abstractions": "6.0.0-preview1.24504.78", - "Serilog": "4.0.2", + "Serilog": "4.1.0", "Serilog.Enrichers.Process": "3.0.0", "Serilog.Enrichers.Thread": "4.0.0", "Serilog.Expressions": "5.0.0", @@ -3250,108 +3249,108 @@ "Serilog.Formatting.Compact": "3.0.0", "Serilog.Formatting.Compact.Reader": "4.0.0", "Serilog.Settings.Configuration": "8.0.4", - "Serilog.Sinks.Async": "2.0.0", + "Serilog.Sinks.Async": "2.1.0", "Serilog.Sinks.File": "6.0.0", "Serilog.Sinks.Map": "2.0.0", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.Persistence.EFCore": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "JpBJqglG5l8rB4Zaz/y40CtUoNPRCona5/nhCDYWF6uY/2ycBYWoQsoNv6aCecfkg119/VLIers/mmGLKuDT5A==", + "resolved": "15.0.0-rc3", + "contentHash": "XoMuWZSUh43VmVdhLliwd43gpWDW63nssr8gSQNwQForPz6K0J5zd4RQKDYFb28Y/uG1snD83xS/7mUhxwePZw==", "dependencies": { - "Azure.Identity": "1.12.1", + "Azure.Identity": "1.13.1", "Microsoft.EntityFrameworkCore.SqlServer": "9.0.0-rc.2.24474.1", "Microsoft.EntityFrameworkCore.Sqlite": "9.0.0-rc.2.24474.1", "OpenIddict.EntityFrameworkCore": "6.0.0-preview1.24504.78", "System.Runtime.Caching": "9.0.0-rc.2.24473.5", "System.Text.Encodings.Web": "9.0.0-rc.2.24473.5", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Persistence.EFCore.Sqlite": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "aSZPB8AeTB7hqm+vNT4O6OFxi2Ox8+xQeyBAun1rMh+gOSnht3pQsxptSKVRKlmD8bMw7lyiFuo5sYDYITDRpQ==", + "resolved": "15.0.0-rc3", + "contentHash": "l+tq2U4ti2B7P1pI+9Hgm0fsuOjzhiZMqNLBHZR5XqZMdKYBe4hXsPt6/Y7GkORm+zVk2KfUZxEuTOyOWcx3XA==", "dependencies": { "Microsoft.EntityFrameworkCore.Sqlite": "9.0.0-rc.2.24474.1", - "Umbraco.Cms.Persistence.EFCore": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Persistence.EFCore": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Persistence.EFCore.SqlServer": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "CzSmgi0YimrEkY1nFOmzdCYWPUYfp6Ig0DTXbDrnaRLhAeYBJud7RnYEeOq2EYPIs13H3+3Z6O0222WvmW0ssA==", + "resolved": "15.0.0-rc3", + "contentHash": "xRESWg5puA73MWiBpW1pUHsljsKy7CUxYuotVORL1xYLegMRWBrgw4X7CMbnS2yoCZeA0Mn1r1z56E3cm9ttyQ==", "dependencies": { - "Azure.Identity": "1.12.1", + "Azure.Identity": "1.13.1", "Microsoft.EntityFrameworkCore.SqlServer": "9.0.0-rc.2.24474.1", "Microsoft.IdentityModel.JsonWebTokens": "8.1.2", "System.Runtime.Caching": "9.0.0-rc.2.24473.5", - "Umbraco.Cms.Persistence.EFCore": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Persistence.EFCore": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Persistence.Sqlite": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "IbsFqLZ7oOBTvzxlch7IkcYAK1YkB7895Y81Q/+GZLd/NSX+/YCFgqk4BCUbMpx+0nv9o3VA7JutZvM2O+nLFA==", + "resolved": "15.0.0-rc3", + "contentHash": "5iFjh8jrpj5QsIdIOS/+txKHVdE/B1QWKHPSEHsAoUK+nYx/X37+UOmSZ5IKwsuh43xZTKkZ7wefkpHxjWHrPw==", "dependencies": { "Microsoft.Data.Sqlite": "9.0.0-rc.2.24474.1", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Persistence.SqlServer": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "Sv7yklGqR5hG1TM03vtXzMarfD5A2JpMv4KGBOFQmDDuoWQUpn0ISbMtNGn35QL/b4z85C++rqeljWnSQt+QPQ==", + "resolved": "15.0.0-rc3", + "contentHash": "QgtNSqiCZPvuPOSGsAtKQjbVtowIEYUXykB9TeseSd4IovxggdeXhOr0b6ZnL5RzN+VR0SN2B0NCHG9Mj8IJYA==", "dependencies": { - "Azure.Identity": "1.12.1", + "Azure.Identity": "1.13.1", "Microsoft.Data.SqlClient": "5.2.2", "Microsoft.IdentityModel.JsonWebTokens": "8.1.2", "NPoco.SqlServer": "5.7.1", "System.Runtime.Caching": "9.0.0-rc.2.24473.5", "System.Text.Encodings.Web": "9.0.0-rc.2.24473.5", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.PublishedCache.HybridCache": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "0D0PVX950Ap/i4CGqC8n5/Usx/vY51i+eWZdHHST5MqfdOR8pH0XJhwN1ULwANz68TZyzBY3WQ5SR6nJ7U9/5w==", + "resolved": "15.0.0-rc3", + "contentHash": "DZPBlbXxLp8hYLY/o9UgXF2FcHx1nctiGKSvFFFZPIu1Jc8YvNvXGKIQzuc6HuU5gBv1W2Rt1dtpUPvxF4Hhhg==", "dependencies": { "K4os.Compression.LZ4": "1.3.8", - "MessagePack": "2.5.172", + "MessagePack": "2.5.187", "Microsoft.Extensions.Caching.Hybrid": "9.0.0-preview.9.24507.7", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.StaticAssets": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "QQK41UB8sbtRNCe4+IiANKQkaAR2eJwJpWc1GEBaCXPOZAC3ythhKjPkB2OYWYyFfdTDo3rV4Tj9e8lGeYC22A==", + "resolved": "15.0.0-rc3", + "contentHash": "8/qQBXeFtH8/dNvz2YOkL1Ilf2M8FCd4BYK3X7YC9XeFyRJzBBJugAGkWXiYgaGa8fNgUaJ9SGovZebFOOP07Q==", "dependencies": { - "Umbraco.Cms.Api.Management": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Web.Website": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Api.Management": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Web.Website": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Targets": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "reDvg6z3LP+dfaP6llvKaP1Cqw01Jm5qIIbk0dfQnSSGvseYeVjVujlJEXMQxg1qbJ0xst0xbSaPX3rs4KCfsw==", + "resolved": "15.0.0-rc3", + "contentHash": "yp29wOp1GOjMcpbPOXXpqt/Ddb69adOIhOTYq16c9CLDs2YfRB8tZz8C8YCuuRNslm7z5c12LHXF6yMMvreb4g==", "dependencies": { - "Umbraco.Cms.Api.Delivery": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Api.Management": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.StaticAssets": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Api.Delivery": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Api.Management": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.StaticAssets": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Web.Common": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "lScuhochve2LMASy7qMvIIvunzXw/Cym882gF6bJqtt1moJ1fwmit4eEgB3fMDtNR16zEgZdiSMBR7iEbIhfHw==", + "resolved": "15.0.0-rc3", + "contentHash": "kUkwjejXCblgZm6oT/6jsblQXaSbd2bMaUQd+aB2hoGSWVq+IA0a3mzhgYC8K9XnmaiJIWHr/aArcd/HJa+AOw==", "dependencies": { "Asp.Versioning.Mvc": "8.1.0", "Asp.Versioning.Mvc.ApiExplorer": "8.1.0", @@ -3359,29 +3358,29 @@ "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation": "9.0.0-rc.2.24474.3", "Microsoft.IdentityModel.JsonWebTokens": "8.1.2", "MiniProfiler.AspNetCore.Mvc": "4.3.8", - "Serilog.AspNetCore": "8.0.2", + "Serilog.AspNetCore": "8.0.3", "System.Net.Http": "4.3.4", "System.Text.Encodings.Web": "9.0.0-rc.2.24473.5", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Examine.Lucene": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "6TSSpAaK/w1W1qjAMja7B+hujp8CtDcjvOjey65jCbniuqgY9q8fd0GgUSSQu1NdL9GXWqBByVNAYJiVoMIXdA==", + "resolved": "15.0.0-rc3", + "contentHash": "SydbaQGMVkssUGmO1FFCiHEnxAb3OLszwi91IHQf6u/eHM1VIRVYfJwG8CiCKi2hSs0yhHB2zfmsd6UQ/vHDXQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, 16.0.0)" } }, "jcdcdev.umbraco.readingtime": { "type": "Project", "dependencies": { "Humanizer": "[2.14.1, )", - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, )", - "Umbraco.Cms.Web.Website": "[15.0.0-rc2, )", - "jcdcdev.Umbraco.Core": "[15.0.0-alpha0005, )" + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, )", + "Umbraco.Cms.Web.Website": "[15.0.0-rc3, )", + "jcdcdev.Umbraco.Core": "[15.0.0-alpha0007, )" } } } diff --git a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeValueProviderBase.cs b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeValueProviderBase.cs index 02e9461..792b4ad 100644 --- a/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeValueProviderBase.cs +++ b/src/jcdcdev.Umbraco.ReadingTime/Infrastructure/Indexing/ReadingTimeValueProviderBase.cs @@ -2,6 +2,7 @@ using jcdcdev.Umbraco.ReadingTime.Core.Extensions; using jcdcdev.Umbraco.ReadingTime.Core.PropertyEditors; using Umbraco.Cms.Core.Models; +using Umbraco.Cms.Core.PropertyEditors; namespace jcdcdev.Umbraco.ReadingTime.Infrastructure.Indexing; @@ -16,17 +17,17 @@ public abstract class ReadingTimeValueProviderBase : IReadingTimeValueProvider IEnumerable availableCultures, ReadingTimeConfiguration config); - protected TimeSpan ProcessIndexValues(IEnumerable>> values, int wpm) + protected TimeSpan ProcessIndexValues(IEnumerable indexValues, int wpm) { var time = new TimeSpan(); - foreach (var kvp in values) + foreach (var indexValue in indexValues) { - if (kvp.Key.StartsWith("__Raw")) + if (indexValue.FieldName.StartsWith("__Raw")) { continue; } - foreach (var value in kvp.Value.OfType()) + foreach (var value in indexValue.Values.OfType()) { time += value.GetReadingTime(wpm); } diff --git a/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj b/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj index d190047..5179dd7 100644 --- a/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj +++ b/src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/jcdcdev.Umbraco.ReadingTime/packages.lock.json b/src/jcdcdev.Umbraco.ReadingTime/packages.lock.json index 176e30a..7495521 100644 --- a/src/jcdcdev.Umbraco.ReadingTime/packages.lock.json +++ b/src/jcdcdev.Umbraco.ReadingTime/packages.lock.json @@ -60,18 +60,18 @@ }, "jcdcdev.Umbraco.Core": { "type": "Direct", - "requested": "[15.0.0-alpha0005, )", - "resolved": "15.0.0-alpha0005", - "contentHash": "ylSeZfMtd0bTzD3tJoOhV8HZVnqdNCFf4mR+PNvz1L0v1rpc2L+MT2hKEk5mqxrZpr+KszOmnkLIgYfk05ni9Q==", + "requested": "[15.0.0-alpha0007, )", + "resolved": "15.0.0-alpha0007", + "contentHash": "gEHBvjx15D3N0FYs9t/du7+otBjMB/b5472CC+8o3O2t+gthqi6jIBTtHZxJSbMnfAbTFCsaYwuTj+9bdiVk0Q==", "dependencies": { - "Umbraco.Cms.Web.Common": "15.0.0-rc2" + "Umbraco.Cms.Web.Common": "15.0.0-rc3" } }, "Umbraco.Cms.Web.Common": { "type": "Direct", - "requested": "[15.0.0-rc2, )", - "resolved": "15.0.0-rc2", - "contentHash": "lScuhochve2LMASy7qMvIIvunzXw/Cym882gF6bJqtt1moJ1fwmit4eEgB3fMDtNR16zEgZdiSMBR7iEbIhfHw==", + "requested": "[15.0.0-rc3, )", + "resolved": "15.0.0-rc3", + "contentHash": "kUkwjejXCblgZm6oT/6jsblQXaSbd2bMaUQd+aB2hoGSWVq+IA0a3mzhgYC8K9XnmaiJIWHr/aArcd/HJa+AOw==", "dependencies": { "Asp.Versioning.Mvc": "8.1.0", "Asp.Versioning.Mvc.ApiExplorer": "8.1.0", @@ -79,21 +79,21 @@ "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation": "9.0.0-rc.2.24474.3", "Microsoft.IdentityModel.JsonWebTokens": "8.1.2", "MiniProfiler.AspNetCore.Mvc": "4.3.8", - "Serilog.AspNetCore": "8.0.2", + "Serilog.AspNetCore": "8.0.3", "System.Net.Http": "4.3.4", "System.Text.Encodings.Web": "9.0.0-rc.2.24473.5", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Examine.Lucene": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Examine.Lucene": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.PublishedCache.HybridCache": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Web.Website": { "type": "Direct", - "requested": "[15.0.0-rc2, )", - "resolved": "15.0.0-rc2", - "contentHash": "6TSSpAaK/w1W1qjAMja7B+hujp8CtDcjvOjey65jCbniuqgY9q8fd0GgUSSQu1NdL9GXWqBByVNAYJiVoMIXdA==", + "requested": "[15.0.0-rc3, )", + "resolved": "15.0.0-rc3", + "contentHash": "SydbaQGMVkssUGmO1FFCiHEnxAb3OLszwi91IHQf6u/eHM1VIRVYfJwG8CiCKi2hSs0yhHB2zfmsd6UQ/vHDXQ==", "dependencies": { - "Umbraco.Cms.Web.Common": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Web.Common": "[15.0.0-rc3, 16.0.0)" } }, "Asp.Versioning.Abstractions": { @@ -152,19 +152,19 @@ }, "Examine": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "w5H1YTIJVnT32XR4PqTDBSfPm20NoCDJtdX0sUUO6DJ2qi5fHT8PE8zZKVAklTctG2+sHSUSR9Qydm5YTHVnQw==", + "resolved": "3.4.0", + "contentHash": "Vmk7lbnsjBMobMhw+cM1BMmfpFYwIb6zGlBLHraqYSA8fChODqF0GKAlLiqhNqgiih8bb1CdAmtR9cgVGCDI0w==", "dependencies": { - "Examine.Core": "3.3.0", - "Examine.Lucene": "3.3.0", + "Examine.Core": "3.4.0", + "Examine.Lucene": "3.4.0", "Microsoft.AspNetCore.DataProtection": "8.0.4", "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.1" } }, "Examine.Core": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "f0uiXYuXQH1rWRxNVUi5+MGgJX+LYye+fmxyVa1Aw+NCY52dPf9eEuDMCf1zSVHQoC23o0ADNLhdSfg1kBPkGA==", + "resolved": "3.4.0", + "contentHash": "RAhjvT3lZZByyoCdPFPwA212VXuY0S+OubrS3Rg6cZPCyODaJGW8ugIiDLcoqTuribaD8QJ6qgft8iNrEWt3Ag==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.1", "Microsoft.Extensions.Options": "8.0.2" @@ -172,10 +172,10 @@ }, "Examine.Lucene": { "type": "Transitive", - "resolved": "3.3.0", - "contentHash": "fXfh0+oHvHFRHGQdRQZP/K3FfxZMjem8vFEFcyB2v1ssesHEm2nTCc+XgCpUC5HfwyL5aqHbwOs7IqM1EZPfLg==", + "resolved": "3.4.0", + "contentHash": "fSkZWyoOQJEb0V2iv5mO7guAAesugBu7KSSKdaT7K5+Ofe+1e8hRCsvSXMvQTM+20Ca/OYc+w+KT/GUHm7ke8w==", "dependencies": { - "Examine.Core": "3.3.0", + "Examine.Core": "3.4.0", "Lucene.Net.QueryParser": "4.8.0-beta00016", "Lucene.Net.Replicator": "4.8.0-beta00016", "System.Threading": "4.3.0", @@ -184,8 +184,8 @@ }, "HtmlAgilityPack": { "type": "Transitive", - "resolved": "1.11.67", - "contentHash": "xnt6f8E56oK9nLqgkF42bsVSAkUuIuJnSfvzimK7GwvbhdXWRmGsx4A8AKmLOlCUq1rVSUADKalxnSMizHt4Mg==" + "resolved": "1.11.70", + "contentHash": "lwCgdq4H+WXH+lkM7TvJhyEs5uNGzoTud1VmXz2jr30/yOTRtG/oMCour5JMTN0t0fU4uFwFYIrDd98FH2RKsQ==" }, "Humanizer.Core": { "type": "Transitive", @@ -578,8 +578,8 @@ }, "J2N": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "M5bwDajAARZiyqupU+rHQJnsVLxNBOHJ8vKYHd8LcLIb1FgLfzzcJvc31Qo5Xz/GEHFjDF9ScjKL/ks/zRTXuA==" + "resolved": "2.1.0", + "contentHash": "Vooz1wbnnqWuS+u93tADXK5Owxo8vLJhSrZ9Ac+KpgDF3GJq9TybXXTF1TFcWILgEtRThc8AOBENEzB0TQH1JA==" }, "K4os.Compression.LZ4": { "type": "Transitive", @@ -588,11 +588,11 @@ }, "Lucene.Net": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "DCtUbE/NIrisNI7hRwU+UKS3Cr6S2vH1XB9wvEHHI3anu5OUpX1Fkr/PDC7oFCaol/QCvzVLbLZVizAT1aTLpA==", + "resolved": "4.8.0-beta00017", + "contentHash": "7LLWS9nNwx01AyE/KXMh+qdAlzDkRANE8407AO/wEmLL1InzVKFwfsRdRmwg4ILOMFui4xZ1Y54eqvzo3Tf9Vw==", "dependencies": { - "J2N": "2.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "2.0.0" + "J2N": "[2.1.0, 3.0.0)", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" } }, "Lucene.Net.Analysis.Common": { @@ -605,36 +605,36 @@ }, "Lucene.Net.Facet": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "O1MrRfhb9BMfRQHooyEFrkgNwYbTEbK/AkKhz26sy+xO+zAldJ8YKS/IsydHsE+frklIAWT0jyv0c3Dh9qBXSA==", + "resolved": "4.8.0-beta00017", + "contentHash": "LVxGwgRAVq9XdwvNfgCB8OH+ou40I0E1NYN53muPjQK5oUY+HpkgkFUhTFSHdajWWj7xFI1f+UFB23iweoVf2w==", "dependencies": { - "Lucene.Net.Join": "4.8.0-beta00016", - "Lucene.Net.Queries": "4.8.0-beta00016" + "Lucene.Net.Join": "4.8.0-beta00017", + "Lucene.Net.Queries": "4.8.0-beta00017" } }, "Lucene.Net.Grouping": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "y7QSEYfSnz7gEJS30xHsf8P0oMIreGGO08qC+UzKre29IAoUXdLLE2+vUfByGkcPuoGMIpZVBP51P6O647grBg==", + "resolved": "4.8.0-beta00017", + "contentHash": "nzMGvz0b1cedS8KKOlglJQJpyz8fT0ojgXFkgSkLLhwPNbMPwVoBsR7RlZs1FrF60Oz369O3Pm1a+MIr52KcLQ==", "dependencies": { - "Lucene.Net": "4.8.0-beta00016", - "Lucene.Net.Queries": "4.8.0-beta00016" + "Lucene.Net": "4.8.0-beta00017", + "Lucene.Net.Queries": "4.8.0-beta00017" } }, "Lucene.Net.Join": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "trUiWhV3QPgW4TNPrEP29AsTXE29ACR5+Vz22xjbPtFTwyXMozl95NELVG5aUVMTqdwyMhJ9Lj82QeoHDnN0jw==", + "resolved": "4.8.0-beta00017", + "contentHash": "WcJl4O6t3iXiXwXHnhmbVCO7C6ilPxabBCsdW/auQN0lrDpbVIcHorCxwd199fGBEQnk7wbl5pPnk8nw/VK4eQ==", "dependencies": { - "Lucene.Net.Grouping": "4.8.0-beta00016" + "Lucene.Net.Grouping": "4.8.0-beta00017" } }, "Lucene.Net.Queries": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "XBzdMDlan68V2ZlhAlP8Fd+Xx2Le8ec7cEN1kFF45Sipa3Q8L/tilJfwS9VHvMTvGkwPM/yj62eGbfGBgIMR8Q==", + "resolved": "4.8.0-beta00017", + "contentHash": "RVpZCfa/7pgvytFw64zLqinvZPQt4TojvcFghdAA5vhnpSs5GTbtciPIxFH3wwH3f2dYJywiqYKo1h3JBCXRBA==", "dependencies": { - "Lucene.Net": "4.8.0-beta00016" + "Lucene.Net": "4.8.0-beta00017" } }, "Lucene.Net.QueryParser": { @@ -649,13 +649,13 @@ }, "Lucene.Net.Replicator": { "type": "Transitive", - "resolved": "4.8.0-beta00016", - "contentHash": "BP007m7TtHfOFNGoipn1Y3kgHir0yvDfyCW9g7P6PQIo7nNkyyHuEK9slVEkPhLq+21Q2EnnHl7jMGeh0aK2eA==", + "resolved": "4.8.0-beta00017", + "contentHash": "YGZcKkQhuLweZ+M4UgA/Uok3Vl3HOTlvZpUmTZMS4J9cBdvTevG0e6rn/pZrfONUpp0TtbXe494oGA1rScouOA==", "dependencies": { - "J2N": "2.0.0", - "Lucene.Net": "4.8.0-beta00016", - "Lucene.Net.Facet": "4.8.0-beta00016", - "Newtonsoft.Json": "10.0.1" + "J2N": "[2.1.0, 3.0.0)", + "Lucene.Net": "4.8.0-beta00017", + "Lucene.Net.Facet": "4.8.0-beta00017", + "Newtonsoft.Json": "13.0.1" } }, "Lucene.Net.Sandbox": { @@ -687,17 +687,17 @@ }, "MessagePack": { "type": "Transitive", - "resolved": "2.5.172", - "contentHash": "tO/SIeix4UjmHo0J7Z1IRMvHEfqLlN9FAQCzwGcoG50mt7gPyYsAuMU9Ngu9iDSv0ak/YZOyobs0BidFde+gDw==", + "resolved": "2.5.187", + "contentHash": "uW4j8m4Nc+2Mk5n6arOChavJ9bLjkis0qWASOj2h2OwmfINuzYv+mjCHUymrYhmyyKTu3N+ObtTXAY4uQ7jIhg==", "dependencies": { - "MessagePack.Annotations": "2.5.172", + "MessagePack.Annotations": "2.5.187", "Microsoft.NET.StringTools": "17.6.3" } }, "MessagePack.Annotations": { "type": "Transitive", - "resolved": "2.5.172", - "contentHash": "LJWMr5BDpvLaIfsUXufFWQW3VRFg7EKnGAHjArbwCaSeTIWEXaRoClkQtPaXvtVPZk5ZIpc9SBQd/WJD/m99Ww==" + "resolved": "2.5.187", + "contentHash": "/IvvMMS8opvlHjEJ/fR2Cal4Co726Kj77Z8KiohFhuHfLHHmb9uUxW5+tSCL4ToKFfkQlrS3HD638mRq83ySqA==" }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", @@ -1382,19 +1382,19 @@ }, "Serilog": { "type": "Transitive", - "resolved": "4.0.2", - "contentHash": "Vehq4uNYtURe/OnHEpWGvMgrvr5Vou7oZLdn3BuEH5FSCeHXDpNJtpzWoqywXsSvCTuiv0I65mZDRnJSeUvisA==" + "resolved": "4.1.0", + "contentHash": "u1aZI8HZ62LWlq5dZLFwm6jMax/sUwnWZSw5lkPsCt518cJBxFKoNmc7oSxe5aA5BgSkzy9rzwFGR/i/acnSPw==" }, "Serilog.AspNetCore": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "LNUd1bHsik2E7jSoCQFdeMGAWXjH7eUQ6c2pqm5vl+jGqvxdabYXxlrfaqApjtX5+BfAjW9jTA2EKmPwxknpIA==", + "resolved": "8.0.3", + "contentHash": "Y5at41mc0OV982DEJslBKHd6uzcWO6POwR3QceJ6gtpMPxCzm4+FElGPF0RdaTD7MGsP6XXE05LMbSi0NO+sXg==", "dependencies": { "Microsoft.Extensions.Logging": "8.0.0", "Serilog": "3.1.1", "Serilog.Extensions.Hosting": "8.0.0", "Serilog.Formatting.Compact": "2.0.0", - "Serilog.Settings.Configuration": "8.0.2", + "Serilog.Settings.Configuration": "8.0.4", "Serilog.Sinks.Console": "5.0.0", "Serilog.Sinks.Debug": "2.0.0", "Serilog.Sinks.File": "5.0.0" @@ -1474,10 +1474,10 @@ }, "Serilog.Sinks.Async": { "type": "Transitive", - "resolved": "2.0.0", - "contentHash": "a+kTyUUxPAOZWKJiNbDqCPMiP0BWBWzObyTpRmGLrgCecgc/YJ+HqYGjsQoS6Sj9cRVXB9hH5O1mTZ0DiewG2w==", + "resolved": "2.1.0", + "contentHash": "SnmRknWsSMgyo9wDXeZZCqSp48kkQYy44taSM6vcpxfiRICzSf09oLKEmVr0RCwQnfd8mJQ2WNN6nvhqf0RowQ==", "dependencies": { - "Serilog": "4.0.0" + "Serilog": "4.1.0" } }, "Serilog.Sinks.Console": { @@ -2389,8 +2389,8 @@ }, "Umbraco.Cms.Core": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "+REtqEDIDmNzPGcYmi8g3RSVBtXrDlJCdVY6ozy7fSadW8xwLUAZn40BhI9/owb3OBl0xRcg2CC0HRZKmhQtDQ==", + "resolved": "15.0.0-rc3", + "contentHash": "58o5tPxDjCnxBlv5NhOr/BOwEceSntLlvRPk+gxExocOh4D68lgA0zlON7Xl/P2fvSRMjTkfIpFqyGDua8+QMA==", "dependencies": { "Microsoft.Extensions.Caching.Abstractions": "9.0.0-rc.2.24473.5", "Microsoft.Extensions.Caching.Memory": "9.0.0-rc.2.24473.5", @@ -2407,21 +2407,22 @@ }, "Umbraco.Cms.Examine.Lucene": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "IQBqpCVCeEs7yPdzD/WBlL7UKOfmcLW7wiY0daNU59dQxMfw9r+zBUZ7vC6qdSryhVsa1fJJ7c1fbpxyIl70ng==", + "resolved": "15.0.0-rc3", + "contentHash": "pzP8j9As1rKqhJf0iStcyTESnVqnzG3y/QIAZt9RsPqcekSUrBrAO+OnaNk393BWfaze3goasyrqDzthMtpMVg==", "dependencies": { - "Examine": "3.3.0", + "Examine": "3.4.0", + "Lucene.Net.Replicator": "4.8.0-beta00017", "System.Security.Cryptography.Xml": "9.0.0-rc.2.24473.5", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } }, "Umbraco.Cms.Infrastructure": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "X1uSFSS4EcdCCKQZA440uV+hhDDMipz5S5Gwt0i85DInG6niOV8d7HDsfsaQmf5SJCBRyQUaKVgocoS6+LNcjg==", + "resolved": "15.0.0-rc3", + "contentHash": "F1UWBDkGEGszOKfTq7/H1jkUsIT/9KR9S6wW48a70ZQNaOuV/nU/A7BO4AR60IOJZj1uwsJZcHxP5ZoiE5BE6w==", "dependencies": { - "Examine.Core": "3.3.0", - "HtmlAgilityPack": "1.11.67", + "Examine.Core": "3.4.0", + "HtmlAgilityPack": "1.11.70", "MailKit": "4.8.0", "Markdown": "2.2.1", "Microsoft.CodeAnalysis.CSharp": "4.10.0", @@ -2433,7 +2434,7 @@ "MiniProfiler.Shared": "4.3.8", "NPoco": "5.7.1", "OpenIddict.Abstractions": "6.0.0-preview1.24504.78", - "Serilog": "4.0.2", + "Serilog": "4.1.0", "Serilog.Enrichers.Process": "3.0.0", "Serilog.Enrichers.Thread": "4.0.0", "Serilog.Expressions": "5.0.0", @@ -2441,24 +2442,24 @@ "Serilog.Formatting.Compact": "3.0.0", "Serilog.Formatting.Compact.Reader": "4.0.0", "Serilog.Settings.Configuration": "8.0.4", - "Serilog.Sinks.Async": "2.0.0", + "Serilog.Sinks.Async": "2.1.0", "Serilog.Sinks.File": "6.0.0", "Serilog.Sinks.Map": "2.0.0", "System.Text.RegularExpressions": "4.3.1", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", "ncrontab": "3.3.3" } }, "Umbraco.Cms.PublishedCache.HybridCache": { "type": "Transitive", - "resolved": "15.0.0-rc2", - "contentHash": "0D0PVX950Ap/i4CGqC8n5/Usx/vY51i+eWZdHHST5MqfdOR8pH0XJhwN1ULwANz68TZyzBY3WQ5SR6nJ7U9/5w==", + "resolved": "15.0.0-rc3", + "contentHash": "DZPBlbXxLp8hYLY/o9UgXF2FcHx1nctiGKSvFFFZPIu1Jc8YvNvXGKIQzuc6HuU5gBv1W2Rt1dtpUPvxF4Hhhg==", "dependencies": { "K4os.Compression.LZ4": "1.3.8", - "MessagePack": "2.5.172", + "MessagePack": "2.5.187", "Microsoft.Extensions.Caching.Hybrid": "9.0.0-preview.9.24507.7", - "Umbraco.Cms.Core": "[15.0.0-rc2, 16.0.0)", - "Umbraco.Cms.Infrastructure": "[15.0.0-rc2, 16.0.0)" + "Umbraco.Cms.Core": "[15.0.0-rc3, 16.0.0)", + "Umbraco.Cms.Infrastructure": "[15.0.0-rc3, 16.0.0)" } } }