From add828aa7c29d83d904990e83a0484b82b96c02d Mon Sep 17 00:00:00 2001
From: Sewer 56 <seweratwork@gmail.com>
Date: Thu, 8 Jun 2023 01:35:55 +0100
Subject: [PATCH] Changed: Only ship needed binaries for dotnet build.

---
 .../Reloaded.Assembler.Tests.csproj           |  5 ++++-
 .../Reloaded.Assembler.csproj                 | 22 ++++++-------------
 .../Reloaded.Assembler.targets                | 12 +++++++---
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Source/Reloaded.Assembler.Tests/Reloaded.Assembler.Tests.csproj b/Source/Reloaded.Assembler.Tests/Reloaded.Assembler.Tests.csproj
index d6739c9..a798e27 100644
--- a/Source/Reloaded.Assembler.Tests/Reloaded.Assembler.Tests.csproj
+++ b/Source/Reloaded.Assembler.Tests/Reloaded.Assembler.Tests.csproj
@@ -1,6 +1,9 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
-
+  
+  <!-- Import Targets -->
+  <Import Project="../Reloaded.Assembler/Reloaded.Assembler.targets" />
+  
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
diff --git a/Source/Reloaded.Assembler/Reloaded.Assembler.csproj b/Source/Reloaded.Assembler/Reloaded.Assembler.csproj
index 5bea49f..dc9b10f 100644
--- a/Source/Reloaded.Assembler/Reloaded.Assembler.csproj
+++ b/Source/Reloaded.Assembler/Reloaded.Assembler.csproj
@@ -14,14 +14,12 @@
     <Authors>Sewer56</Authors>
     <Product>Reloaded</Product>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.dll</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <Description>Minimal .NET wrapper around the simple, easy to use Flat Assembler written by Tomasz Grysztar. Supports both x64 and x86 development.</Description>
+    <Description>Minimal .NET wrapper around the simple, easy to use Flat Assembler written by Tomasz Grysztar. Supports both x64 and x86 development on Windows.</Description>
     <Copyright>LGPL V3</Copyright>
-    <PackageLicenseUrl></PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/Reloaded-Project/Reloaded.Assembler</PackageProjectUrl>
-    <PackageIconUrl></PackageIconUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/Reloaded-Project/Reloaded.Assembler</RepositoryUrl>
-    <Version>1.0.14</Version>
+    <Version>1.0.15</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>Icon.png</PackageIcon>
 
@@ -32,22 +30,16 @@
   <ItemGroup>
     <None Include="..\..\LICENSE">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>.</PackagePath>
     </None>
     <None Include="..\Icon.png">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>.</PackagePath>
     </None>
     <None Include="Reloaded.Assembler.targets" Pack="true" PackagePath="build" />
-    <None Include="FASM-LICENSE.TXT" Pack="true" PackagePath="build">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="FASM.DLL" Pack="true" PackagePath="build">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="FASMX64.DLL" Pack="true" PackagePath="build">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <None Include="FASM-LICENSE.TXT" Pack="true" PackagePath="build"/>
+    <None Include="FASM.DLL" Pack="true" PackagePath="build"/>
+    <None Include="FASMX64.DLL" Pack="true" PackagePath="build"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/Reloaded.Assembler/Reloaded.Assembler.targets b/Source/Reloaded.Assembler/Reloaded.Assembler.targets
index 276add7..27e87b4 100644
--- a/Source/Reloaded.Assembler/Reloaded.Assembler.targets
+++ b/Source/Reloaded.Assembler/Reloaded.Assembler.targets
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <NativeLibs Include="$(MSBuildThisFileDirectory)*.*" />
-    <None Include="@(NativeLibs)">
+    <NativeLibs32 Include="$(MSBuildThisFileDirectory)FASM.DLL" Condition="('$(Platform)' == 'AnyCPU' and '$(RuntimeIdentifier)' == '') or '$(Platform)' == 'x86' or '$(RuntimeIdentifier)' == 'win-x86'" />
+    <NativeLibs64 Include="$(MSBuildThisFileDirectory)FASMX64.DLL" Condition="('$(Platform)' == 'AnyCPU' and '$(RuntimeIdentifier)' == '') or '$(Platform)' == 'x64' or '$(RuntimeIdentifier)' == 'win-x64'" />
+    <None Include="@(NativeLibs32);@(NativeLibs64)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+
+    <None Include="$(MSBuildThisFileDirectory)Reloaded.Assembler.targets">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>