Watch
2
0
Fork
You've already forked raylib-cs
0

Merge branch 'master' into xmldoc

This commit is contained in:
Ben Parsons 2021-10-02 22:05:34 +10:00 committed by GitHub
commit d52b07e4d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 10 deletions

View file

@ -3,7 +3,7 @@ on:
push: push:
branches: master branches: master
pull_request: pull_request:
branches: master branches: '*'
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -23,3 +23,89 @@ jobs:
run: dotnet build -c Release run: dotnet build -c Release
- name: Test project - name: Test project
run: dotnet test run: dotnet test
publish:
name: Build Release Package
runs-on: ubuntu-latest
needs: build
steps:
- name: Download Repo
uses: actions/checkout@v2
- id: get-tag
name: Get Target Raylib Version
uses: mavrosxristoforos/get-xml-info@1.0
with:
xml-file: "./Raylib-cs/Raylib-cs.csproj"
xpath: "//TargetRaylibTag"
- name: echo tag
run: echo ${{ steps.get-tag.outputs.info }}
- name: Download raylib Release
uses: robinraju/release-downloader@v1.2
with:
repository: "raysan5/raylib"
tag: ${{ steps.get-tag.outputs.info }}
fileName: "*"
- name: extract win-x64
uses: montudor/action-zip@v1
with:
args: unzip -qq raylib-${{steps.get-tag.outputs.info}}_win64_msvc16.zip -d raylib-win64
- name: copy win-x64
uses: canastro/copy-file-action@master
with:
source: "raylib-win64/raylib-${{steps.get-tag.outputs.info}}_win64_msvc16/lib/raylib.dll"
target: "Raylib-cs/runtimes/win-x64/native/raylib.dll"
- name: extract win-x86
uses: montudor/action-zip@v1
with:
args: unzip -qq raylib-${{steps.get-tag.outputs.info}}_win32_msvc16.zip -d raylib-win86
- name: copy win-x86
uses: canastro/copy-file-action@master
with:
source: "raylib-win86/raylib-${{steps.get-tag.outputs.info}}_win32_msvc16/lib/raylib.dll"
target: "Raylib-cs/runtimes/win-x86/native/raylib.dll"
- name: extract linux-x64
run: mkdir -p raylib-linux64 && tar -xvf raylib-${{steps.get-tag.outputs.info}}_linux_amd64.tar.gz -C raylib-linux64
- name: copy linux-x64
uses: canastro/copy-file-action@master
with:
source: "raylib-linux64/raylib-${{steps.get-tag.outputs.info}}_linux_amd64/lib/libraylib.so.${{steps.get-tag.outputs.info}}"
target: "Raylib-cs/runtimes/linux-x64/native/libraylib.so"
- name: extract osx-x64
run: mkdir -p raylib-osx64 && tar -xvf raylib-${{steps.get-tag.outputs.info}}_macos.tar.gz -C raylib-osx64
- name: copy osx-x64
uses: canastro/copy-file-action@master
with:
source: "raylib-osx64/raylib-${{steps.get-tag.outputs.info}}_macos/lib/libraylib.dylib"
target: "Raylib-cs/runtimes/osx-x64/native/libraylib.dylib"
- id: get-nuget-version
name: Get NuGet Package Version
uses: mavrosxristoforos/get-xml-info@1.0
with:
xml-file: "./Raylib-cs/Raylib-cs.csproj"
xpath: "//PackageVersion"
- name: Create NuGet Package
run: dotnet pack -c Release
- name: Upload NuGet Package As Artifact
uses: actions/upload-artifact@v2
with:
name: Raylib-cs.${{steps.get-nuget-version.outputs.info}}.nupkg
path: Raylib-cs/bin/Release/Raylib-cs.${{steps.get-nuget-version.outputs.info}}.nupkg
- name: Upload NuGet Package As Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: Raylib-cs/bin/Release/Raylib-cs.${{steps.get-nuget-version.outputs.info}}.nupkg

View file

