From cdb42047b466015d9552cf1856343033832a7135 Mon Sep 17 00:00:00 2001
From: Vladimir Portyanikhin <86243191+portyanikhin@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:45:49 +0300
Subject: [PATCH] Refactoring

---
 src/SharpProp/SharpProp.csproj  | 34 ++++-----------------------------
 src/SharpProp/SharpProp.targets |  3 ++-
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/SharpProp/SharpProp.csproj b/src/SharpProp/SharpProp.csproj
index e1c1491..e916bbb 100644
--- a/src/SharpProp/SharpProp.csproj
+++ b/src/SharpProp/SharpProp.csproj
@@ -8,39 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="SharpProp.targets" Pack="true" Visible="false" PackagePath="build\"/>
-        <None Include="libCoolProp.dll" Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
-        </None>
-        <None Update="libCoolProp.dll" Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
-        </None>
-        <None Include="libCoolProp.dylib" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
-        </None>
-        <None Update="libCoolProp.dylib" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
-        </None>
-        <None Include="libCoolProp.so" Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-            <Pack>true</Pack>
-            <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
-        </None>
-        <None Update="libCoolProp.so" Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+        <None Include="SharpProp.targets" Pack="true" PackagePath="build" Visible="false"/>
+        <None Include="*.dll;*.dylib;*.so">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Pack>true</Pack>
+            <PackageCopyToOutput>true</PackageCopyToOutput>
+            <PackagePath>build</PackagePath>
             <Visible>false</Visible>
-            <PackagePath>build\</PackagePath>
         </None>
     </ItemGroup>
 
diff --git a/src/SharpProp/SharpProp.targets b/src/SharpProp/SharpProp.targets
index 4ecae74..cdfd79f 100644
--- a/src/SharpProp/SharpProp.targets
+++ b/src/SharpProp/SharpProp.targets
@@ -4,8 +4,9 @@
         <NativeLibs Include="$(MSBuildThisFileDirectory)**\*.dylib" Condition="$([MSBuild]::IsOSPlatform('OSX'))"/>
         <NativeLibs Include="$(MSBuildThisFileDirectory)**\*.so" Condition="$([MSBuild]::IsOSPlatform('Linux'))"/>
         <None Include="@(NativeLibs)">
-            <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Visible>false</Visible>
         </None>
     </ItemGroup>
 </Project>