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

* Upgrade Assimp, regenerate bindings, attempt to update assimp natives * Add workflow for assimp * Actually make the assimp workflow run * Revert SilkTouch debug change * PR the updated binary * Fix workflows(?), bin paths * Add back the wildcards, they're not doing much harm * Fix Linux paths * Mac versioning scheme in Core.Loader, fix PR opening * Fix CI * Attempt to fix various native workflows * Formatting * Fix weird merge conflicts * Update Assimp binaries (#839) * New binaries for Assimp on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 * New binaries for Assimp on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 * New binaries for Assimp on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 * New binaries for Assimp on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 Co-authored-by: runner <[email protected]> Co-authored-by: runner <[email protected]> Co-authored-by: The Silk.NET Automaton <[email protected]> * Update SwiftShader binaries (#838) * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 * New binaries for SwiftShader on Microsoft Windows 10.0.20348 Co-authored-by: The Silk.NET Automaton <[email protected]> * Update Vulkan Loader binaries (#837) * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 Co-authored-by: The Silk.NET Automaton <[email protected]> * Update Build.Native.cs * New binaries for SwiftShader on Microsoft Windows 10.0.20348 (#842) Co-authored-by: The Silk.NET Automaton <[email protected]> * Update Assimp binaries (#841) * New binaries for Assimp on Linux 5.11.0-1028-azure #31~20.04.2-Ubuntu SMP Tue Jan 18 08:46:15 UTC 2022 * New binaries for Assimp on Microsoft Windows 10.0.20348 Co-authored-by: The Silk.NET Automaton <[email protected]> * New binaries for Vulkan Loader on Microsoft Windows 10.0.20348 (#840) Co-authored-by: The Silk.NET Automaton <[email protected]> * Regenerate bindings, update patch notes * New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 (#844) Co-authored-by: The Silk.NET Automaton <[email protected]> * New binaries for ANGLE on Linux 5.11.0-1028-azure #31~20.04.2-Ubuntu SMP Tue Jan 18 08:46:15 UTC 2022 (#845) Co-authored-by: The Silk.NET Automaton <[email protected]> Co-authored-by: silkdotnet <[email protected]> Co-authored-by: runner <[email protected]> Co-authored-by: runner <[email protected]> Co-authored-by: The Silk.NET Automaton <[email protected]>
dotnet · Mar 15, 2022 · 36f3130 · 36f3130
1 parent bf3a2cb
commit 36f3130
Show file tree

Hide file tree

Showing 182 changed files with 6,270 additions and 23,432 deletions.
diff --git a/.github/workflows/SwiftShader.yml b/.github/workflows/SwiftShader.yml
@@ -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
@@ -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:

diff --git a/.github/workflows/angle.yml b/.github/workflows/angle.yml
@@ -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
@@ -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:

diff --git a/.github/workflows/assimp.yml b/.github/workflows/assimp.yml
@@ -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 "[email protected]"
+ 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 }}
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -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:

diff --git a/.github/workflows/glfw.yml b/.github/workflows/glfw.yml
@@ -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
@@ -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 "[email protected]"
+ 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 }}
+
diff --git a/.github/workflows/public-api.yml b/.github/workflows/public-api.yml
@@ -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
@@ -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:

diff --git a/.github/workflows/publish-site.yml b/.github/workflows/publish-site.yml
@@ -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

diff --git a/.github/workflows/vulkan-loader.yml b/.github/workflows/vulkan-loader.yml
@@ -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
@@ -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:

diff --git a/.gitmodules b/.gitmodules
@@ -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
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -118,6 +118,7 @@
  "type": "string",
  "enum": [
  "Angle",
+ "Assimp",
  "BuildLibSilkDroid",
  "Clean",
  "Compile",
@@ -153,6 +154,7 @@
  "type": "string",
  "enum": [
  "Angle",
+ "Assimp",
  "BuildLibSilkDroid",
  "Clean",
  "Compile",
@@ -186,6 +188,10 @@
  "Quiet",
  "Verbose"
  ]
+ },
+ "Warnings": {
+ "type": "boolean",
+ "description": "Outputs build warnings instead of keeping the MSBuild logging quiet with just errors"
  }
  }
  }

diff --git a/build/Install-WindowsSDK.ps1 b/build/Install-WindowsSDK.ps1
@@ -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"
diff --git a/build/cache/assimp.json.gz b/build/cache/assimp.json.gz
diff --git a/build/cache/cl.json.gz b/build/cache/cl.json.gz
diff --git a/build/cache/d3d11.json.gz b/build/cache/d3d11.json.gz
diff --git a/build/cache/gles2.json.gz b/build/cache/gles2.json.gz
diff --git a/build/cache/vulkan.json.gz b/build/cache/vulkan.json.gz
diff --git a/build/cache/vulkan_video.json.gz b/build/cache/vulkan_video.json.gz
diff --git a/build/nuke/Build.Core.cs b/build/nuke/Build.Core.cs
@@ -84,7 +84,7 @@ partial class Build
  .After(Clean)
  .Executes
  (
- () => DotNetBuild
+ () => ErrorsOnly<DotNetBuildSettings>
  (
  s => s.SetProjectFile(Solution)
  .SetConfiguration(Configuration)