Skip to content

Commit d986a03

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

File tree

69 files changed

+5990
-111
lines changed

Some content is hidden

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

69 files changed

+5990
-111
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
if-no-files-found: warn
4545
retention-days: 1
4646
- name: Push to NuGet
47-
run: nuke PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}"
47+
run: nuke SignPackages PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}"
4848
- name: Upload Signed Artifacts to Actions
4949
uses: actions/[email protected]
5050
with:

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ partial class Build
2525

2626
Target PushToNuGet => CommonTarget
2727
(
28-
x => x.DependsOn(CanCodeSign ? new[] { Pack } : new[] { Pack, SignPackages })
28+
x => x.DependsOn(Pack)
29+
.After(SignPackages)
2930
.Executes(PushPackages)
3031
);
3132

0 commit comments

Comments
 (0)