@ -7,9 +7,11 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoWarn>$(NoWarn);1591</NoWarn> <NoWarn>$(NoWarn);1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<TargetRaylibTag>3.7.0</TargetRaylibTag>
<Version>3.7.0</Version> <Version>3.7.0</Version>
<PackageVersion>3.7.0</PackageVersion> <PackageVersion>3.7.0</PackageVersion>
<Authors>Chris Dill, Raysan5 &amp; Others</Authors> <Authors>Chris Dill, Raysan5 &amp; Others</Authors>

View file

@ -1298,7 +1298,7 @@ namespace Raylib_cs
MATERIAL_MAP_OCCLUSION, MATERIAL_MAP_OCCLUSION,
MATERIAL_MAP_EMISSION, MATERIAL_MAP_EMISSION,
MATERIAL_MAP_HEIGHT, MATERIAL_MAP_HEIGHT,
MATERIAL_MAP_BRDF,
/// <summary> /// <summary>
/// NOTE: Uses GL_TEXTURE_CUBE_MAP /// NOTE: Uses GL_TEXTURE_CUBE_MAP
/// </summary> /// </summary>
@ -1313,7 +1313,6 @@ namespace Raylib_cs
/// NOTE: Uses GL_TEXTURE_CUBE_MAP /// NOTE: Uses GL_TEXTURE_CUBE_MAP
/// </summary> /// </summary>
MATERIAL_MAP_PREFILTER, MATERIAL_MAP_PREFILTER,
MATERIAL_MAP_BRDF,
MATERIAL_MAP_DIFFUSE = MATERIAL_MAP_ALBEDO, MATERIAL_MAP_DIFFUSE = MATERIAL_MAP_ALBEDO,
MATERIAL_MAP_SPECULAR = MATERIAL_MAP_METALNESS, MATERIAL_MAP_SPECULAR = MATERIAL_MAP_METALNESS,
@ -1555,32 +1554,32 @@ namespace Raylib_cs
/// <summary> /// <summary>
/// Automatically detect layout type /// Automatically detect layout type
/// </summary> /// </summary>
CUBEMAP_AUTO_DETECT = 0, CUBEMAP_LAYOUT_AUTO_DETECT = 0,
/// <summary> /// <summary>
/// Layout is defined by a vertical line with faces /// Layout is defined by a vertical line with faces
/// </summary> /// </summary>
CUBEMAP_LINE_VERTICAL, CUBEMAP_LAYOUT_LINE_VERTICAL,
/// <summary> /// <summary>
/// Layout is defined by an horizontal line with faces /// Layout is defined by an horizontal line with faces
/// </summary> /// </summary>
CUBEMAP_LINE_HORIZONTAL, CUBEMAP_LAYOUT_LINE_HORIZONTAL,
/// <summary> /// <summary>
/// Layout is defined by a 3x4 cross with cubemap faces /// Layout is defined by a 3x4 cross with cubemap faces
/// </summary> /// </summary>
CUBEMAP_CROSS_THREE_BY_FOUR, CUBEMAP_LAYOUT_CROSS_THREE_BY_FOUR,
/// <summary> /// <summary>
/// Layout is defined by a 4x3 cross with cubemap faces /// Layout is defined by a 4x3 cross with cubemap faces
/// </summary> /// </summary>
CUBEMAP_CROSS_FOUR_BY_THREE, CUBEMAP_LAYOUT_CROSS_FOUR_BY_THREE,
/// <summary> /// <summary>
/// Layout is defined by a panorama image (equirectangular map) /// Layout is defined by a panorama image (equirectangular map)
/// </summary> /// </summary>
CUBEMAP_PANORAMA CUBEMAP_LAYOUT_PANORAMA
} }
/// <summary>Font type, defines generation method</summary> /// <summary>Font type, defines generation method</summary>
@ -2440,7 +2439,7 @@ namespace Raylib_cs
/// <summary>Get latest detected gesture</summary> /// <summary>Get latest detected gesture</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
public static extern int GetGestureDetected(); public static extern Gestures GetGestureDetected();
/// <summary>Get touch points count</summary> /// <summary>Get touch points count</summary>
[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)] [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]