Skip to content

This is the Silk.NET March 2022 Update (v2.14) #836

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

Merged
merged 26 commits into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3d8ca5f
Merge remote-tracking branch 'origin/main' into patch/2.14
Perksey Mar 12, 2022
f4dd07b
Upgrade Assimp, regenerate bindings, attempt to update assimp natives
Perksey Mar 12, 2022
a5900d8
Add workflow for assimp
Perksey Mar 12, 2022
c4be520
Actually make the assimp workflow run
Perksey Mar 12, 2022
a0b796e
Revert SilkTouch debug change
Perksey Mar 12, 2022
85e3b8b
PR the updated binary
Perksey Mar 12, 2022
c3aa709
Fix workflows(?), bin paths
Perksey Mar 12, 2022
4660f56
Add back the wildcards, they're not doing much harm
Perksey Mar 12, 2022
0b84b68
Fix Linux paths
Perksey Mar 12, 2022
e9d7bf4
Mac versioning scheme in Core.Loader, fix PR opening
Perksey Mar 12, 2022
26c22f6
Fix CI
Perksey Mar 12, 2022
b44de1e
Attempt to fix various native workflows
Perksey Mar 12, 2022
0687e5a
Merge remote-tracking branch 'origin/patch/2.14' into patch/2.14
Perksey Mar 12, 2022
4a7c8a3
Formatting
Perksey Mar 12, 2022
f0b01c3
Fix weird merge conflicts
Perksey Mar 12, 2022
78fe8bc
Update Assimp binaries (#839)
silkdotnet Mar 13, 2022
72b5cc7
Update SwiftShader binaries (#838)
silkdotnet Mar 13, 2022
979071b
Update Vulkan Loader binaries (#837)
silkdotnet Mar 13, 2022
f7a0b47
Update Build.Native.cs
Perksey Mar 13, 2022
6ec7e9d
New binaries for SwiftShader on Microsoft Windows 10.0.20348 (#842)
silkdotnet Mar 13, 2022
8bbf892
Update Assimp binaries (#841)
silkdotnet Mar 13, 2022
7b0f7ee
New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 (#840)
silkdotnet Mar 13, 2022
ff10ef3
Regenerate bindings, update patch notes
Perksey Mar 13, 2022
2a4fba9
Merge remote-tracking branch 'origin/patch/2.14' into patch/2.14
Perksey Mar 13, 2022
2ff1ac4
New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0:…
silkdotnet Mar 13, 2022
9f2fe2a
New binaries for ANGLE on Linux 5.11.0-1028-azure #31~20.04.2-Ubuntu …
silkdotnet Mar 13, 2022
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
3 changes: 2 additions & 1 deletion .github/workflows/SwiftShader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
name: Linux
nuke_invoke: ./build.sh
extras: |
sudo apt-get update
sudo apt-get install -y libx11-xcb-dev
- os: windows-latest
name: Windows
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Build SwiftShader
run: ${{ matrix.env.nuke_invoke }} SwiftShader
env:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/angle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ jobs:
name: Linux
nuke_invoke: ./build.sh
extras: |
sudo apt-get update
sudo apt-get remove php7.4-common
sudo apt-get install -y libx11-xcb-dev libapache2-mod-php7.4
- os: windows-latest
name: Windows
nuke_invoke: ./build.cmd
extras: ""
extras: |
pwsh build\Install-WindowsSDK.ps1
- os: macos-latest
name: Darwin
nuke_invoke: ./build.sh
Expand Down Expand Up @@ -53,7 +55,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Build ANGLE
run: ${{ matrix.env.nuke_invoke }} Angle
env:
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/assimp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Assimp
on:
push:
branches-ignore:
- "ci/*"
- "develop/*"
- "main"
paths:
- "build/submodules/Assimp"
- "build/nuke/Build.Native.cs"
jobs:
Build:
strategy:
fail-fast: false
matrix:
env:
- os: ubuntu-latest
name: Linux
nuke_invoke: ./build.sh
extras: |
sudo apt-get update
sudo apt-get install -y xorg-dev
- os: windows-latest
name: Windows
nuke_invoke: ./build.cmd
extras: ""
- os: macos-latest
name: Darwin
nuke_invoke: ./build.sh
extras: ""
name: ${{ matrix.env.name }} Build
runs-on: ${{ matrix.env.os }}
steps:
- uses: actions/checkout@v2
with:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git.
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
git config --local user.email "9011267+dotnet-bot@users.noreply.github.com"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
run: |
echo running extras
${{ matrix.env.extras }}
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.201
- name: Build Assimp
run: ${{ matrix.env.nuke_invoke }} assimp
env:
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Setup .NET 5.0
uses: actions/setup-dotnet@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Setup .NET 5.0
uses: actions/setup-dotnet@v1
with:
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/glfw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
name: Linux
nuke_invoke: ./build.sh
extras: |
sudo apt-get update
sudo apt-get install -y xorg-dev
- os: windows-latest
name: Windows
Expand All @@ -30,16 +31,23 @@ jobs:
runs-on: ${{ matrix.env.os }}
steps:
- uses: actions/checkout@v2
- name: Checkout submodules
with:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
git config --local user.email "9011267+dotnet-bot@users.noreply.github.com"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
run: |
echo running extras
${{ matrix.env.extras }}
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Build GLFW
run: ${{ matrix.env.nuke_invoke }} glfw
env:
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}

4 changes: 2 additions & 2 deletions .github/workflows/public-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Install Workloads for Restore
# TODO: This is slow. Maybe we can make a docker container with this already done?
run: dotnet workload install android android-aot ios maccatalyst maui
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Ship Public API
run: ./build.sh ShipApi
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Checkout Website Branch
run: |
git fetch --all
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/vulkan-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
name: Linux
nuke_invoke: ./build.sh
extras: |
sudo apt-get update
sudo apt-get install -y build-essential libx11-xcb-dev libxkbcommon-dev libwayland-dev libxrandr-dev
- os: windows-latest
name: Windows
Expand Down Expand Up @@ -52,7 +53,7 @@ jobs:
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 6.0.201
- name: Build Vulkan Loader
run: ${{ matrix.env.nuke_invoke }} VulkanLoader
env:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "build/submodules/GLFW"]
path = build/submodules/GLFW
url = https://github.com/glfw/glfw.git
[submodule "build/submodules/Assimp"]
path = build/submodules/Assimp
url = https://github.com/assimp/assimp
14 changes: 14 additions & 0 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,22 @@
"type": "string",
"enum": [
"Angle",
"Assimp",
"BuildLibSilkDroid",
"Clean",
"Compile",
"DeclareApi",
"EnsureApiDeclared",
"FullCompile",
"FullPack",
"FullPushToNuGet",
"GLFW",
"Pack",
"Prerequisites",
"PushToNuGet",
"RegenerateBindings",
"Restore",
"ShipApi",
"SignPackages",
"Sln",
"SwiftShader",
Expand All @@ -149,17 +154,22 @@
"type": "string",
"enum": [
"Angle",
"Assimp",
"BuildLibSilkDroid",
"Clean",
"Compile",
"DeclareApi",
"EnsureApiDeclared",
"FullCompile",
"FullPack",
"FullPushToNuGet",
"GLFW",
"Pack",
"Prerequisites",
"PushToNuGet",
"RegenerateBindings",
"Restore",
"ShipApi",
"SignPackages",
"Sln",
"SwiftShader",
Expand All @@ -178,6 +188,10 @@
"Quiet",
"Verbose"
]
},
"Warnings": {
"type": "boolean",
"description": "Outputs build warnings instead of keeping the MSBuild logging quiet with just errors"
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions build/Install-WindowsSDK.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

$WinSdkTempDir = "C:\WinSdkTemp\"
$WinSdkSetupExe = "C:\WinSdkTemp\" + "WinSdkSetup.exe"

mkdir $WinSdkTempDir

$client = [System.Net.WebClient]::new()
$client.DownloadFile("https://go.microsoft.com/fwlink/p/?linkid=2120843", $WinSdkSetupExe)

Start-Process -Wait $WinSdkSetupExe "/features+ /q"
Binary file modified build/cache/assimp.json.gz
Binary file not shown.
Binary file modified build/cache/cl.json.gz
Binary file not shown.
Binary file modified build/cache/d3d11.json.gz
Binary file not shown.
Binary file modified build/cache/gles2.json.gz
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
Binary file not shown.
Binary file modified build/cache/vulkan_video.json.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion build/nuke/Build.Core.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ partial class Build
.After(Clean)
.Executes
(
() => DotNetBuild
() => ErrorsOnly<DotNetBuildSettings>
(
s => s.SetProjectFile(Solution)
.SetConfiguration(Configuration)
Expand Down
Loading