Skip to content

Commit

Permalink
Update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ImoutoChan committed Oct 3, 2023
1 parent 109d7ed commit 81f9b58
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions README.RU.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ cd <путь к папке latest>
"DanbooruLogin": "",
"DanbooruApiKey": "",
"SankakuLogin": "",
"SankakuPassHash": "",
"SankakuPassword": "",
"YandereLogin": "",
"YandereApiKey": "",
"RoomPort": "11301",
Expand Down Expand Up @@ -144,7 +144,7 @@ cd <путь к папке latest>
| DanbooruLogin | | Крайне желательно заполнить, используется для поиска тегов и скачивания любимых картинок |
| DanbooruApiKey | | Крайне желательно заполнить, находится на странице вашего профиля на danbooru, строчка API Key |
| SankakuLogin | | Опционально, логин с санкаку |
| SankakuPassHash | | Опционально, sankaku pass_hash, его можжно найти в куки, после того, как вы залогинетесь на их старом сайте |
| SankakuPassword | | Опционально, sankaku password |
| YandereLogin | | Крайне желательно заполнить, используется для поиска тегов и скачивания любимых картинок |
| YandereApiKey | | Крайне желательно заполнить, находится на странице Profile / Settings |
| RoomPort | * | Room сервис будет доступен по этому порту |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Template and default values
"DanbooruLogin": "",
"DanbooruApiKey": "",
"SankakuLogin": "",
"SankakuPassHash": "",
"SankakuPassword": "",
"YandereLogin": "",
"YandereApiKey": "",
"RoomPort": "11301",
Expand Down Expand Up @@ -144,7 +144,7 @@ Template and default values
| DanbooruLogin | | Optional but recommended, only if you want ImoutoRebirth to search tags for your files in danbooru |
| DanbooruApiKey | | Optional but recommended, you can find it at the end of your danbooru profile page, API Key row |
| SankakuLogin | | Optional, your sankaku login |
| SankakuPassHash | | Optional, your sankaku pass_hash, you can find this value in cookies after login on their old site |
| SankakuPassword | | Optional, your sankaku password |
| YandereLogin | | Optional but recommended, only if you want ImoutoRebirth to search tags for your files in yandere |
| YandereApiKey | | Optional but recommended, you can find it in Profile / Settings |
| RoomPort | * | Room service will be exposed through this port |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"SankakuSettings": {
"Login": "##SankakuSettings##Login##",
"PassHash": "##SankakuSettings##PassHash##",
"Password": "##SankakuSettings##Password##",
"Delay": "##SankakuSettings##Delay##"
},
"RabbitSettings": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

<ItemGroup>
<PackageReference Include="AspNetCoreInjection.TypedFactories" Version="1.2.0" />
<PackageReference Include="Imouto.BooruParser" Version="3.1.0" />
<PackageReference Include="Imouto.BooruParser" Version="3.2.4" />
<PackageReference Include="Mackiovello.Maybe" Version="1.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.11" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public SankakuLoaderFabric(
{
PauseBetweenRequestsInMs = _settings.Delay,
Login = _settings.Login,
PassHash = _settings.PassHash
Password = _settings.Password
}),
_sankakuAuthManager);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

public class SankakuSettings
{
public string Login { get; set; } = default!;
public required string Login { get; set; }

public string PassHash { get; set; } = default!;
public required string Password { get; set; }

public int Delay { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.11" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="NodaTime" Version="3.1.9" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MassTransit" Version="8.1.0" />
<PackageReference Include="MassTransit" Version="8.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.1.0" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.1.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />

<PackageReference Include="OpenTelemetry" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
<PackageReference Include="OpenTelemetry" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.5.0-alpha.1" />

<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.0" />
<PackageReference Include="Npgsql.OpenTelemetry" Version="7.0.4" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
<PackageReference Include="Npgsql.OpenTelemetry" Version="7.0.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Source/ImoutoRebirth.Hasami/ImoutoRebirth.Hasami.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Imouto.BooruParser" Version="3.1.0"/>
<PackageReference Include="Imouto.BooruParser" Version="3.2.4" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/ImoutoRebirth.Hasami/Scripts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private static async Task<bool> IsFoundInAnyBooru(string md5)
services.Configure<SankakuSettings>(x =>
{
x.Login = configuration.GetValue<string>("SankakuSettings:Login");
x.PassHash = configuration.GetValue<string>("SankakuSettings:PassHash");
x.Password = configuration.GetValue<string>("SankakuSettings:Password");
x.PauseBetweenRequestsInMs = 5000;
});
var provider = services.BuildServiceProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MassTransit.Abstractions" Version="8.1.0"/>
<PackageReference Include="MassTransit.Abstractions" Version="8.1.1" />
<PackageReference Include="MediatR" Version="12.1.1"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.11" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="2.0.0-beta-1629" />
<PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0-beta-1629" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ConfigurationBuilder : IConfigurationBuilder
private readonly string _roomImoutoPicsUploadUrl;
private readonly string _roomPort;
private readonly string _sankakuLogin;
private readonly string _sankakuPassHash;
private readonly string _sankakuPassword;
private readonly string _yandereApiKey;
private readonly string _yandereLogin;
private readonly string _jaegerHost;
Expand All @@ -60,7 +60,7 @@ public ConfigurationBuilder(FileInfo globalConfigurationFile)
_danbooruLogin = _configuration["DanbooruLogin"];
_danbooruApiKey = _configuration["DanbooruApiKey"];
_sankakuLogin = _configuration["SankakuLogin"];
_sankakuPassHash = _configuration["SankakuPassHash"];
_sankakuPassword = _configuration["SankakuPassword"];
_yandereLogin = _configuration["YandereLogin"];
_yandereApiKey = _configuration["YandereApiKey"];

Expand Down Expand Up @@ -132,7 +132,7 @@ private void ValidateConfigurationValues()
"DanbooruLogin",
"DanbooruApiKey",
"SankakuLogin",
"SankakuPassHash",
"SankakuPassword",
"YandereLogin",
"YandereApiKey",
"OpenSearchUri",
Expand Down Expand Up @@ -172,7 +172,7 @@ private string GetArachneConfiguration(string currentVersion)
},
"SankakuSettings": {
"Login": "{{_sankakuLogin}}",
"PassHash": "{{_sankakuPassHash}}",
"Password": "{{_sankakuPassword}}",
"Delay": "6000"
},
"RabbitSettings": {
Expand Down
2 changes: 1 addition & 1 deletion Tools/NukeBuild/NukeBuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="7.0.3" />
<PackageReference Include="Nuke.Common" Version="7.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Tools/NukeBuild/configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"DanbooruLogin": "",
"DanbooruApiKey": "",
"SankakuLogin": "",
"SankakuPassHash": "",
"SankakuPassword": "",
"YandereLogin": "",
"YandereApiKey": "",
"RoomPort": "11301",
Expand Down

0 comments on commit 81f9b58

Please sign in to comment.