diff --git a/src/BukiVedi.App/Controllers/TagsController.cs b/src/BukiVedi.App/Controllers/TagsController.cs index dcefa85..0bb6d59 100644 --- a/src/BukiVedi.App/Controllers/TagsController.cs +++ b/src/BukiVedi.App/Controllers/TagsController.cs @@ -1,4 +1,6 @@ using BukiVedi.App.Requests; +using BukiVedi.App.Responces; +using BukiVedi.App.Services.Mappers; using BukiVedi.Shared.Entities; using BukiVedi.Shared.Services; using Microsoft.AspNetCore.Authorization; @@ -13,6 +15,13 @@ namespace BukiVedi.App.Controllers public class TagsController : BaseController { + private readonly ILibrary _library; + public TagsController(ILibrary library) + : base() + { + _library = library; + } + /// /// Добавление тега для книги /// @@ -55,5 +64,20 @@ namespace BukiVedi.App.Controllers { return Ok((await Tables.UserTag.Get(Builders.Filter.Eq(t => t.UserId, OperationContext.OperationInitiator.Id)))?.Select(t => t.Name)); } + + /// + /// Поиск книг по тегу + /// + /// Список найденных книг + [HttpPost("{id}/books")] + public async Task>> Search([FromRoute] string id) + { + if (string.IsNullOrWhiteSpace(id) == false) + { + var books = await _library.SearchByTagBooks(OperationContext.OperationInitiator.Id, id); + return Ok(await BookEntityMapper.Map(books)); + } + return Ok(Enumerable.Empty()); + } } } diff --git a/src/BukiVedi.App/Properties/PublishProfiles/FolderProfile.pubxml.user b/src/BukiVedi.App/Properties/PublishProfiles/FolderProfile.pubxml.user index 9297392..8c84085 100644 --- a/src/BukiVedi.App/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/src/BukiVedi.App/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>G:\Documents\GitHub\BukiVedi\src\BukiVedi.App\bin\Release\net8.0\publish\ - True|2024-04-07T02:01:48.6765910Z;True|2024-04-07T05:01:36.8953339+03:00;True|2024-04-07T04:57:19.2521218+03:00;True|2024-04-06T21:11:57.8349210+03:00;True|2024-04-06T17:36:58.3428821+03:00;True|2024-04-05T04:52:06.7814045+03:00;True|2024-04-05T04:46:11.3960475+03:00;True|2024-04-04T16:59:14.8807703+03:00;True|2024-04-04T14:55:51.0062074+03:00;True|2024-04-04T14:01:53.0402462+03:00;True|2024-04-04T05:50:10.9326327+03:00;True|2024-04-04T05:23:22.3837261+03:00;True|2024-04-04T05:18:08.8436345+03:00;True|2024-04-04T05:13:03.4261357+03:00;True|2024-04-04T04:23:59.4217155+03:00;True|2024-04-04T04:12:10.2381826+03:00;True|2024-04-04T04:04:27.2386390+03:00; + True|2024-04-07T18:16:45.6816851Z;True|2024-04-07T05:01:48.6765910+03:00;True|2024-04-07T05:01:36.8953339+03:00;True|2024-04-07T04:57:19.2521218+03:00;True|2024-04-06T21:11:57.8349210+03:00;True|2024-04-06T17:36:58.3428821+03:00;True|2024-04-05T04:52:06.7814045+03:00;True|2024-04-05T04:46:11.3960475+03:00;True|2024-04-04T16:59:14.8807703+03:00;True|2024-04-04T14:55:51.0062074+03:00;True|2024-04-04T14:01:53.0402462+03:00;True|2024-04-04T05:50:10.9326327+03:00;True|2024-04-04T05:23:22.3837261+03:00;True|2024-04-04T05:18:08.8436345+03:00;True|2024-04-04T05:13:03.4261357+03:00;True|2024-04-04T04:23:59.4217155+03:00;True|2024-04-04T04:12:10.2381826+03:00;True|2024-04-04T04:04:27.2386390+03:00; \ No newline at end of file diff --git a/src/BukiVedi.App/obj/Debug/net8.0/ApiEndpoints.json b/src/BukiVedi.App/obj/Debug/net8.0/ApiEndpoints.json index 7a9593f..b680091 100644 --- a/src/BukiVedi.App/obj/Debug/net8.0/ApiEndpoints.json +++ b/src/BukiVedi.App/obj/Debug/net8.0/ApiEndpoints.json @@ -268,6 +268,32 @@ } ] }, + { + "ContainingType": "BukiVedi.App.Controllers.TagsController", + "Method": "Search", + "RelativePath": "api/tags/{id}/books", + "HttpMethod": "POST", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "id", + "Type": "System.String", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "System.Collections.Generic.IEnumerable\u00601[[BukiVedi.App.Responces.BookResponse, BukiVedi.App, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "BukiVedi.App.Controllers.TagsController", "Method": "RemoveTag", diff --git a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfo.cs b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfo.cs index a5c3346..b332ec6 100644 --- a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfo.cs +++ b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1a3354bfe43b1cd0f3b6881ad9e749c9d0575d87")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyTitleAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfoInputs.cache b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfoInputs.cache index 922f4a1..4209fa4 100644 --- a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfoInputs.cache +++ b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.AssemblyInfoInputs.cache @@ -1 +1 @@ -b9e5179c1e29c1c145152c4bd263b32b05a8e7759f4db3ae908c9f5d8deb49ec +74be8e3b90db4352e0da2b05558c44a0d53a227c1c88064a1937af901b24a33e diff --git a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.csproj.AssemblyReference.cache b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.csproj.AssemblyReference.cache index 8224d39..9057d26 100644 Binary files a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.csproj.AssemblyReference.cache and b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.csproj.AssemblyReference.cache differ diff --git a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.pdb b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.pdb index ff40e6a..8ba3d19 100644 Binary files a/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.pdb and b/src/BukiVedi.App/obj/Debug/net8.0/BukiVedi.App.pdb differ diff --git a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfo.cs b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfo.cs index ab6d0c7..e751366 100644 --- a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfo.cs +++ b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3d0f6854da43e4751a466c4aad31306f23988f4")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyTitleAttribute("BukiVedi.App")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfoInputs.cache b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfoInputs.cache index 9bbc19c..79d4af3 100644 --- a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfoInputs.cache +++ b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.AssemblyInfoInputs.cache @@ -1 +1 @@ -7df96b43abebe45316492c0eab3b2a931f2ab369acddd345785691bd9a0f5bb0 +60ec22df51c01016c518630d7396d5f1144ef73d2131bd99ea7b00a742013af1 diff --git a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.AssemblyReference.cache b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.AssemblyReference.cache index e30fa05..ea0b3ed 100644 Binary files a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.AssemblyReference.cache and b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.AssemblyReference.cache differ diff --git a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.CoreCompileInputs.cache b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.CoreCompileInputs.cache index ebbdbca..75bfec4 100644 --- a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.CoreCompileInputs.cache +++ b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -77b8edc61e845321985d3d19a39d8162ddb364e5c54da6d70318f8cf097ee2bd +ca3e864ce8b882c92d09afb418a8cb52cfd631b63cec9a07ab1e000a7624c817 diff --git a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.pdb b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.pdb index af9c8cd..49b8d67 100644 Binary files a/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.pdb and b/src/BukiVedi.App/obj/Release/net8.0/BukiVedi.App.pdb differ diff --git a/src/BukiVedi.App/web/css/buki-common.css b/src/BukiVedi.App/web/css/buki-common.css index 1191e72..8bf5932 100644 --- a/src/BukiVedi.App/web/css/buki-common.css +++ b/src/BukiVedi.App/web/css/buki-common.css @@ -1,6 +1,6 @@ @font-face { font-family: bukifont; - src: url(fonts/Roboto-Medium.ttf); + src: url(fonts/Roboto-300.woff); } html { diff --git a/src/BukiVedi.App/web/index.html b/src/BukiVedi.App/web/index.html index a09fde9..7e49078 100644 --- a/src/BukiVedi.App/web/index.html +++ b/src/BukiVedi.App/web/index.html @@ -113,6 +113,12 @@ width: 100%; } + .card .tags { + padding-bottom: 5px; + color: #0600aaff; + width: 100%; + } + .card .unassigned { color: #f29840; } @@ -242,12 +248,22 @@ let id = data.id; //автор var authorLinks = []; - if (data.authors.length > 0) { + if (data.authors!=null && data.authors.length > 0) { for (idx in data.authors) { author = data.authors[idx].name; author_id = data.authors[idx].id; authorLinks.push("" + author + ""); - authorLinks.push(";"); + } + } + + + //теги + var tagsLinks = []; + if (data.tags!=null && data.tags.length > 0) { + for (idx in data.tags) { + tag = data.tags[idx].name; + tag_id = data.tags[idx].id; + tagsLinks.push("" + tag + ""); } } @@ -282,9 +298,9 @@ + "
  • Заметка
    • " + "
  • Поделиться
    • " + "" - + "" + + "" + "

    " - + authorLinks.join("") + + authorLinks.join("; ") + " · " + genre + "" @@ -295,6 +311,9 @@ + "

    " + data.description + "

    " + + "

    " + + tagsLinks.join("; ") + + "

    " + "") ); diff --git a/src/BukiVedi.App/web/js/bukivedi.js b/src/BukiVedi.App/web/js/bukivedi.js index 7e88d30..67e23b7 100644 --- a/src/BukiVedi.App/web/js/bukivedi.js +++ b/src/BukiVedi.App/web/js/bukivedi.js @@ -14,6 +14,20 @@ }); } + static SearchByTag(id, success) { + $.ajax({ + contentType: "application/json; charset=utf-8", + type: "POST", + url: "../api/tags/" + id + "/books", + success: function (data, textStatus, jqXHR) { + success(data); + }, + error: function (jqXHR, textStatus, errorThrown) { + console.log(jqXHR.statusText); + } + }); + } + static Search(query, success) { const info = { "query": query }; $.ajax({ diff --git a/src/BukiVedi.Shared/Services/Library.cs b/src/BukiVedi.Shared/Services/Library.cs index 5f2a3b8..c0a875b 100644 --- a/src/BukiVedi.Shared/Services/Library.cs +++ b/src/BukiVedi.Shared/Services/Library.cs @@ -13,6 +13,7 @@ namespace BukiVedi.Shared.Services { Task> SearchBooksByAuthor(string author_id); Task> SearchBooks(string title); + Task> SearchByTagBooks(string accountId, string tagId); Task> SearchTaggedBooks(string accountId, string tag = null!); Task> SearchFavoritesBooks(string accountId); Task> SearchBlockedBooks(string accountId); @@ -82,6 +83,17 @@ namespace BukiVedi.Shared.Services return Enumerable.Empty(); } + public async Task> SearchByTagBooks(string accountId, string tagId) + { + IEnumerable bookIds = (await Tables.UserTag.Get(Builders.Filter.And(Builders.Filter.Eq(t => t.UserId, accountId), Builders.Filter.Eq(t => t.Id, tagId))))?.Select(t => t.BookId)!; + if (bookIds != null && bookIds.Any()) + { + var filter = Builders.Filter.In(b => b.Id, bookIds); + return await PrepareBooksByFilter(filter); + } + return Enumerable.Empty(); + } + public async Task> SearchFavoritesBooks(string accountId) { IEnumerable bookIds = (await Tables.FavoriteBooks.Get(Builders.Filter.Eq(f => f.UserId, accountId)))?.Select(t => t.BookId)!; diff --git a/src/BukiVedi.Shared/bin/Debug/net8.0/BukiVedi.Shared.pdb b/src/BukiVedi.Shared/bin/Debug/net8.0/BukiVedi.Shared.pdb index 4c3efc6..727b03b 100644 Binary files a/src/BukiVedi.Shared/bin/Debug/net8.0/BukiVedi.Shared.pdb and b/src/BukiVedi.Shared/bin/Debug/net8.0/BukiVedi.Shared.pdb differ diff --git a/src/BukiVedi.Shared/bin/Release/net8.0/BukiVedi.Shared.pdb b/src/BukiVedi.Shared/bin/Release/net8.0/BukiVedi.Shared.pdb index 219cb20..ae4f141 100644 Binary files a/src/BukiVedi.Shared/bin/Release/net8.0/BukiVedi.Shared.pdb and b/src/BukiVedi.Shared/bin/Release/net8.0/BukiVedi.Shared.pdb differ diff --git a/src/BukiVedi.Shared/obj/BukiVedi.Shared.csproj.nuget.dgspec.json b/src/BukiVedi.Shared/obj/BukiVedi.Shared.csproj.nuget.dgspec.json index cd2a309..b193af5 100644 --- a/src/BukiVedi.Shared/obj/BukiVedi.Shared.csproj.nuget.dgspec.json +++ b/src/BukiVedi.Shared/obj/BukiVedi.Shared.csproj.nuget.dgspec.json @@ -67,6 +67,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.200/PortableRuntimeIdentifierGraph.json" } + }, + "runtimes": { + "linux-x64": { + "#import": [] + } } }, "G:\\Documents\\GitHub\\BukiVedi\\src\\BukiVedi.Shared\\BukiVedi.Shared.csproj": { @@ -158,6 +163,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.200/PortableRuntimeIdentifierGraph.json" } + }, + "runtimes": { + "linux-x64": { + "#import": [] + } } }, "G:\\Documents\\GitHub\\BukiVedi\\src\\Vendors\\LemmaGen_v3.0_PrebuiltFull\\LemmaSharpPrebuilt\\LemmaSharpPrebuilt.csproj": { @@ -283,6 +293,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.200/PortableRuntimeIdentifierGraph.json" } + }, + "runtimes": { + "linux-x64": { + "#import": [] + } } } } diff --git a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfo.cs b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfo.cs index 66dfdc1..4db5500 100644 --- a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfo.cs +++ b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1a3354bfe43b1cd0f3b6881ad9e749c9d0575d87")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyTitleAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache index fc75546..5f3bfa5 100644 --- a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache +++ b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache @@ -1 +1 @@ -4349296b5681078306e6f8a7c49c392998f27e3710ca922dd7193cecfc1ea515 +7b458bdec13caee201bbfe5d84cf222ee886da31a5995388a7cd0aea9a7134c7 diff --git a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache index 59ed52e..624cc8f 100644 Binary files a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache and b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache differ diff --git a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.pdb b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.pdb index 4c3efc6..727b03b 100644 Binary files a/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.pdb and b/src/BukiVedi.Shared/obj/Debug/net8.0/BukiVedi.Shared.pdb differ diff --git a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfo.cs b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfo.cs index aed0425..24eb973 100644 --- a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfo.cs +++ b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3d0f6854da43e4751a466c4aad31306f23988f4")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyTitleAttribute("BukiVedi.Shared")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache index 24770c5..2e1d399 100644 --- a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache +++ b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.AssemblyInfoInputs.cache @@ -1 +1 @@ -fe3e0e62e5f77e029faed2f91070935d4c3a0d0cb1db79d7ecaff8cedab2dd72 +9b8db8a219e13c473b86af13c8ac5f729f92171b8e424f2e734100e4d7a73166 diff --git a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache index 46921a8..cf88152 100644 Binary files a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache and b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.csproj.AssemblyReference.cache differ diff --git a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.pdb b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.pdb index 219cb20..ae4f141 100644 Binary files a/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.pdb and b/src/BukiVedi.Shared/obj/Release/net8.0/BukiVedi.Shared.pdb differ diff --git a/src/BukiVedi.Shared/obj/project.assets.json b/src/BukiVedi.Shared/obj/project.assets.json index 310c8bf..ecef87b 100644 --- a/src/BukiVedi.Shared/obj/project.assets.json +++ b/src/BukiVedi.Shared/obj/project.assets.json @@ -359,6 +359,332 @@ "bin/placeholder/ZeroLevel.dll": {} } } + }, + "net8.0/linux-x64": { + "AWSSDK.Core/3.7.100.14": { + "type": "package", + "compile": { + "lib/netcoreapp3.1/AWSSDK.Core.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/netcoreapp3.1/AWSSDK.Core.dll": { + "related": ".pdb;.xml" + } + } + }, + "AWSSDK.SecurityToken/3.7.100.14": { + "type": "package", + "dependencies": { + "AWSSDK.Core": "[3.7.100.14, 4.0.0)" + }, + "compile": { + "lib/netcoreapp3.1/AWSSDK.SecurityToken.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/netcoreapp3.1/AWSSDK.SecurityToken.dll": { + "related": ".pdb;.xml" + } + } + }, + "DnsClient/1.6.1": { + "type": "package", + "dependencies": { + "Microsoft.Win32.Registry": "5.0.0" + }, + "compile": { + "lib/net5.0/DnsClient.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net5.0/DnsClient.dll": { + "related": ".xml" + } + } + }, + "FB2Library/1.3.3": { + "type": "package", + "compile": { + "lib/net6.0/FB2Library.dll": {} + }, + "runtime": { + "lib/net6.0/FB2Library.dll": {} + } + }, + "Microsoft.Extensions.Logging.Abstractions/2.0.0": { + "type": "package", + "compile": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { + "related": ".xml" + } + } + }, + "Microsoft.NETCore.Platforms/5.0.0": { + "type": "package", + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + } + }, + "Microsoft.Win32.Registry/5.0.0": { + "type": "package", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + }, + "compile": { + "ref/netstandard2.0/Microsoft.Win32.Registry.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/Microsoft.Win32.Registry.dll": { + "related": ".xml" + } + } + }, + "MongoDB.Bson/2.24.0": { + "type": "package", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "5.0.0" + }, + "compile": { + "lib/netstandard2.1/MongoDB.Bson.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.1/MongoDB.Bson.dll": { + "related": ".xml" + } + } + }, + "MongoDB.Driver/2.24.0": { + "type": "package", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "2.24.0", + "MongoDB.Driver.Core": "2.24.0", + "MongoDB.Libmongocrypt": "1.8.2" + }, + "compile": { + "lib/netstandard2.1/MongoDB.Driver.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.1/MongoDB.Driver.dll": { + "related": ".xml" + } + } + }, + "MongoDB.Driver.Core/2.24.0": { + "type": "package", + "dependencies": { + "AWSSDK.SecurityToken": "3.7.100.14", + "DnsClient": "1.6.1", + "Microsoft.Extensions.Logging.Abstractions": "2.0.0", + "MongoDB.Bson": "2.24.0", + "MongoDB.Libmongocrypt": "1.8.2", + "SharpCompress": "0.30.1", + "Snappier": "1.0.0", + "System.Buffers": "4.5.1", + "ZstdSharp.Port": "0.7.3" + }, + "compile": { + "lib/netstandard2.1/MongoDB.Driver.Core.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.1/MongoDB.Driver.Core.dll": { + "related": ".xml" + } + } + }, + "MongoDB.Libmongocrypt/1.8.2": { + "type": "package", + "compile": { + "lib/netstandard2.1/MongoDB.Libmongocrypt.dll": {} + }, + "runtime": { + "lib/netstandard2.1/MongoDB.Libmongocrypt.dll": {} + }, + "native": { + "runtimes/linux/native/libmongocrypt.so": {} + }, + "contentFiles": { + "contentFiles/any/any/_._": { + "buildAction": "None", + "codeLanguage": "any", + "copyToOutput": false + } + }, + "build": { + "build/_._": {} + } + }, + "SharpCompress/0.30.1": { + "type": "package", + "compile": { + "lib/net5.0/SharpCompress.dll": {} + }, + "runtime": { + "lib/net5.0/SharpCompress.dll": {} + } + }, + "Snappier/1.0.0": { + "type": "package", + "compile": { + "lib/net5.0/Snappier.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net5.0/Snappier.dll": { + "related": ".xml" + } + } + }, + "System.Buffers/4.5.1": { + "type": "package", + "compile": { + "ref/netcoreapp2.0/_._": {} + }, + "runtime": { + "lib/netcoreapp2.0/_._": {} + } + }, + "System.Memory/4.5.5": { + "type": "package", + "compile": { + "ref/netcoreapp2.1/_._": {} + }, + "runtime": { + "lib/netcoreapp2.1/_._": {} + } + }, + "System.Runtime.CompilerServices.Unsafe/5.0.0": { + "type": "package", + "compile": { + "ref/netstandard2.1/System.Runtime.CompilerServices.Unsafe.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.dll": { + "related": ".xml" + } + } + }, + "System.Security.AccessControl/5.0.0": { + "type": "package", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + }, + "compile": { + "ref/netstandard2.0/System.Security.AccessControl.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/System.Security.AccessControl.dll": { + "related": ".xml" + } + } + }, + "System.Security.Principal.Windows/5.0.0": { + "type": "package", + "compile": { + "ref/netcoreapp3.0/System.Security.Principal.Windows.dll": { + "related": ".xml" + } + }, + "runtime": { + "runtimes/unix/lib/netcoreapp2.1/System.Security.Principal.Windows.dll": { + "related": ".xml" + } + } + }, + "ZstdSharp.Port/0.7.3": { + "type": "package", + "compile": { + "lib/net7.0/ZstdSharp.dll": {} + }, + "runtime": { + "lib/net7.0/ZstdSharp.dll": {} + } + }, + "LemmaSharp/1.0.0": { + "type": "project", + "compile": { + "bin/placeholder/LemmaSharp.dll": {} + }, + "runtime": { + "bin/placeholder/LemmaSharp.dll": {} + } + }, + "LemmaSharpPrebuilt/1.0.0": { + "type": "project", + "dependencies": { + "LemmaSharp": "1.0.0" + }, + "compile": { + "bin/placeholder/LemmaSharpPrebuilt.dll": {} + }, + "runtime": { + "bin/placeholder/LemmaSharpPrebuilt.dll": {} + } + }, + "LemmaSharpPrebuiltFull/1.0.0": { + "type": "project", + "dependencies": { + "LemmaSharp": "1.0.0", + "LemmaSharpPrebuilt": "1.0.0" + }, + "compile": { + "bin/placeholder/LemmaSharpPrebuiltFull.dll": {} + }, + "runtime": { + "bin/placeholder/LemmaSharpPrebuiltFull.dll": {} + } + }, + "Sleopok.Engine/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "ZeroLevel": "3.4.0.8" + }, + "compile": { + "bin/placeholder/Sleopok.Engine.dll": {} + }, + "runtime": { + "bin/placeholder/Sleopok.Engine.dll": {} + } + }, + "ZeroLevel/3.4.0.8": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "compile": { + "bin/placeholder/ZeroLevel.dll": {} + }, + "runtime": { + "bin/placeholder/ZeroLevel.dll": {} + } + } } }, "libraries": { @@ -987,6 +1313,11 @@ }, "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.200/PortableRuntimeIdentifierGraph.json" } + }, + "runtimes": { + "linux-x64": { + "#import": [] + } } } } \ No newline at end of file diff --git a/src/BukiVedi.Shared/obj/project.nuget.cache b/src/BukiVedi.Shared/obj/project.nuget.cache index 94d0dd8..1c3e319 100644 --- a/src/BukiVedi.Shared/obj/project.nuget.cache +++ b/src/BukiVedi.Shared/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "YVwM+KO4mWGH6B1BXss/L3tLASd1EDkcdE0fSC9tmlDJYRd8v5KkEYaBZw9w1Pjlc6cFAx0UOnW6xgMSuFnyQg==", + "dgSpecHash": "PH28x1HAQv9f0NTmNqx7WpXX82izLpORxxiImmQTk9jKk/yc9Yni4anyFP84qZadoYiyIhJezrcd+gCGU9cUwA==", "success": true, "projectFilePath": "G:\\Documents\\GitHub\\BukiVedi\\src\\BukiVedi.Shared\\BukiVedi.Shared.csproj", "expectedPackageFiles": [ diff --git a/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfo.cs b/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfo.cs index 4324290..0786105 100644 --- a/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfo.cs +++ b/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("TitleReader")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1a3354bfe43b1cd0f3b6881ad9e749c9d0575d87")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("TitleReader")] [assembly: System.Reflection.AssemblyTitleAttribute("TitleReader")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfoInputs.cache b/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfoInputs.cache index a9596a9..059946f 100644 --- a/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfoInputs.cache +++ b/src/TitleReader/obj/Debug/net8.0/TitleReader.AssemblyInfoInputs.cache @@ -1 +1 @@ -77a6c1edef6ad7a4d85724e4cbb6b2f35ed2ee54d591989ab3b1fe5cd12d4bf5 +e7a20554063a046aa0ec20b97e862ebb31e25a09186383d4655ff2b5c733c259 diff --git a/src/TitleReader/obj/Debug/net8.0/TitleReader.csproj.AssemblyReference.cache b/src/TitleReader/obj/Debug/net8.0/TitleReader.csproj.AssemblyReference.cache index c5af954..ebc97af 100644 Binary files a/src/TitleReader/obj/Debug/net8.0/TitleReader.csproj.AssemblyReference.cache and b/src/TitleReader/obj/Debug/net8.0/TitleReader.csproj.AssemblyReference.cache differ diff --git a/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfo.cs b/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfo.cs index 3676dfa..9cba9c1 100644 --- a/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfo.cs +++ b/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("TitleReader")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3d0f6854da43e4751a466c4aad31306f23988f4")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a592d9243a2c5c47b6b9feac547f685ab61a44e0")] [assembly: System.Reflection.AssemblyProductAttribute("TitleReader")] [assembly: System.Reflection.AssemblyTitleAttribute("TitleReader")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfoInputs.cache b/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfoInputs.cache index 96cefe7..feec2f5 100644 --- a/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfoInputs.cache +++ b/src/TitleReader/obj/Release/net8.0/TitleReader.AssemblyInfoInputs.cache @@ -1 +1 @@ -6c9817ef1ac85eab49751e60dcfba65ef39bf7879efc66ce464ceae2e337e808 +ec3094cc908d4209100592ecd57c4f7009b2f40a31c7603b7d993b0c07adaab8 diff --git a/src/TitleReader/obj/Release/net8.0/TitleReader.csproj.AssemblyReference.cache b/src/TitleReader/obj/Release/net8.0/TitleReader.csproj.AssemblyReference.cache index e1702d2..a28880d 100644 Binary files a/src/TitleReader/obj/Release/net8.0/TitleReader.csproj.AssemblyReference.cache and b/src/TitleReader/obj/Release/net8.0/TitleReader.csproj.AssemblyReference.cache differ