Update packages and fix sankaku

ImoutoChan · Jun 18, 2023 · 72c0011 · 72c0011
1 parent 4a9fdaa
commit 72c0011
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 30 deletions.
diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/ImoutoRebirth.Arachne.Host.csproj b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Host/ImoutoRebirth.Arachne.Host.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/....Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj b/....Arachne/ImoutoRebirth.Arachne.Infrastructure/ImoutoRebirth.Arachne.Infrastructure.csproj
@@ -9,11 +9,11 @@
 
     <ItemGroup>
         <PackageReference Include="AspNetCoreInjection.TypedFactories" Version="1.2.0" />
-        <PackageReference Include="Imouto.BooruParser" Version="3.0.2" />
+        <PackageReference Include="Imouto.BooruParser" Version="3.1.0" />
         <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.5" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.7" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>

diff --git a/...Rebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs b/...Rebirth.Arachne/ImoutoRebirth.Arachne.Infrastructure/LoaderFabrics/SankakuLoaderFabric.cs
@@ -28,9 +28,11 @@ public SankakuLoaderFabric(
 
     public IBooruApiLoader Create() => new SankakuApiLoader(
         _flurlClientFactory,
-        Options.Create(new Imouto.BooruParser.Implementations.Sankaku.SankakuSettings()
+        Options.Create(new Imouto.BooruParser.Implementations.Sankaku.SankakuSettings
         {
-            PauseBetweenRequestsInMs = _settings.Delay
+            PauseBetweenRequestsInMs = _settings.Delay,
+            Login = _settings.Login,
+            PassHash = _settings.PassHash
         }),
         _sankakuAuthManager);
 }
diff --git a/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj b/Source/ImoutoRebirth.Arachne/ImoutoRebirth.Arachne.Tests/ImoutoRebirth.Arachne.Tests.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Cqrs/ImoutoRebirth.Common.Cqrs.csproj b/Source/ImoutoRebirth.Common/ImoutoRebirth.Common.Cqrs/ImoutoRebirth.Common.Cqrs.csproj
@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="MediatR" Version="12.0.1" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/....Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj b/....Common.Domain.EntityFrameworkCore/ImoutoRebirth.Common.Domain.EntityFrameworkCore.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/.../ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj b/.../ImoutoRebirth.Common.EntityFrameworkCore/ImoutoRebirth.Common.EntityFrameworkCore.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
         <PackageReference Include="NodaTime" Version="3.1.9" />
     </ItemGroup>

diff --git a/Source/ImoutoRebirth.Harpy/ImoutoRebirth.Harpy.Host/ImoutoRebirth.Harpy.Host.csproj b/Source/ImoutoRebirth.Harpy/ImoutoRebirth.Harpy.Host/ImoutoRebirth.Harpy.Host.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Source/ImoutoRebirth.Kekkai/ImoutoRebirth.Kekkai/ImoutoRebirth.Kekkai.csproj b/Source/ImoutoRebirth.Kekkai/ImoutoRebirth.Kekkai/ImoutoRebirth.Kekkai.csproj
@@ -17,7 +17,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     </ItemGroup>
 

diff --git a/.../ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj b/.../ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.DataAccess/ImoutoRebirth.Lilin.DataAccess.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

diff --git a/...utoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj b/...utoRebirth.Lilin/ImoutoRebirth.Lilin.Domain.Tests/ImoutoRebirth.Lilin.Domain.Tests.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj b/Source/ImoutoRebirth.Lilin/ImoutoRebirth.Lilin.Host/ImoutoRebirth.Lilin.Host.csproj
@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Core/ImoutoRebirth.Meido.Core.csproj b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Core/ImoutoRebirth.Meido.Core.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
         <PackageReference Include="NodaTime" Version="3.1.9" />
     </ItemGroup>
 

diff --git a/.../ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj b/.../ImoutoRebirth.Meido/ImoutoRebirth.Meido.DataAccess/ImoutoRebirth.Meido.DataAccess.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

diff --git a/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj b/Source/ImoutoRebirth.Meido/ImoutoRebirth.Meido.Host/ImoutoRebirth.Meido.Host.csproj
@@ -12,11 +12,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Source/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator.csproj b/Source/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator.csproj
@@ -36,8 +36,8 @@
         <PackageReference Include="ImoutoRebirth.ApngWpfPlayer" Version="1.3.0" />
         <PackageReference Include="MahApps.Metro" Version="2.4.9" />
         <PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
-        <PackageReference Include="Microsoft-WindowsAPICodePack-Core" Version="1.1.4" />
-        <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
+        <PackageReference Include="Microsoft-WindowsAPICodePack-Core" Version="1.1.5" />
+        <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
         <PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />

diff --git a/...birth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj b/...birth.Room/ImoutoRebirth.Room.DataAccess.Tests/ImoutoRebirth.Room.DataAccess.Tests.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Database/ImoutoRebirth.Room.Database.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="7.0.4" />
     </ItemGroup>

diff --git a/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj b/Source/ImoutoRebirth.Room/ImoutoRebirth.Room.Webhost/ImoutoRebirth.Room.Webhost.csproj
@@ -16,12 +16,12 @@
         <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.5">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/ImoutoRebirth.Tori.csproj b/Source/ImoutoRebirth.Tori/ImoutoRebirth.Tori/ImoutoRebirth.Tori.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-        <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
+        <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.1" />
     </ItemGroup>
 
     <ItemGroup>