From b0a53216f58e3dfdb8db2661e01d89f2d96f0e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Thu, 18 Apr 2024 20:54:51 +0200
Subject: [PATCH] Native: Simplify NuGet packaging projects.

---
 src/Native/Directory.Build.targets            |  2 +
 .../Silk.NET.Assimp.Native.csproj             | 18 ------
 .../Silk.NET.DXVK.Native.csproj               | 56 -------------------
 .../Silk.NET.DirectStorage.Native.csproj      | 20 ++-----
 .../Silk.NET.GLFW.Native.csproj               | 18 ------
 .../Silk.NET.MoltenVK.Native.csproj           | 12 +---
 .../Silk.NET.OpenAL.Soft.Native.csproj        | 18 ------
 .../Silk.NET.OpenGLES.ANGLE.Native.csproj     | 20 ++-----
 .../Silk.NET.SDL.Native.csproj                | 22 --------
 .../Silk.NET.SPIRV.Cross.Native.csproj        | 21 -------
 .../Silk.NET.SPIRV.Reflect.Native.csproj      | 21 -------
 .../Silk.NET.Shaderc.Native.csproj            | 25 +--------
 .../Silk.NET.Vkd3d.Native.csproj              | 15 +----
 .../Silk.NET.Vulkan.Loader.Native.csproj      | 17 ++----
 .../Silk.NET.Vulkan.SwiftShader.Native.csproj | 27 ++-------
 .../Silk.NET.WebGPU.Native.WGPU.csproj        | 18 ------
 16 files changed, 26 insertions(+), 304 deletions(-)

diff --git a/src/Native/Directory.Build.targets b/src/Native/Directory.Build.targets
index 432c8d258e..db9d98ff21 100644
--- a/src/Native/Directory.Build.targets
+++ b/src/Native/Directory.Build.targets
@@ -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>
diff --git a/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj b/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
index d19cbd65b4..1594bca00b 100644
--- a/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
+++ b/src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj b/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj
index fe9452cd64..412a97881e 100644
--- a/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj
+++ b/src/Native/Silk.NET.DXVK.Native/Silk.NET.DXVK.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj b/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj
index a9dc3aba17..427e879ec1 100644
--- a/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj
+++ b/src/Native/Silk.NET.DirectStorage.Native/Silk.NET.DirectStorage.Native.csproj
@@ -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>
@@ -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>
diff --git a/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj b/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj
index 0e29cc5055..3a1a8e19a5 100644
--- a/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj
+++ b/src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj b/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj
index 08e416d101..281c6db31e 100644
--- a/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj
+++ b/src/Native/Silk.NET.MoltenVK.Native/Silk.NET.MoltenVK.Native.csproj
@@ -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>
@@ -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>
diff --git a/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj b/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj
index f04889ff0f..1208da3da1 100644
--- a/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj
+++ b/src/Native/Silk.NET.OpenAL.Soft.Native/Silk.NET.OpenAL.Soft.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj
index 6f4a87767d..23d75c51da 100644
--- a/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj
+++ b/src/Native/Silk.NET.OpenGLES.ANGLE.Native/Silk.NET.OpenGLES.ANGLE.Native.csproj
@@ -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>
@@ -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>
diff --git a/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj b/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj
index efd875c269..9b8d0eaf4f 100644
--- a/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj
+++ b/src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj b/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj
index a1d740c432..ea396165a2 100644
--- a/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj
+++ b/src/Native/Silk.NET.SPIRV.Cross.Native/Silk.NET.SPIRV.Cross.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -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>
diff --git a/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj b/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj
index 0adac48398..ef3bd225e0 100644
--- a/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj
+++ b/src/Native/Silk.NET.SPIRV.Reflect.Native/Silk.NET.SPIRV.Reflect.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -16,23 +12,6 @@
         <Description>Multi-platform native library for SPIRV-Reflect.</Description>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/KhronosGroup/SPIRV-Reflect</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-reflect.so" PackagePath="runtimes\linux-arm\native\libspirv-reflect.so" />
