Skip to content

Commit

Permalink
Native: Simplify NuGet packaging projects.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexrp committed Apr 18, 2024
1 parent 2d0819b commit b0a5321
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 304 deletions.
2 changes: 2 additions & 0 deletions src/Native/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<ItemGroup>
<Content Include="build/**" PackagePath="build/%(RecursiveDir)%(Filename)%(Extension)" />
<Content Include="runtimes/**" PackagePath="runtimes/%(RecursiveDir)%(Filename)%(Extension)" />
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/net461" />
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/netstandard2.0" />
</ItemGroup>
Expand Down
18 changes: 0 additions & 18 deletions src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -17,20 +13,6 @@
<Description>Multi-platform native library for Assimp.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/assimp/assimp</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="runtimes\linux-arm\native\libassimp.so.5" PackagePath="runtimes\linux-arm\native\libassimp.so.5" />
<Content Include="runtimes\linux-arm64\native\libassimp.so.5" PackagePath="runtimes\linux-arm64\native\libassimp.so.5" />
<Content Include="runtimes\linux-x64\native\libassimp.so.5" PackagePath="runtimes\linux-x64\native\libassimp.so.5" />
<Content Include="runtimes\osx-arm64\native\libassimp.5.dylib" PackagePath="runtimes\osx-arm64\native\libassimp.5.dylib" />
<Content Include="runtimes\osx-x64\native\libassimp.5.dylib" PackagePath="runtimes\osx-x64\native\libassimp.5.dylib" />
<Content Include="runtimes\win-arm64\native\Assimp64.dll" PackagePath="runtimes\win-arm64\native\Assimp32.dll" />
<Content Include="runtimes\win-x64\native\Assimp64.dll" PackagePath="runtimes\win-x64\native\Assimp64.dll" />
<Content Include="runtimes\win-x86\native\Assimp32.dll" PackagePath="runtimes\win-x86\native\Assimp32.dll" />
</ItemGroup>

</Project>
56 changes: 0 additions & 56 deletions src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -16,58 +12,6 @@
<Description>Multi-platform native library for DXVK.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/doitsujin/dxvk</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />

<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so"
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d9.so" />
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so"
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d10core.so" />
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so"
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_d3d11.so" />
<Content Include="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so"
PackagePath="runtimes\linux-x64\native\glfw-libdxvk_dxgi.so" />

<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so"
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d9.so" />
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so"
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d10core.so" />
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so"
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_d3d11.so" />
<Content Include="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so"
PackagePath="runtimes\linux-x64\native\sdl2-libdxvk_dxgi.so" />

<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so"
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d9.so" />
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so"
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d10core.so" />
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so"
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_d3d11.so" />
<Content Include="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so"
PackagePath="runtimes\linux-x86\native\glfw-libdxvk_dxgi.so" />

<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so"
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d9.so" />
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so"
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d10core.so" />
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so"
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_d3d11.so" />
<Content Include="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so"
PackagePath="runtimes\linux-x86\native\sdl2-libdxvk_dxgi.so" />

<Content Include="runtimes\win-x64\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d11.dll" />
<Content Include="runtimes\win-x64\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x64\native\dxvk-dxgi.dll" />
<Content Include="runtimes\win-x64\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d9.dll" />
<Content Include="runtimes\win-x64\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x64\native\dxvk-d3d10core.dll" />

<Content Include="runtimes\win-x86\native\dxvk-d3d11.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d11.dll" />
<Content Include="runtimes\win-x86\native\dxvk-dxgi.dll" PackagePath="runtimes\win-x86\native\dxvk-dxgi.dll" />
<Content Include="runtimes\win-x86\native\dxvk-d3d9.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d9.dll" />
<Content Include="runtimes\win-x86\native\dxvk-d3d10core.dll" PackagePath="runtimes\win-x86\native\dxvk-d3d10core.dll" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<SilkSourceLinkExempt>true</SilkSourceLinkExempt>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
<Authors>.NET Foundation and Contributors</Authors>
Expand All @@ -14,19 +13,10 @@
<Description>Contains DirectStorage binaries for use with .NET applications.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/microsoft/DirectStorage</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="runtimes\win-x64\native\dstorage.dll" PackagePath="runtimes\win-x64\native\dstorage.dll" />
<Content Include="runtimes\win-x86\native\dstorage.dll" PackagePath="runtimes\win-x86\native\dstorage.dll" />
<Content Include="runtimes\win-arm\native\dstorage.dll" PackagePath="runtimes\win-arm\native\dstorage.dll" />
<Content Include="runtimes\win-arm64\native\dstorage.dll" PackagePath="runtimes\win-arm64\native\dstorage.dll" />
<Content Include="runtimes\win-x64\native\dstoragecore.dll" PackagePath="runtimes\win-x64\native\dstoragecore.dll" />
<Content Include="runtimes\win-x86\native\dstoragecore.dll" PackagePath="runtimes\win-x86\native\dstoragecore.dll" />
<Content Include="runtimes\win-arm\native\dstoragecore.dll" PackagePath="runtimes\win-arm\native\dstoragecore.dll" />
<Content Include="runtimes\win-arm64\native\dstoragecore.dll" PackagePath="runtimes\win-arm64\native\dstoragecore.dll" />
<Content Include="LICENSE.txt" PackagePath="LICENSE.txt" />
<Content Include="LICENSE.txt" PackagePath="" />
</ItemGroup>

