From af9e8d2c8c6b1146f45f408febcd68baae0800d6 Mon Sep 17 00:00:00 2001
From: Manuel Marquez <manuelxmarquez@gmail.com>
Date: Tue, 31 Aug 2021 02:35:27 -0400
Subject: [PATCH] Move native assemblies to prevent warning trying to reference
 them.

---
 src/Vortice.Dxc/Vortice.Dxc.csproj         |  16 +++++++++-------
 src/Vortice.Dxc/build/Vortice.Dxc.targets  |  13 +++++++++++++
 src/Vortice.Dxc/{ => build}/dxcompiler.dll | Bin
 src/Vortice.Dxc/{ => build}/dxil.dll       | Bin
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 src/Vortice.Dxc/build/Vortice.Dxc.targets
 rename src/Vortice.Dxc/{ => build}/dxcompiler.dll (100%)
 rename src/Vortice.Dxc/{ => build}/dxil.dll (100%)

diff --git a/src/Vortice.Dxc/Vortice.Dxc.csproj b/src/Vortice.Dxc/Vortice.Dxc.csproj
index 8a3c1dc6..69db7651 100644
--- a/src/Vortice.Dxc/Vortice.Dxc.csproj
+++ b/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>
 
diff --git a/src/Vortice.Dxc/build/Vortice.Dxc.targets b/src/Vortice.Dxc/build/Vortice.Dxc.targets
new file mode 100644
index 00000000..2977edcc
--- /dev/null
+++ b/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>
diff --git a/src/Vortice.Dxc/dxcompiler.dll b/src/Vortice.Dxc/build/dxcompiler.dll
similarity index 100%
rename from src/Vortice.Dxc/dxcompiler.dll
rename to src/Vortice.Dxc/build/dxcompiler.dll
diff --git a/src/Vortice.Dxc/dxil.dll b/src/Vortice.Dxc/build/dxil.dll
similarity index 100%
rename from src/Vortice.Dxc/dxil.dll
rename to src/Vortice.Dxc/build/dxil.dll