Updated .cproj configuration

The fucking shit in the folders and resources mixed in with the code is maddening. I found a solution though, and put a specific version for CodeAnalysis so that it wouldn't fill the whole folder with its language packs. I also rewrote the command to copy the resources folder to the build.
technologists-team · Jul 21, 2024 · f393195 · f393195
1 parent 7639d8a
commit f393195
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/Hypercube.Client/Hypercube.Client.csproj b/Hypercube.Client/Hypercube.Client.csproj
@@ -5,6 +5,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
 
     <ItemGroup>
@@ -25,9 +26,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ContentWithTargetPath Include=".\Libraries\**">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>%(Filename)%(Extension)</TargetPath>
-        </ContentWithTargetPath>
+        <None Include=".\Libraries\**" Link="%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
     </ItemGroup>
 </Project>
diff --git a/Hypercube.Client/Libraries/libopenal.so b/Hypercube.Client/Libraries/libopenal.so
diff --git a/Hypercube.Example/Hypercube.Example.csproj b/Hypercube.Example/Hypercube.Example.csproj
@@ -5,7 +5,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Hypercube.Shared/Hypercube.Shared.csproj b/Hypercube.Shared/Hypercube.Shared.csproj
@@ -4,29 +4,19 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0-2.final" />
-      <PackageReference Include="YamlDotNet" Version="16.0.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0-2.final"/>
+      <PackageReference Include="YamlDotNet" Version="16.0.0"/>
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Hypercube.Math\Hypercube.Math.csproj" />
+      <ProjectReference Include="..\Hypercube.Math\Hypercube.Math.csproj"/>
     </ItemGroup>
+
     <ItemGroup>
-      <Folder Include="Entities\Systems\" />
-    </ItemGroup>
-    <ItemGroup>
-        <ContentWithTargetPath Include="..\Resources\**">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>Resources\%(RecursiveDir)\%(Filename)%(Extension)</TargetPath>
-        </ContentWithTargetPath>
-        <ContentWithTargetPath Update="..\Resources\Shaders\base_primitive.frag">
-          <Link>Shaders\base_primitive.frag</Link>
-        </ContentWithTargetPath>
-        <ContentWithTargetPath Update="..\Resources\Shaders\base_primitive.frag">
-          <Link>Shaders\base_primitive.frag</Link>
-        </ContentWithTargetPath>
+        <None Include="..\Resources\**" Link="Resources\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest"/>
     </ItemGroup>
 </Project>