Minor fix changes

sphexator · Dec 21, 2024 · d6c9915 · d6c9915
1 parent 6dcc110
commit d6c9915
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Hanekawa.Application/Hanekawa.Application.csproj b/Hanekawa.Application/Hanekawa.Application.csproj
@@ -14,15 +14,12 @@
       <PackageReference Include="OneOf" Version="3.0.271" />
       <PackageReference Include="OneOf.SourceGenerator" Version="3.0.271" />
       <PackageReference Include="Prometheus.Client.AspNetCore" Version="5.0.0" />
-<<<<<<< HEAD
       <PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.3.0" />
       <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
       <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
-=======
       <PackageReference Include="Prometheus.Client.DependencyInjection" Version="1.4.0" />
       <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
       <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
->>>>>>> 30494a65 (A lot of things)
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Hanekawa.Infrastructure/Hanekawa.Infrastructure.csproj b/Hanekawa.Infrastructure/Hanekawa.Infrastructure.csproj
@@ -16,16 +16,13 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-<<<<<<< HEAD
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.2" />
         <PackageReference Include="Npgsql" Version="8.0.3" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
-=======
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
         <PackageReference Include="Npgsql" Version="9.0.2" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
->>>>>>> 30494a65 (A lot of things)
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
     </ItemGroup>
 

diff --git a/Hanekawa.slnx b/Hanekawa.slnx
@@ -0,0 +1,11 @@
+<Solution>
+  <Folder Name="/src/">
+    <Project Path="Hanekawa.Application\Hanekawa.Application.csproj" Type="Classic C#" />
+    <Project Path="Hanekawa.Bot\Hanekawa.Bot.csproj" Type="Classic C#" />
+    <Project Path="Hanekawa.Infrastructure\Hanekawa.Infrastructure.csproj" />
+    <Project Path="Hanekawa\Hanekawa.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="Hanekawa.Test\Hanekawa.Test.csproj" Type="Classic C#" />
+  </Folder>
+</Solution>