Include soulmods dll's and add them to the output of implementing pro…

…jects (#87)
FrankvdStam · Jan 29, 2025 · 8b185a7 · 8b185a7
1 parent cfb5be9
commit 8b185a7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -364,8 +364,8 @@ Cargo.lock
 tests/SoulMemory.Tests/coverage.opencover.xml
 tests/SoulSplitter.Tests/coverage.opencover.xml
 
-src/SoulMemory/soulmods/x64/soulmods.dll
-src/SoulMemory/soulmods/x86/soulmods.dll
+src/SoulMemory/soulmods/x64/soulmods_x64.dll
+src/SoulMemory/soulmods/x86/soulmods_x86.dll
 
 src/SoulSplitter/soulmemory-rs/x64/soulmemory_rs.dll
 src/SoulSplitter/soulmemory-rs/x64/launcher.exe

diff --git a/src/SoulMemory/SoulMemory.csproj b/src/SoulMemory/SoulMemory.csproj
@@ -35,28 +35,21 @@
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <NoWarn>1701;1702;NU5100</NoWarn>
   </PropertyGroup>
-    <ItemGroup>
-        <SonarQubeSetting Include="sonar.cpd.exclusions">
-            <Value>DarkSouls1\Parameters\*.cs</Value>
-        </SonarQubeSetting>
-    </ItemGroup>
-    <ItemGroup>
-    <Compile Remove="resources\**" />
-    <EmbeddedResource Remove="resources\**" />
-    <None Remove="resources\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="soulsplitter.ico" />
-  </ItemGroup>
   <ItemGroup>
-      <ContentWithTargetPath Include="soulmods\x64\soulmods.dll">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Content Include="soulmods\x64\soulmods_x64.dll">
+          <PackagePath>contentFiles\any\any</PackagePath>
+          <BuildAction>None</BuildAction>
+          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+          <PackageCopyToOutput>True</PackageCopyToOutput>
           <TargetPath>soulmods_x64.dll</TargetPath>
-      </ContentWithTargetPath>
-      <ContentWithTargetPath Include="soulmods\x86\soulmods.dll">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+      <Content Include="soulmods\x86\soulmods_x86.dll">
+          <PackagePath>contentFiles\any\any</PackagePath>
+          <BuildAction>None</BuildAction>
+          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+          <PackageCopyToOutput>True</PackageCopyToOutput>
           <TargetPath>soulmods_x86.dll</TargetPath>
-      </ContentWithTargetPath>
+      </Content>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
@@ -70,11 +63,9 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
-  </ItemGroup>
-  <ItemGroup>
     <None Update="README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
+        <Pack>True</Pack>
+        <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
@@ -84,21 +75,21 @@
   <Target Name="CargoDebug">
       <Message Text="Building soulmods x64, debug mode" Importance="high" />
       <Exec Command="cargo build --manifest-path ../../Cargo.toml --package soulmods --target x86_64-pc-windows-msvc" />
-      <Copy SourceFiles="..\..\target\x86_64-pc-windows-msvc\debug\soulmods.dll" DestinationFiles="soulmods\x64\soulmods.dll" />
+      <Copy SourceFiles="..\..\target\x86_64-pc-windows-msvc\debug\soulmods.dll" DestinationFiles="soulmods\x64\soulmods_x64.dll" />
 
       <Message Text="Building soulmods x86, debug mode" Importance="high" />
       <Exec Command="cargo build --manifest-path ../../Cargo.toml --package soulmods --target=i686-pc-windows-msvc" />
-      <Copy SourceFiles="..\..\target\i686-pc-windows-msvc\debug\soulmods.dll" DestinationFiles="soulmods\x86\soulmods.dll" />
+      <Copy SourceFiles="..\..\target\i686-pc-windows-msvc\debug\soulmods.dll" DestinationFiles="soulmods\x86\soulmods_x86.dll" />
   </Target>
 
   <Target Name="CargoRelease">
       <Message Text="Building soulmods x64, release mode" Importance="high" />
       <Exec Command="cargo build --manifest-path ../../Cargo.toml --package soulmods --target x86_64-pc-windows-msvc --release" />
-      <Copy SourceFiles="..\..\target\x86_64-pc-windows-msvc\release\soulmods.dll" DestinationFiles="soulmods\x64\soulmods.dll" />
+      <Copy SourceFiles="..\..\target\x86_64-pc-windows-msvc\release\soulmods.dll" DestinationFiles="soulmods\x64\soulmods_x64.dll" />
 
       <Message Text="Building soulmods x86, release mode" Importance="high" />
       <Exec Command="cargo build --manifest-path ../../Cargo.toml --package soulmods --target=i686-pc-windows-msvc  --release" />
-      <Copy SourceFiles="..\..\target\i686-pc-windows-msvc\release\soulmods.dll" DestinationFiles="soulmods\x86\soulmods.dll" />
+      <Copy SourceFiles="..\..\target\i686-pc-windows-msvc\release\soulmods.dll" DestinationFiles="soulmods\x86\soulmods_x86.dll" />
   </Target>
 
 </Project>