Condition.

ikvmnet · Jul 5, 2024 · bdf8f36 · bdf8f36
1 parent 596f4a1
commit bdf8f36
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/IKVM/buildTransitive/IKVM.targets b/src/IKVM/buildTransitive/IKVM.targets
@@ -13,12 +13,14 @@
         </ItemGroup>
     </Target>
 
-    <Target Name="IncludeIkvmNativeLibraries" BeforeTargets="AssignTargetPaths">
-        <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
-            <_IkvmNativeLibraries Include="$(MSBuildThisFileDirectory)..\runtimes\**\native\*.dll" />
+    <Target Name="IncludeIkvmNativeLibraries" BeforeTargets="AssignTargetPaths" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
+        <ItemGroup>
+            <_IkvmNativeLibraries Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.dll" RuntimeIdentifier="win-x86" />
+            <_IkvmNativeLibraries Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.dll" RuntimeIdentifier="win-x64" />
+            <_IkvmNativeLibraries Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.dll" RuntimeIdentifier="win-arm64" />
             <None Include="@(_IkvmNativeLibraries)">
                 <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <TargetPath>runtimes\%(RecursiveDir)native\%(Filename)%(Extension)</TargetPath>
+                <TargetPath>runtimes\%(RuntimeIdentifier)\native\%(Filename)%(Extension)</TargetPath>
             </None>
         </ItemGroup>
     </Target>