</Project>
18 changes: 0 additions & 18 deletions src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -17,20 +13,6 @@
<Description>Multi-platform native library for GLFW.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/glfw/glfw</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="runtimes\linux-arm\native\libglfw.so.3" PackagePath="runtimes\linux-arm\native\libglfw.so.3" />
<Content Include="runtimes\linux-arm64\native\libglfw.so.3" PackagePath="runtimes\linux-arm64\native\libglfw.so.3" />
<Content Include="runtimes\linux-x64\native\libglfw.so.3" PackagePath="runtimes\linux-x64\native\libglfw.so.3" />
<Content Include="runtimes\osx-arm64\native\libglfw.3.dylib" PackagePath="runtimes\osx-arm64\native\libglfw.3.dylib" />
<Content Include="runtimes\osx-x64\native\libglfw.3.dylib" PackagePath="runtimes\osx-x64\native\libglfw.3.dylib" />
<Content Include="runtimes\win-arm64\native\glfw3.dll" PackagePath="runtimes\win-arm64\native\glfw3.dll" />
<Content Include="runtimes\win-x64\native\glfw3.dll" PackagePath="runtimes\win-x64\native\glfw3.dll" />
<Content Include="runtimes\win-x86\native\glfw3.dll" PackagePath="runtimes\win-x86\native\glfw3.dll" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>.NET Foundation and Contributors</Authors>
Expand All @@ -9,16 +11,6 @@
<Description>MoltenVK static library.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/KhronosGroup/MoltenVK</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>
<ItemGroup>
<Content Include="runtimes\iossimulator\native\libMoltenVK.a" PackagePath="runtimes\iossimulator\native\libMoltenVK.a" />
<Content Include="runtimes\maccatalyst\native\libMoltenVK.a" PackagePath="runtimes\maccatalyst\native\libMoltenVK.a" />
<Content Include="runtimes\ios\native\libMoltenVK.a" PackagePath="runtimes\ios\native\libMoltenVK.a" />
<Content Include="runtimes\osx\native\libMoltenVK.dylib" PackagePath="runtimes\osx\native\libMoltenVK.dylib" />
<Content Include="runtimes\osx\native\MoltenVK_icd.json" PackagePath="runtimes\osx\native\MoltenVK_icd.json" />
<Content Include="build\netstandard2.0\Silk.NET.MoltenVK.Native.targets" PackagePath="build\netstandard2.0\Silk.NET.MoltenVK.Native.targets" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -16,20 +12,6 @@
<Description>Multi-platform native library for OpenAL Soft.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/kcat/openal-soft</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="runtimes\linux-arm\native\libopenal.so" PackagePath="runtimes\linux-arm\native\libopenal.so" />
<Content Include="runtimes\linux-arm64\native\libopenal.so" PackagePath="runtimes\linux-arm64\native\libopenal.so" />
<Content Include="runtimes\linux-x64\native\libopenal.so" PackagePath="runtimes\linux-x64\native\libopenal.so" />
<Content Include="runtimes\osx-arm64\native\libopenal.dylib" PackagePath="runtimes\osx-arm64\native\libopenal.dylib" />
<Content Include="runtimes\osx-x64\native\libopenal.dylib" PackagePath="runtimes\osx-x64\native\libopenal.dylib" />
<Content Include="runtimes\win-arm64\native\soft_oal.dll" PackagePath="runtimes\win-arm64\native\soft_oal.dll" />
<Content Include="runtimes\win-x64\native\soft_oal.dll" PackagePath="runtimes\win-x64\native\soft_oal.dll" />
<Content Include="runtimes\win-x86\native\soft_oal.dll" PackagePath="runtimes\win-x86\native\soft_oal.dll" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkSourceLinkExempt>true</SilkSourceLinkExempt>
<SilkGitDirForVersion>$(MSBuildThisFileDirectory)..\..\..\build\submodules\ANGLE</SilkGitDirForVersion>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
<Authors>.NET Foundation and Contributors</Authors>
Expand All @@ -12,19 +14,7 @@
<PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
<Description>Multi-platform native library for ANGLE.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://chromium.googlesource.com/angle/angle/</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
<RepositoryUrl>https://chromium.googlesource.com/angle/angle</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="runtimes\linux-x64\native\libGLESv2.so" PackagePath="runtimes\linux-x64\native\libGLESv2.so" />
<Content Include="runtimes\osx-x64\native\libGLESv2.dylib" PackagePath="runtimes\osx-x64\native\libGLESv2.dylib" />
<Content Include="runtimes\win-x64\native\libGLESv2.dll" PackagePath="runtimes\win-x64\native\libGLESv2.dll" />
<Content Include="runtimes\win-x86\native\libGLESv2.dll" PackagePath="runtimes\win-x86\native\libGLESv2.dll" />
<Content Include="runtimes\linux-x64\native\libEGL.so" PackagePath="runtimes\linux-x64\native\libEGL.so" />
<Content Include="runtimes\osx-x64\native\libEGL.dylib" PackagePath="runtimes\osx-x64\native\libEGL.dylib" />
<Content Include="runtimes\win-x64\native\libEGL.dll" PackagePath="runtimes\win-x64\native\libEGL.dll" />
<Content Include="runtimes\win-x86\native\libEGL.dll" PackagePath="runtimes\win-x86\native\libEGL.dll" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -17,24 +13,6 @@
<Description>Multi-platform native library for SDL.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/libsdl-org/SDL</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
<Content Include="build\netstandard2.0\$(PackageId).targets" PackagePath="build\netstandard2.0\$(PackageId).targets" />
<Content Include="runtimes/ios/native/libSDL2.a" PackagePath="runtimes/ios/native/libSDL2.a" />
<Content Include="runtimes/iossimulator/native/libSDL2.a" PackagePath="runtimes/iossimulator/native/libSDL2.a" />
<Content Include="runtimes/linux-arm/native/libSDL2-2.0.so" PackagePath="runtimes/linux-arm/native/libSDL2-2.0.so" />
<Content Include="runtimes/linux-arm64/native/libSDL2-2.0.so" PackagePath="runtimes/linux-arm64/native/libSDL2-2.0.so" />
<Content Include="runtimes/linux-x64/native/libSDL2-2.0.so" PackagePath="runtimes/linux-x64/native/libSDL2-2.0.so" />
<Content Include="runtimes/osx/native/libSDL2-2.0.dylib" PackagePath="runtimes/osx/native/libSDL2-2.0.dylib" />
<Content Include="runtimes/tvos/native/libSDL2.a" PackagePath="runtimes/tvos/native/libSDL2.a" />
<Content Include="runtimes/tvossimulator/native/libSDL2.a" PackagePath="runtimes/tvossimulator/native/libSDL2.a" />
<Content Include="runtimes/win-arm64/native/SDL2.dll" PackagePath="runtimes/win-arm64/native/SDL2.dll" />
<Content Include="runtimes/win-x64/native/SDL2.dll" PackagePath="runtimes/win-x64/native/SDL2.dll" />
<Content Include="runtimes/win-x86/native/SDL2.dll" PackagePath="runtimes/win-x86/native/SDL2.dll" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<SilkNativePackage>true</SilkNativePackage>
</PropertyGroup>

