Merge branch 'main' of https://github.com/amerkoleci/Vortice.Windows

Author: amerkoleci

src/Vortice.Dxc/Vortice.Dxc.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Sdk Name="SharpGenTools.Sdk" Version="$(SharpGenVersion)" />
 
@@ -15,17 +15,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="dxcompiler.dll">
+    <Content Include="build\dxcompiler.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PackagePath>lib/$(TargetFramework)</PackagePath>
+      <PackagePath>build/$(TargetFramework)</PackagePath>
       <Pack>true</Pack>
-      <Visible>false</Visible>
     </Content>
-    <Content Include="dxil.dll">
+    <Content Include="build\dxil.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PackagePath>lib/$(TargetFramework)</PackagePath>
+      <PackagePath>build/$(TargetFramework)</PackagePath>
+      <Pack>true</Pack>
+    </Content>
+    <Content Include="build\Vortice.Dxc.targets">
+      <PackagePath>build/$(TargetFramework)/Vortice.Dxc.targets</PackagePath>
       <Pack>true</Pack>
-      <Visible>false</Visible>
     </Content>
   </ItemGroup>
 

src/Vortice.Dxc/build/Vortice.Dxc.targets

@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <CopyNativeAssemblies_Vortice_Dxc Condition="'$(CopyNativeAssemblies_Vortice_Dxc)' == ''">true</CopyNativeAssemblies_Vortice_Dxc>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(CopyNativeAssemblies_Vortice_Dxc)' == true">
+    <None Include="$(MSBuildThisFileDirectory)\*.dll">
+      <Link>%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </None>
+  </ItemGroup>
+</Project>