-        <Content Include="runtimes\linux-arm64\native\libspirv-reflect.so" PackagePath="runtimes\linux-arm64\native\libspirv-reflect.so" />
-        <Content Include="runtimes\linux-x64\native\libspirv-reflect.so" PackagePath="runtimes\linux-x64\native\libspirv-reflect.so" />
-
-        <Content Include="runtimes\win-arm64\native\spirv-reflect.dll" PackagePath="runtimes\win-arm64\native\spirv-reflect.dll" />
-        <Content Include="runtimes\win-x64\native\spirv-reflect.dll" PackagePath="runtimes\win-x64\native\spirv-reflect.dll" />
-        <Content Include="runtimes\win-x86\native\spirv-reflect.dll" PackagePath="runtimes\win-x86\native\spirv-reflect.dll" />
-
-        <Content Include="runtimes\osx-arm64\native\libspirv-reflect.dylib" PackagePath="runtimes\osx-arm64\native\libspirv-reflect.dylib" />
-        <Content Include="runtimes\osx-x64\native\libspirv-reflect.dylib" PackagePath="runtimes\osx-x64\native\libspirv-reflect.dylib" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj b/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj
index 5504c5f210..db573ac744 100644
--- a/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj
+++ b/src/Native/Silk.NET.Shaderc.Native/Silk.NET.Shaderc.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -12,27 +8,10 @@
         <Authors>.NET Foundation and Contributors</Authors>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-        <PackageProjectUrl>https://github.com/google/shaderc/</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
         <Description>Multi-platform native library for Shaderc.</Description>
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/google/shaderc/</RepositoryUrl>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IncludeContentInPack>true</IncludeContentInPack>
+        <RepositoryUrl>https://github.com/google/shaderc</RepositoryUrl>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
-
-        <Content Include="runtimes\linux-arm\native\libshaderc_shared.so" PackagePath="runtimes\linux-arm\native\libshaderc_shared.so" />
-        <Content Include="runtimes\linux-arm64\native\libshaderc_shared.so" PackagePath="runtimes\linux-arm64\native\libshaderc_shared.so" />
-        <Content Include="runtimes\linux-x64\native\libshaderc_shared.so" PackagePath="runtimes\linux-x64\native\libshaderc_shared.so" />
-
-        <Content Include="runtimes\win-arm64\native\shaderc_shared.dll" PackagePath="runtimes\win-arm64\native\shaderc_shared.dll" />
-        <Content Include="runtimes\win-x64\native\shaderc_shared.dll" PackagePath="runtimes\win-x64\native\shaderc_shared.dll" />
-        <Content Include="runtimes\win-x86\native\shaderc_shared.dll" PackagePath="runtimes\win-x86\native\shaderc_shared.dll" />
-
-        <Content Include="runtimes\osx-arm64\native\libshaderc_shared.dylib" PackagePath="runtimes\osx-arm64\native\libshaderc_shared.dylib" />
-        <Content Include="runtimes\osx-x64\native\libshaderc_shared.dylib" PackagePath="runtimes\osx-x64\native\libshaderc_shared.dylib" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj b/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj
index 65e6e903d3..63063077e5 100644
--- a/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj
+++ b/src/Native/Silk.NET.Vkd3d.Native/Silk.NET.Vkd3d.Native.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <SilkNativePackage>true</SilkNativePackage>
-    </PropertyGroup>
-
     <Import Project="..\..\..\build\props\common.props" />
 
     <PropertyGroup>
@@ -16,16 +12,7 @@
         <PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
         <Description>Native library for Vkd3d.</Description>
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://gitlab.winehq.org/wine/vkd3d/</RepositoryUrl>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IncludeContentInPack>true</IncludeContentInPack>
+        <RepositoryUrl>https://gitlab.winehq.org/wine/vkd3d</RepositoryUrl>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Content Include="build\net461\$(PackageId).props" PackagePath="build\net461\$(PackageId).props" />
-
-        <Content Include="runtimes\linux-x64\native\libd3dcompile_vkd3d.so" PackagePath="runtimes\linux-x64\native\libd3dcompile_vkd3d.so" />
-        <Content Include="runtimes\linux-x64\native\libSPIRV-Tools-shared.so" PackagePath="runtimes\linux-x64\native\libSPIRV-Tools-shared.so" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj b/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj
index 9d584035d7..b8bee8f65f 100644
--- a/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj
+++ b/src/Native/Silk.NET.Vulkan.Loader.Native/Silk.NET.Vulkan.Loader.Native.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <SilkSourceLinkExempt>true</SilkSourceLinkExempt>
     <SilkGitDirForVersion>$(MSBuildThisFileDirectory)..\..\..\build\submodules\Vulkan-Loader</SilkGitDirForVersion>
   </PropertyGroup>
+
   <Import Project="..\..\..\build\props\common.props" />
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
     <Authors>.NET Foundation and Contributors</Authors>
@@ -13,17 +15,6 @@
     <Description>Multi-platform native library for Vulkan Loader.</Description>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/KhronosGroup/Vulkan-Loader</RepositoryUrl>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeContentInPack>true</IncludeContentInPack>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
-    <Content Include="runtimes\linux-arm64\native\libvulkan.so" PackagePath="runtimes\linux-arm64\native\libvulkan.so" />
-    <Content Include="runtimes\linux-x64\native\libvulkan.so" PackagePath="runtimes\linux-x64\native\libvulkan.so" />
-    <Content Include="runtimes\osx-arm64\native\libvulkan.dylib" PackagePath="runtimes\osx-arm64\native\libvulkan.dylib" />
-    <Content Include="runtimes\osx-x64\native\libvulkan.dylib" PackagePath="runtimes\osx-x64\native\libvulkan.dylib" />
-    <Content Include="runtimes\win-arm64\native\vulkan-1.dll" PackagePath="runtimes\win-arm64\native\vulkan-1.dll" />
-    <Content Include="runtimes\win-x64\native\vulkan-1.dll" PackagePath="runtimes\win-x64\native\vulkan-1.dll" />
-    <Content Include="runtimes\win-x86\native\vulkan-1.dll" PackagePath="runtimes\win-x86\native\vulkan-1.dll" />
-  </ItemGroup>
+
 </Project>
