Skip to content

Commit 91be889

Browse files
committed
This is the December 2021 Update (v2.11.0) (#712)
* Regenerate bindings * Release notes * Apply duct tape
1 parent 5909972 commit 91be889

File tree

68 files changed

+5988
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5988
-110
lines changed

build/cache/cl.json.gz

27.2 KB
Binary file not shown.

build/cache/gl.json.gz

0 Bytes
Binary file not shown.

build/cache/glcore.json.gz

0 Bytes
Binary file not shown.

build/cache/gles2.json.gz

517 Bytes
Binary file not shown.

build/cache/openxr.json.gz

158 Bytes
Binary file not shown.

build/cache/vulkan.json.gz

1.52 KB
Binary file not shown.

build/csharp_typemap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,6 @@
165165
"LONG_PTR": "nint",
166166
"_screen_window": "void",
167167
"_screen_context": "void",
168-
"int16_t": "short"
168+
"int16_t": "short",
169+
"cl_properties": "ulong"
169170
}

build/nuke/Build.CodeSigning.cs

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Nuke.Common.Tools.DotNet;
1111
using Nuke.Common.Tools.SignClient;
1212
using static Nuke.Common.Tools.DotNet.DotNetTasks;
13-
using static Nuke.Common.Tools.SignClient.SignClientTasks;
13+
using static Nuke.Common.Tooling.ProcessTasks;
1414

1515
partial class Build
1616
{
@@ -51,19 +51,47 @@ partial class Build
5151
(
5252
outputs, (current, pkg) => current.Concat
5353
(
54-
SignClientSign
54+
// TODO this doesn't work for some reason
55+
// > C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\tool\SignClient.exe sign \
56+
// --config C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\config.json \
57+
// --input C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\output_packages\Silk.NET.2.11.0.nupkg \
58+
// --baseDirectory C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\output_packages \
59+
// --fileList C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\filelist.txt \
60+
// --secret [hidden] \
61+
// --user *** \
62+
// --name Silk.NET \
63+
// --description Silk.NET \
64+
// --descriptionUrl https://github.com/dotnet/Silk.NET
65+
// @ C:\Users\perks\Documents\_Silk.NET\Silk.NET
66+
// Error output:
67+
// --name parameter is required
68+
// SignClientSign
69+
// (
70+
// s => s.SetProcessToolPath(execPath)
71+
// .SetBaseDirectory(PackageDirectory)
72+
// .SetInput(pkg)
73+
// .SetConfig(basePath / "config.json")
74+
// .SetFileList(basePath / "filelist.txt")
75+
// .SetUsername(SignUsername)
76+
// .SetSecret(SignPassword)
77+
// .SetName("Silk.NET")
78+
// .SetDescription("Silk.NET")
79+
// .SetDescriptionUrl("https://github.com/dotnet/Silk.NET")
80+
// )
81+
StartProcess
5582
(
56-
s => s.SetProcessToolPath(execPath)
57-
.SetBaseDirectory(PackageDirectory)
58-
.SetInput(pkg)
59-
.SetConfig(basePath / "config.json")
60-
.SetFileList(basePath / "filelist.txt")
61-
.SetUsername(SignUsername)
62-
.SetSecret(SignPassword)
63-
.SetName("Silk.NET")
64-
.SetDescription("Silk.NET")
65-
.SetDescriptionUrl("https://github.com/dotnet/Silk.NET")
66-
)
83+
execPath,
84+
"sign " +
85+
$"--baseDirectory {PackageDirectory} " +
86+
$"--input \"{pkg}\" " +
87+
$"--config \"{basePath / "config.json"}\" " +
88+
$"--filelist \"{basePath / "filelist.txt"}\" " +
89+
$"--user \"{SignUsername}\" " +
90+
$"--secret \"{SignPassword}\" " +
91+
"--name \"Silk.NET\" " +
92+
"--description \"Silk.NET\" " +
93+
"--descriptionUrl \"https://github.com/dotnet/Silk.NET\""
94+
).AssertZeroExitCode().Output
6795
)
6896
);
6997
}

build/nuke/Build.NuGet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ partial class Build
2525

2626
Target PushToNuGet => CommonTarget
2727
(
28-
x => x.DependsOn(CanCodeSign ? new[] { Pack } : new[] { Pack, SignPackages })
28+
x => x.DependsOn(CanCodeSign ? new[] { Pack, SignPackages } : new[] { Pack })
2929
.Executes(PushPackages)
3030
);
3131

build/props/common.props

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,25 @@
55
<LangVersion>preview</LangVersion>
66
<Authors>.NET Foundation and Contributors</Authors>
77
<PackageReleaseNotes>
8-
Silk.NET .NET Conf 2021 Update
8+
Silk.NET December 2021 Update
99

10-
- Fixes issues with 2.10 (compiled against .NET 6 RC1) not working correctly in projects using the .NET 6 Release SDK.
10+
- Add a high-level C# wrapper over Vulkan Structure Chains (thanks @thargy).
11+
- Add a WindowClass option in Windowing for setting the X11 class name (thanks @Pydacor)
12+
- Add a IsContextControlDisabled option in Windowing to disable automatically making OpenGL contexts current
13+
- Add support for cloning Vk objects to allow reuse of their function tables independently
14+
- Update to latest OpenCL specifications
15+
- Update to latest OpenGL and OpenGLES specifications
16+
- Update to Vulkan 1.2.210
17+
- Fix string marshalling regression which resulted in multiple string-overloaded functions throwing
18+
- Fix multiple input-related problems when using the SDL backend of our Windowing abstractions
19+
- Discontinued support for Legacy Xamarin (exclusively supporting .NET 6 mobile from now on)
1120
</PackageReleaseNotes>
1221
<PackageTags Condition="'$(PackageTags)' == ''">OpenCL;OpenGL;OpenAL;OpenGLES;GLES;Vulkan;Assimp;DirectX;GLFW;SDL;Windowing;Input;Gamepad;Joystick;Keyboard;Mouse;SilkTouch;Source;Generator;C#;F#;.NET;DotNet;Mono;Vector;Math;Maths;Numerics;Game;Graphics;Compute;Audio;Sound;Engine;Silk;Silk.NET;Slim.NET;ElgarTK;GPU;Sharp;Science;Scientific;Visualization;Visual;Audiovisual;Windows;macOS;Linux;Android;Bindings;OSX;Wrapper;Native</PackageTags>
1322
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1423
<PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
1524
<RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
1625
<RepositoryType>Git</RepositoryType>
17-
<VersionPrefix>2.10.1</VersionPrefix>
26+
<VersionPrefix>2.11</VersionPrefix>
1827
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
1928
<Description Condition="'$(Description)' == ''">
2029
Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL, OpenCL, OpenAL, OpenXR, GLFW, SDL, Vulkan, Assimp, and DirectX.

0 commit comments

Comments
 (0)