Move includes of ikvm.dll for netfx to a target so it doesn't show up…

… as a link.
ikvmnet · Jul 5, 2024 · 596f4a1 · 596f4a1
1 parent c57a24f
commit 596f4a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/IKVM/buildTransitive/IKVM.props b/src/IKVM/buildTransitive/IKVM.props
@@ -13,12 +13,5 @@
         <IkvmAvailableRuntimeIdentifiers Include="win;linux;osx" />
     </ItemGroup>
 
-    <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
-        <None Include="$(MSBuildThisFileDirectory)..\runtimes\**\native\ikvm.dll" LinkBase="runtimes">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>runtimes\%(RecursiveDir)native\%(Filename)%(Extension)</TargetPath>
-        </None>
-    </ItemGroup>
-
     <Import Project="IKVM.IkvmReference.props" />
 </Project>
diff --git a/src/IKVM/buildTransitive/IKVM.targets b/src/IKVM/buildTransitive/IKVM.targets
@@ -13,5 +13,15 @@
         </ItemGroup>
     </Target>
 
+    <Target Name="IncludeIkvmNativeLibraries" BeforeTargets="AssignTargetPaths">
+        <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
+            <_IkvmNativeLibraries Include="$(MSBuildThisFileDirectory)..\runtimes\**\native\*.dll" />
+            <None Include="@(_IkvmNativeLibraries)">
+                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                <TargetPath>runtimes\%(RecursiveDir)native\%(Filename)%(Extension)</TargetPath>
+            </None>
+        </ItemGroup>
+    </Target>
+
     <Import Project="IKVM.IkvmReference.targets" />
 </Project>