diff --git a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj
index 75d5180e12..ab2cd34d55 100644
--- a/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj
+++ b/src/Native/Silk.NET.Vulkan.SwiftShader.Native/Silk.NET.Vulkan.SwiftShader.Native.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <SilkSourceLinkExempt>true</SilkSourceLinkExempt>
     <SilkGitDirForVersion>$(MSBuildThisFileDirectory)..\..\..\build\submodules\SwiftShader</SilkGitDirForVersion>
   </PropertyGroup>
+
   <Import Project="..\..\..\build\props\common.props" />
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
     <Authors>.NET Foundation and Contributors</Authors>
@@ -12,26 +14,7 @@
     <PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
     <Description>Multi-platform native library for SwiftShader.</Description>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://swiftshader.googlesource.com/SwiftShader/</RepositoryUrl>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeContentInPack>true</IncludeContentInPack>
+    <RepositoryUrl>https://github.com/google/swiftshader</RepositoryUrl>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="build\net461\$(PackageId).targets" PackagePath="build\net461\$(PackageId).targets" />
-    <Content Include="runtimes\linux-arm\native\libvk_swiftshader.so" PackagePath="runtimes\linux-arm\native\libvk_swiftshader.so" />
-    <Content Include="runtimes\linux-arm\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-arm\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\linux-arm64\native\libvk_swiftshader.so" PackagePath="runtimes\linux-arm64\native\libvk_swiftshader.so" />
-    <Content Include="runtimes\linux-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-arm64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\linux-x64\native\libvk_swiftshader.so" PackagePath="runtimes\linux-x64\native\libvk_swiftshader.so" />
-    <Content Include="runtimes\linux-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\linux-x64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\osx-arm64\native\libvk_swiftshader.dylib" PackagePath="runtimes\osx-arm64\native\libvk_swiftshader.dylib" />
-    <Content Include="runtimes\osx-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\osx-arm64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\osx-x64\native\libvk_swiftshader.dylib" PackagePath="runtimes\osx-x64\native\libvk_swiftshader.dylib" />
-    <Content Include="runtimes\win-arm64\native\vk_swiftshader.dll" PackagePath="runtimes\win-arm64\native\vk_swiftshader.dll" />
-    <Content Include="runtimes\win-arm64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-arm64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\win-x64\native\vk_swiftshader.dll" PackagePath="runtimes\win-x64\native\vk_swiftshader.dll" />
-    <Content Include="runtimes\win-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-x64\native\vk_swiftshader_icd.json" />
-    <Content Include="runtimes\win-x86\native\vk_swiftshader.dll" PackagePath="runtimes\win-x86\native\vk_swiftshader.dll" />
-    <Content Include="runtimes\win-x64\native\vk_swiftshader_icd.json" PackagePath="runtimes\win-x64\native\vk_swiftshader_icd.json" />
-  </ItemGroup>
+
 </Project>
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj b/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj
index 06948af956..09a24bf0c9 100644
--- a/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj
+++ b/src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <SilkNativePackage>true</SilkNativePackage>
-  </PropertyGroup>
-
   <Import Project="..\..\..\build\props\common.props" />
 
   <PropertyGroup>
@@ -16,20 +12,6 @@
     <Description>Multi-platform native library for WGPU.</Description>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/gfx-rs/wgpu-native</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\libwgpu_native.so" PackagePath="runtimes\linux-arm\native\libwgpu_native.so" />
-    <Content Include="runtimes\linux-arm64\native\libwgpu_native.so" PackagePath="runtimes\linux-arm64\native\libwgpu_native.so" />
-    <Content Include="runtimes\linux-x64\native\libwgpu_native.so" PackagePath="runtimes\linux-x64\native\libwgpu_native.so" />
-    <Content Include="runtimes\osx-arm64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-arm64\native\libwgpu_native.dylib" />
-    <Content Include="runtimes\osx-x64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-x64\native\libwgpu_native.dylib" />
-    <Content Include="runtimes\win-arm64\native\wgpu_native.dll" PackagePath="runtimes\win-arm64\native\wgpu_native.dll" />
-    <Content Include="runtimes\win-x64\native\wgpu_native.dll" PackagePath="runtimes\win-x64\native\wgpu_native.dll" />
-    <Content Include="runtimes\win-x86\native\wgpu_native.dll" PackagePath="runtimes\win-x86\native\wgpu_native.dll" />
-  </ItemGroup>
-
 </Project>