Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coalesce the NativePackages and SilkExtensions repositories #433

Merged
merged 29 commits into from
Mar 21, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5ed07f7
Initial commit
Perksey Aug 16, 2019
feecd35
Add OSX binaries
Perksey Aug 16, 2019
dbca4ae
Add Windows binaries
Perksey Aug 16, 2019
dcad350
Add build.cmd
Perksey Aug 16, 2019
e03766f
Update to GLFW 3.3.2
Perksey Feb 18, 2020
2bbfcd7
Remove finished package
Perksey Feb 18, 2020
4d08bb6
Initial commit
Perksey May 16, 2020
ad03f8d
ImGui
Perksey May 16, 2020
d561222
Finalize ImGui
Perksey May 17, 2020
4a1e852
SilkExtensions.ImGui v1.0.0
Perksey May 17, 2020
cad5cbe
Add assimp package + GLFW missing libs
Perksey Jul 10, 2020
90ccfed
Add new, smaller linux-x64 Assimp binary
devvoid Jul 30, 2020
7705517
Add optional ImGui Font Configuration (#2)
joffarex Oct 31, 2020
f90b255
Delete Ultz.Native.Assimp.5.0.1.nupkg
Perksey Dec 25, 2020
28f39ba
Silk.NET 2.0 packages w/ support for netfx (closes #1)
Perksey Jan 2, 2021
d79aba8
Add projects for the native packages
Perksey Mar 20, 2021
1ce27c6
Move to src/Native
Perksey Mar 20, 2021
68bab65
Move gitignore
Perksey Mar 20, 2021
c7475d9
Merge in NativePackages into the main Silk.NET repo
Perksey Mar 20, 2021
e42e4ab
Plumb Native into the build
Perksey Mar 20, 2021
a996eee
Add a README for Native
Perksey Mar 20, 2021
329a19c
Rename project in prep for move
Perksey Mar 20, 2021
830b411
Merge in SilkExtensions into the main Silk.NET repo
Perksey Mar 20, 2021
1c7a0f8
Add Silk.NET.OpenGL.Extensions.ImGui
Perksey Mar 20, 2021
eab407a
Update Silk.NET.OpenGL.Extensions.ImGui to 2.x
Perksey Mar 20, 2021
fa04cb3
SourceLink related fixes
Perksey Mar 21, 2021
5844cee
More fixes
Perksey Mar 21, 2021
4e31110
Update build/props/common.props
Perksey Mar 21, 2021
61a5bbc
Rename SilkNativePackage to SilkSourceLinkExempt, add SilkTouch
Perksey Mar 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeldridTriangle", "src\Lab\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "D3D12Triangle", "src\Lab\D3D12Triangle\D3D12Triangle.csproj", "{760BE7AD-0683-451A-B28A-975A76404662}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{72E7FA64-5B1E-477D-BD30-63B7F206B3C4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL.Native", "src\Native\Silk.NET.SDL.Native\Silk.NET.SDL.Native.csproj", "{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.GLFW.Native", "src\Native\Silk.NET.GLFW.Native\Silk.NET.GLFW.Native.csproj", "{84F51960-D814-450D-80EB-D9E46A1D5187}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Assimp.Native", "src\Native\Silk.NET.Assimp.Native\Silk.NET.Assimp.Native.csproj", "{D3D9891B-88E6-46AD-919C-7EC4EABE5266}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -2194,6 +2202,42 @@ Global
{760BE7AD-0683-451A-B28A-975A76404662}.Release|x64.Build.0 = Release|Any CPU
{760BE7AD-0683-451A-B28A-975A76404662}.Release|x86.ActiveCfg = Release|Any CPU
{760BE7AD-0683-451A-B28A-975A76404662}.Release|x86.Build.0 = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|x64.ActiveCfg = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|x64.Build.0 = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Debug|x86.Build.0 = Debug|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|Any CPU.Build.0 = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|x64.ActiveCfg = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|x64.Build.0 = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|x86.ActiveCfg = Release|Any CPU
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC}.Release|x86.Build.0 = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|x64.ActiveCfg = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|x64.Build.0 = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|x86.ActiveCfg = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Debug|x86.Build.0 = Debug|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|Any CPU.Build.0 = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|x64.ActiveCfg = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|x64.Build.0 = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|x86.ActiveCfg = Release|Any CPU
{84F51960-D814-450D-80EB-D9E46A1D5187}.Release|x86.Build.0 = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|x64.ActiveCfg = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|x64.Build.0 = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|x86.ActiveCfg = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Debug|x86.Build.0 = Debug|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|Any CPU.Build.0 = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|x64.ActiveCfg = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|x64.Build.0 = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|x86.ActiveCfg = Release|Any CPU
{D3D9891B-88E6-46AD-919C-7EC4EABE5266}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2359,6 +2403,9 @@ Global
{DE477265-8F7D-4D7F-B5DA-F3C5DE631788} = {3501BAD6-406A-49BC-BE0E-5A49A3AAAE6A}
{FD88C431-C25B-45B0-ACB1-E66FD62DD755} = {DFA0E841-33E5-4533-AF00-964E21A141B8}
{760BE7AD-0683-451A-B28A-975A76404662} = {DFA0E841-33E5-4533-AF00-964E21A141B8}
{F9AA41B4-1C36-472B-A1A5-4A10EE0A79FC} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{84F51960-D814-450D-80EB-D9E46A1D5187} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{D3D9891B-88E6-46AD-919C-7EC4EABE5266} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
12 changes: 10 additions & 2 deletions build/nuke/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,20 @@ async Task PushPackages()
{
try
{
await NuGetInterface.UploadPackageAsync(uploadResource, NugetNoServiceEndpoint, file, NugetApiKey, symbolsResource);
await NuGetInterface.UploadPackageAsync
(uploadResource, NugetNoServiceEndpoint, file, NugetApiKey, symbolsResource);
pushed++;
}
catch (Exception ex)
{
exceptions.Add(new Exception($"Failed to push package \"{file}\"", ex));
if (file.Contains(".Native.")) // native packages have their own update cycle
{
Logger.Warn(ex);
}
else
{
exceptions.Add(new Exception($"Failed to push package \"{file}\"", ex));
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/props/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageIconUrl>https://static.ultz.co.uk/img/SilkDotNet.png</PackageIconUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<LangVersion>preview</LangVersion>
<Authors>.NET Foundation</Authors>
<Authors>.NET Foundation and Contributors</Authors>
<PackageReleaseNotes>
Silk.NET March 2021 Update

Expand Down
4 changes: 4 additions & 0 deletions src/Native/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
bin/
obj/
!*.dll
*.nupkg
17 changes: 17 additions & 0 deletions src/Native/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Native Packages
This folder contains NuGet distributions of the binaries for the various libraries we bind to. Previously, this had its
own repository, but was coalesced into this repository to be reunited with the rest of Silk.NET.

In 3.0 we intend to move the packages to use the Silk.NET.\* prefix instead of old Ultz.\* prefix. The folder and
project file names reflect this change today, but still use the old package IDs within them. The mapping of the old
package IDs to the new project is as follows:

- Ultz.Native.Assimp - Silk.NET.Assimp.Native
- Ultz.Native.GLFW - Silk.NET.GLFW.Native
- Ultz.Native.SDL - Silk.NET.SDL.Native

Each binary distribution inherits the license from the library contained within it, and you should check it for
compatibility with the rest of your solution:

- Silk.NET.Assimp.Native: BSD-3-Clause
- Silk.NET.SDL.Native and Silk.NET.GLFW.Native: Zlib
28 changes: 28 additions & 0 deletions src/Native/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
<PackageId>Ultz.Native.Assimp</PackageId> <!-- TODO change this in 3.0 -->
<PackageVersion>5.0.1.2</PackageVersion>
<Authors>.NET Foundation and Contributors</Authors>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
<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).props" PackagePath="build\net461\$(PackageId).props" />
<Content Include="runtimes\linux-x64\native\libassimp.so.5" PackagePath="runtimes\linux-x64\native\libassimp.so.5" />
<Content Include="runtimes\osx-x64\native\libassimp.5.dylib" PackagePath="runtimes\osx-x64\native\libassimp.5.dylib" />
<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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_Ultz_NativePackages_Assimp_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</_Ultz_NativePackages_Assimp_IsWindows>
<_Ultz_NativePackages_Assimp_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</_Ultz_NativePackages_Assimp_IsMacOS>
<_Ultz_NativePackages_Assimp_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</_Ultz_NativePackages_Assimp_IsLinux>

<_Ultz_NativePackages_Assimp_NativeRuntime Condition=" '$(_Ultz_NativePackages_Assimp_NativeRuntime)' == '' And '$(_Ultz_NativePackages_Assimp_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64</_Ultz_NativePackages_Assimp_NativeRuntime>
<_Ultz_NativePackages_Assimp_NativeRuntime Condition=" '$(_Ultz_NativePackages_Assimp_NativeRuntime)' == '' And '$(_Ultz_NativePackages_Assimp_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_Ultz_NativePackages_Assimp_NativeRuntime>
<_Ultz_NativePackages_Assimp_NativeRuntime Condition=" '$(_Ultz_NativePackages_Assimp_NativeRuntime)' == '' And '$(_Ultz_NativePackages_Assimp_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_Ultz_NativePackages_Assimp_NativeRuntime>
<_Ultz_NativePackages_Assimp_NativeRuntime Condition=" '$(_Ultz_NativePackages_Assimp_NativeRuntime)' == '' And '$(_Ultz_NativePackages_Assimp_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_Ultz_NativePackages_Assimp_NativeRuntime>

<_Ultz_NativePackages_Assimp_NativeLibName Condition="'$(_Ultz_NativePackages_Assimp_NativeRuntime)' == 'win-x86'">Assimp32.dll</_Ultz_NativePackages_Assimp_NativeLibName>
<_Ultz_NativePackages_Assimp_NativeLibName Condition="'$(_Ultz_NativePackages_Assimp_NativeRuntime)' == 'win-x64'">Assimp64.dll</_Ultz_NativePackages_Assimp_NativeLibName>
<_Ultz_NativePackages_Assimp_NativeLibName Condition="'$(_Ultz_NativePackages_Assimp_NativeRuntime)' == 'osx-x64'">libassimp.5.dylib</_Ultz_NativePackages_Assimp_NativeLibName>
<_Ultz_NativePackages_Assimp_NativeLibName Condition="'$(_Ultz_NativePackages_Assimp_NativeRuntime)' == 'linux-x64'">libassimp.so.5</_Ultz_NativePackages_Assimp_NativeLibName>
</PropertyGroup>
<ItemGroup>
<Content Condition="'$(_Ultz_NativePackages_Assimp_NativeRuntime)' != ''" Include="$(MSBuildThisFileDirectory)..\..\runtimes\$(_Ultz_NativePackages_Assimp_NativeRuntime)\native\$(_Ultz_NativePackages_Assimp_NativeLibName)">
<Link>%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Visible>False</Visible>
</Content>
</ItemGroup>
</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
29 changes: 29 additions & 0 deletions src/Native/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
<PackageId>Ultz.Native.GLFW</PackageId> <!-- TODO change this in 3.0 -->
<PackageVersion>3.3.3</PackageVersion>
<Authors>.NET Foundation and Contributors</Authors>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>Zlib</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
<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).props" PackagePath="build\net461\$(PackageId).props" />
<Content Include="runtimes\linux-x64\native\libglfw.so.3" PackagePath="runtimes\linux-x64\native\libglfw.so.3" />
<Content Include="runtimes\osx-x64\native\libglfw.3.dylib" PackagePath="runtimes\osx-x64\native\libglfw.3.dylib" />
<Content Include="runtimes\osx-arm64\native\libglfw.3.dylib" PackagePath="runtimes\osx-arm64\native\libglfw.3.dylib" />
<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
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_Ultz_NativePackages_GLFW_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</_Ultz_NativePackages_GLFW_IsWindows>
<_Ultz_NativePackages_GLFW_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</_Ultz_NativePackages_GLFW_IsMacOS>
<_Ultz_NativePackages_GLFW_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</_Ultz_NativePackages_GLFW_IsLinux>

<_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64</_Ultz_NativePackages_GLFW_NativeRuntime>
<_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_Ultz_NativePackages_GLFW_NativeRuntime>
<_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_Ultz_NativePackages_GLFW_NativeRuntime>
<_Ultz_NativePackages_GLFW_NativeRuntime Condition=" '$(_Ultz_NativePackages_GLFW_NativeRuntime)' == '' And '$(_Ultz_NativePackages_GLFW_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_Ultz_NativePackages_GLFW_NativeRuntime>

<_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'win-x86'">glfw3.dll</_Ultz_NativePackages_GLFW_NativeLibName>
<_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'win-x64'">glfw3.dll</_Ultz_NativePackages_GLFW_NativeLibName>
<_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'osx-x64'">libglfw.3.dylib</_Ultz_NativePackages_GLFW_NativeLibName>
<_Ultz_NativePackages_GLFW_NativeLibName Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' == 'linux-x64'">libglfw.so.3</_Ultz_NativePackages_GLFW_NativeLibName>
</PropertyGroup>
<ItemGroup>
<Content Condition="'$(_Ultz_NativePackages_GLFW_NativeRuntime)' != ''" Include="$(MSBuildThisFileDirectory)..\..\runtimes\$(_Ultz_NativePackages_GLFW_NativeRuntime)\native\$(_Ultz_NativePackages_GLFW_NativeLibName)">
<Link>%(Filename)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Visible>False</Visible>
</Content>
</ItemGroup>
</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
28 changes: 28 additions & 0 deletions src/Native/Silk.NET.SDL.Native/Silk.NET.SDL.Native.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
<PackageId>Ultz.Native.SDL</PackageId> <!-- TODO change this in 3.0 -->
<PackageVersion>2.0.12</PackageVersion>
<Authors>.NET Foundation and Contributors</Authors>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>Zlib</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/dotnet/Silk.NET</PackageProjectUrl>
<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).props" PackagePath="build\net461\$(PackageId).props" />
<Content Include="runtimes\linux-x64\native\libSDL2-2.0.so" PackagePath="runtimes\linux-x64\native\libSDL2-2.0.so" />
<Content Include="runtimes\osx-x64\native\libSDL2-2.0.dylib" PackagePath="runtimes\osx-x64\native\libSDL2-2.0.dylib" />
<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>
Loading