From 10561ffdc582efefce1f34df90882ed17f6f1af5 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Mon, 15 Apr 2024 00:19:41 +0200
Subject: [PATCH] [sln] Refactor project files

---
 Iceshrimp.Backend/Iceshrimp.Backend.csproj   | 24 ++++++--------------
 Iceshrimp.Frontend/Iceshrimp.Frontend.csproj | 20 ++++------------
 Iceshrimp.Tests/Iceshrimp.Tests.csproj       |  9 ++++----
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/Iceshrimp.Backend/Iceshrimp.Backend.csproj b/Iceshrimp.Backend/Iceshrimp.Backend.csproj
index 2fdbb407..0b096dad 100644
--- a/Iceshrimp.Backend/Iceshrimp.Backend.csproj
+++ b/Iceshrimp.Backend/Iceshrimp.Backend.csproj
@@ -17,6 +17,12 @@
         <PreserveCompilationContext>false</PreserveCompilationContext>
     </PropertyGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\Iceshrimp.Frontend\Iceshrimp.Frontend.csproj" />
+        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj" />
+        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Amazon.S3" Version="0.31.2" />
         <PackageReference Include="AngleSharp" Version="1.1.2" />
@@ -54,27 +60,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <AdditionalFiles Include="Pages\Error.cshtml" />
-        <AdditionalFiles Include="Pages\Shared\_Layout.cshtml" />
-        <AdditionalFiles Include="Pages\_ViewImports.cshtml" />
-        <AdditionalFiles Include="Pages\_ViewStart.cshtml" />
+        <Content Include="configuration.ini" CopyToOutputDirectory="Always"/>
     </ItemGroup>
 
     <ItemGroup>
         <None Remove="migrate.sql" />
     </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Iceshrimp.Frontend\Iceshrimp.Frontend.csproj" />
-        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj" />
-        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Update="Pages\Shared\FrontendSPA.cshtml">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-    </ItemGroup>
-
 </Project>
diff --git a/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj b/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj
index 073db159..bcb326de 100644
--- a/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj
+++ b/Iceshrimp.Frontend/Iceshrimp.Frontend.csproj
@@ -13,6 +13,11 @@
         <RunAOTCompilation>true</RunAOTCompilation>
     </PropertyGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj"/>
+        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj"/>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
@@ -21,19 +26,4 @@
         <PackageReference Include="TypedSignalR.Client" Version="3.5.2" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Remove="Properties\launchSettings.json"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <_ContentIncludedByDefault Remove="wwwroot\assets\logo.png"/>
-        <_ContentIncludedByDefault Remove="wwwroot\assets\transparent.png"/>
-        <_ContentIncludedByDefault Remove="wwwroot\sample-data\weather.json"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Iceshrimp.Parsing\Iceshrimp.Parsing.fsproj"/>
-        <ProjectReference Include="..\Iceshrimp.Shared\Iceshrimp.Shared.csproj"/>
-    </ItemGroup>
-
 </Project>
diff --git a/Iceshrimp.Tests/Iceshrimp.Tests.csproj b/Iceshrimp.Tests/Iceshrimp.Tests.csproj
index f5ed9fe7..da4e8487 100644
--- a/Iceshrimp.Tests/Iceshrimp.Tests.csproj
+++ b/Iceshrimp.Tests/Iceshrimp.Tests.csproj
@@ -4,11 +4,14 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
 
+    <ItemGroup>
+        <ProjectReference Include="..\Iceshrimp.Backend\Iceshrimp.Backend.csproj"/>
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
@@ -20,10 +23,6 @@
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\Iceshrimp.Backend\Iceshrimp.Backend.csproj"/>
-    </ItemGroup>
-
     <ItemGroup>
         <Content Include="configuration.ini" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>