Skip to content
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

Restructure the C# bindings for Yoga to be based on .NET Standard 2.0 and the new .NET 6.0+ target platform work. #1207

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
da3d65e
Restructure the C# bindings for Yoga to be based on .NET Standard 2.0…
jkoritzinsky Dec 27, 2022
3311ec0
Remove usages of YogaNode.GetInstanceCount
jkoritzinsky Dec 29, 2022
e38554a
Merge branch 'main' of github.com:facebook/yoga into csharp-refresh
jkoritzinsky Dec 29, 2022
4a2d8a9
Update to v143 toolset and make library always compile as a DLL. Set …
jkoritzinsky Jan 3, 2023
3d4eed2
Create new sln file
jkoritzinsky Jan 5, 2023
9ec47c2
Move the C++ build for the .NET packages over to a rudimentary CMake …
jkoritzinsky Jan 5, 2023
7a2f5ad
Add GitHub workflow and enable linux-x64 build
jkoritzinsky Jan 5, 2023
763ebb2
Fix indentation
jkoritzinsky Jan 5, 2023
26150b5
Install workloads and fix Build Native Components to actually build o…
jkoritzinsky Jan 7, 2023
9d213ed
Apply suggestions from code review
jkoritzinsky Jan 7, 2023
6e57851
Refactor C# setup steps into separate action
jkoritzinsky Jan 7, 2023
33a7ab0
Apply suggestions from code review
jkoritzinsky Jan 7, 2023
fb1bd56
Specify package license expression
jkoritzinsky Jan 7, 2023
aa8be68
Update .github/actions/setup-cs/action.yml
NickGerleman Jan 7, 2023
5865969
Update csharp/Yoga/CMakeLists.txt
NickGerleman Jan 7, 2023
caa77f3
Apply suggestions from code review
NickGerleman Jan 7, 2023
7540adb
Fix path for Facebook.YogaKit.Tests.csproj reference to native tools
jkoritzinsky Jan 7, 2023
c04e454
Use primarily osx and windows as the build machines for C# as that's …
jkoritzinsky Jan 7, 2023
1ebb3c4
Remove net6.0-ios target for Facebook.Yoga.csproj and shift to using …
jkoritzinsky Jan 8, 2023
eaa081d
Add global.json to scope the .NET SDK discovery behavior to the SDK v…
jkoritzinsky Jan 8, 2023
bb3979c
Remove stale files
NickGerleman Jan 8, 2023
85a7ef2
Merge branch 'csharp-refresh' of https://github.com/jkoritzinsky/yoga…
NickGerleman Jan 8, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 77 additions & 0 deletions .github/workflows/validate-csharp.yml
@@ -0,0 +1,77 @@
name: CSharp

on:
pull_request:
push:
branches:
- main
workflow_dispatch:

env:
FORCE_COLOR: 3

jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
jobs:
test:
name: Test [${{ matrix.os }}]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v3

- name: Setup .NET
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Restore Workloads
run: dotnet workload restore
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved

- name: dotnet test Facebook.Yoga.Tests
run: dotnet test
working-directory: csharp/tests/Facebook.Yoga.Tests

build:
name: Build and Package [${{ matrix.os }}]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest]
steps:
- uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Restore Workloads
run: dotnet workload restore

- name: dotnet pack
run: dotnet pack -c Release
working-directory: csharp

build-native:
name: Build Native Components [${{ matrix.os }}]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: windows-latest
rid: win-x64
- os: ubuntu-latest
rid: linux-x64
NickGerleman marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x

- name: Build Native Components
run: dotnet build -c Release -r ${{ matrix.rid }}
working-directory: csharp/Yoga

3 changes: 3 additions & 0 deletions csharp/.gitignore
Expand Up @@ -270,3 +270,6 @@ __pycache__/

# local buck build
lib/

binnative/
*.binlog
1 change: 0 additions & 1 deletion csharp/Android/.gitignore

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions csharp/Android/Facebook.Yoga.Android.Tests/MainActivity.cs

This file was deleted.

This file was deleted.

Empty file.
33 changes: 0 additions & 33 deletions csharp/Android/Facebook.Yoga.Android.sln

This file was deleted.

20 changes: 0 additions & 20 deletions csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets

This file was deleted.

64 changes: 0 additions & 64 deletions csharp/Android/Facebook.Yoga.Android/Facebook.Yoga.Android.csproj

This file was deleted.

Empty file.