<Import Project="..\..\..\build\props\common.props" />

<PropertyGroup>
Expand All @@ -16,23 +12,6 @@
<Description>Multi-platform native library for SPIRV-Cross.</Description>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/KhronosGroup/SPIRV-Cross</RepositoryUrl>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
</PropertyGroup>

<ItemGroup>
<Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />

<Content Include="runtimes\linux-arm\native\libspirv-cross.so" PackagePath="runtimes\linux-arm\native\libspirv-cross.so" />
<Content Include="runtimes\linux-arm64\native\libspirv-cross.so" PackagePath="runtimes\linux-arm64\native\libspirv-cross.so" />
<Content Include="runtimes\linux-x64\native\libspirv-cross.so" PackagePath="runtimes\linux-x64\native\libspirv-cross.so" />

<Content Include="runtimes\win-arm64\native\spirv-cross.dll" PackagePath="runtimes\win-arm64\native\spirv-cross.dll" />
<Content Include="runtimes\win-x64\native\spirv-cross.dll" PackagePath="runtimes\win-x64\native\spirv-cross.dll" />
<Content Include="runtimes\win-x86\native\spirv-cross.dll" PackagePath="runtimes\win-x86\native\spirv-cross.dll" />

<Content Include="runtimes\osx-arm64\native\libspirv-cross.dylib" PackagePath="runtimes\osx-arm64\native\libspirv-cross.dylib" />
<Content Include="runtimes\osx-x64\native\libspirv-cross.dylib" PackagePath="runtimes\osx-x64\native\libspirv-cross.dylib" />
</ItemGroup>

</Project>
Loading

0 comments on commit b0a5321

Please sign in to comment.