Skip to content

Commit

Permalink
Merge pull request #179 from manuelxmarquez/main
Browse files Browse the repository at this point in the history
Move native assemblies to prevent warning trying to reference them.
  • Loading branch information
amerkoleci authored Aug 31, 2021
2 parents 92f760c + af9e8d2 commit 88daca9
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/Vortice.Dxc/Vortice.Dxc.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="SharpGenTools.Sdk" Version="$(SharpGenVersion)" />

Expand All @@ -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>

Expand Down
13 changes: 13 additions & 0 deletions src/Vortice.Dxc/build/Vortice.Dxc.targets
Original file line number Diff line number Diff line change
@@ -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>
File renamed without changes.
File renamed without changes.

0 comments on commit 88daca9

Please sign in to comment.