Merge pull request #261 from portyanikhin/update-targets

Updated targets
portyanikhin · Jan 19, 2024 · 2fc330e · 2fc330e
2 parents 896041f + cdb4204
commit 2fc330e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 31 deletions.
diff --git 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
@@ -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>