Skip to content

Commit 970a265

Browse files
committed
Infrastructure changes for 3.0
1 parent 93bb0e1 commit 970a265

File tree

14 files changed

+786
-30
lines changed

14 files changed

+786
-30
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
2-
<ItemGroup>
3-
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/net461" />
4-
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/netstandard2.0" />
2+
<ItemGroup Condition="$(ProjectName.Contains('Native'))">
3+
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/net461" Visible="false" />
4+
<Content Include="$(MSBuildThisFileDirectory)_._" PackagePath="lib/netstandard2.0" Visible="false" />
55
</ItemGroup>
6+
<Import Project="$(MSBuildThisFileDirectory)../Directory.Build.targets" />
67
</Project>

src/infrastructure/README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
# Native Packages
2-
This folder contains NuGet distributions of the binaries for the various libraries we bind to. Previously, this had its
3-
own repository, but was coalesced into this repository to be reunited with the rest of Silk.NET.
1+
# Infrastructure
2+
3+
This folder contains the plumbing and infrastructure for building and running Silk.NET.
4+
5+
This consists of:
46

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

9-
- Ultz.Native.Assimp - Silk.NET.Assimp.Native
10-
- Ultz.Native.GLFW - Silk.NET.GLFW.Native
11-
- Ultz.Native.SDL - Silk.NET.SDL.Native
9+
We use [NUKE](https://nuke.build) to automate our builds and provide other build-related utilities for use in GitHub Actions, and other CI/CD scenarios.
10+
11+
## Silk.NET.*.Native
12+
13+
The native packages contain NuGet distributions of the binaries for the various libraries we bind to. Previously, this had its
14+
own repository, but was coalesced into this repository to be reunited with the rest of Silk.NET.
1215

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

1619
- Silk.NET.Assimp.Native: BSD-3-Clause
17-
- Silk.NET.SDL.Native and Silk.NET.GLFW.Native: Zlib
20+
- Silk.NET.GLFW.Native: Zlib
1821
- Silk.NET.OpenAL.Soft.Native: LGPL-2.0-or-later

src/infrastructure/Silk.NET.Assimp.Native/Silk.NET.Assimp.Native.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<SilkNativePackage>true</SilkNativePackage>
4+
<SilkSourceLinkExempt>true</SilkSourceLinkExempt>
55
</PropertyGroup>
66

7-
<Import Project="..\..\..\build\props\common.props" />
8-
97
<PropertyGroup>
10-
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
11-
<PackageId>Ultz.Native.Assimp</PackageId> <!-- TODO change this in 3.0 -->
12-
<PackageVersion>5.0.1.3</PackageVersion>
8+
<TargetFramework>$(SilkTargetFramework)</TargetFramework>
9+
<VersionPrefix>5.0.1.4</VersionPrefix>
1310
<Authors>.NET Foundation and Contributors</Authors>
1411
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1512
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>

src/infrastructure/Silk.NET.GLFW.Native/Silk.NET.GLFW.Native.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<SilkNativePackage>true</SilkNativePackage>
4+
<SilkSourceLinkExempt>true</SilkSourceLinkExempt>
55
</PropertyGroup>
66

7-
<Import Project="..\..\..\build\props\common.props" />
8-
97
<PropertyGroup>
10-
<TargetFrameworks>netstandard2.0;net4.6.1</TargetFrameworks>
11-
<PackageId>Ultz.Native.GLFW</PackageId> <!-- TODO change this in 3.0 -->
12-
<PackageVersion>3.3.3.1</PackageVersion>
8+
<TargetFramework>$(SilkTargetFramework)</TargetFramework>
9+
<VersionPrefix>3.3.3.2</VersionPrefix>
1310
<Authors>.NET Foundation and Contributors</Authors>
1411
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1512
<PackageLicenseExpression>Zlib</PackageLicenseExpression>

src/infrastructure/Silk.NET.GLFW.Native/runtimes/linux-x64/native/libglfw.so.3

100755100644
File mode changed.

src/infrastructure/Silk.NET.GLFW.Native/runtimes/osx-arm64/native/libglfw.3.dylib

100755100644
File mode changed.

src/infrastructure/Silk.NET.GLFW.Native/runtimes/osx-x64/native/libglfw.3.dylib

100755100644
File mode changed.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[*.cs]
2+
dotnet_style_qualification_for_field = false:warning
3+
dotnet_style_qualification_for_property = false:warning
4+
dotnet_style_qualification_for_method = false:warning
5+
dotnet_style_qualification_for_event = false:warning
6+
dotnet_style_require_accessibility_modifiers = never:warning
7+
8+
csharp_style_expression_bodied_methods = true:silent
9+
csharp_style_expression_bodied_properties = true:warning
10+
csharp_style_expression_bodied_indexers = true:warning
11+
csharp_style_expression_bodied_accessors = true:warning

0 commit comments

Comments
 (0)