Skip to content
This repository has been archived by the owner on Oct 8, 2023. It is now read-only.

Commit

Permalink
Update for NuGet packages
Browse files Browse the repository at this point in the history
  • Loading branch information
lithiumtoast committed Aug 6, 2023
1 parent 281f6fa commit 8489ad2
Show file tree
Hide file tree
Showing 67 changed files with 507 additions and 182 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bindgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: "bindgen-cs-core"
path: "./src/cs/production/Flecs.Core/Generated"
path: "./src/cs/production/Interop.Flecs.Core/Generated"

- name: "Upload generated C# code: Unity"
uses: actions/upload-artifact@v2
with:
name: "bindgen-cs-unity"
path: "./src/cs/production/Flecs.Unity/Generated"
path: "./src/cs/production/Interop.Flecs.Unity/Generated"
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ jobs:
continue-on-error: true
with:
name: "bindgen-cs-core"
path: "./src/cs/production/Flecs.Core/Generated"
path: "./src/cs/production/Interop.Flecs.Core/Generated"

- name: "Download generated C# code: Unity"
uses: actions/download-artifact@v1
continue-on-error: true
with:
name: "bindgen-cs-unity"
path: "./src/cs/production/Flecs.Unity/Generated"
path: "./src/cs/production/Interop.Flecs.Unity/Generated"

- name: ".NET Build"
run: dotnet build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
uses: actions/download-artifact@v3
with:
name: "bindgen-cs-core"
path: "./src/cs/production/Flecs.Core/Generated"
path: "./src/cs/production/Interop.Flecs.Core/Generated"

- name: "Download changes to commit: Unity"
uses: actions/download-artifact@v3
with:
name: "bindgen-cs-unity"
path: "./src/cs/production/Flecs.Unity/Generated"
path: "./src/cs/production/Inteorp.Flecs.Unity/Generated"

- name: "Echo download path"
run: echo ${{steps.download.outputs.download-path}}
Expand Down
File renamed without changes.
83 changes: 83 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: "Release"
on:
workflow_dispatch:
inputs:
pre-release:
description: 'Is this a release candidate (pre-release)? (NOTE: candidates get uploaded to MyGet.org instead of NuGet.org)'
required: true
default: 'true'
schedule:
- cron: "0 0 1 * *" # First day of every month

jobs:

build-job:
name: "Build"
uses: "./.github/workflows/build.yml"

release-job:
name: "Release"
needs: [build-job]
runs-on: ubuntu-latest
permissions:
contents: write
steps:

- name: "Clone Git repository"
uses: actions/checkout@master
with:
submodules: "recursive"

- name: "Set version"
id: set-version
shell: bash
run: |
IS_PRERELEASE="${{ github.event.inputs.pre-release }}"
if [[ "$IS_PRERELEASE" = "true" ]]; then
VERSION="$(date +'%Y.%m.%d')-rc"
else
VERSION="$(date +'%Y.%m.%d')"
fi
echo "VERSION=$VERSION"
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
- name: "Download native libraries (win-x64)"
uses: actions/download-artifact@v1
with:
name: "native-libraries-win-x64"
path: "./lib"

- name: "Download native libraries (osx)"
uses: actions/download-artifact@v1
with:
name: "native-libraries-osx"
path: "./lib"

- name: "Download native libraries (linux-x64)"
uses: actions/download-artifact@v1
with:
name: "native-libraries-linux-x64"
path: "./lib"

- name: ".NET pack"
run: dotnet pack "./src/cs" --nologo --verbosity minimal --configuration Release -p:PackageVersion="${{ steps.set-version.outputs.VERSION }}" -p:RepositoryBranch="${{ github.head_ref || github.ref_name }}" -p:RepositoryCommit="${{ github.sha }}"

- name: "Upload packages to MyGet"
if: github.event_name == 'workflow_dispatch' && github.event.inputs.pre-release == 'true'
env:
MYGET_ACCESS_TOKEN: ${{ secrets.MYGET_ACCESS_TOKEN }}
run: dotnet nuget push "./nupkg/**/*.nupkg" --source https://www.myget.org/F/bottlenoselabs/api/v3/index.json --skip-duplicate --api-key $MYGET_ACCESS_TOKEN

- name: "Upload packages to NuGet"
if: github.event_name == 'schedule' || github.event.inputs.pre-release == 'false'
env:
NUGET_ACCESS_TOKEN: ${{ secrets.NUGET_ACCESS_TOKEN }}
run: dotnet nuget push "./nupkg/**/*.nupkg" --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key $NUGET_ACCESS_TOKEN

- name: "Create tag and GitHub release"
uses: softprops/action-gh-release@v1
if: github.event_name == 'schedule' || github.event.inputs.pre-release == 'false'
with:
generate_release_notes: true
prerelease: "{{ github.event.inputs.pre-release == 'true' }}"
tag_name: "v${{ steps.set-version.outputs.VERSION }}"
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# JetBrains
/.idea/
.idea/

# VisualStudio
.suo
Expand All @@ -8,6 +8,7 @@
# C# build artifacts
bin/
obj/
/artifacts/

# C# packages
/nupkg/
Expand Down
2 changes: 1 addition & 1 deletion bindgen/config-generate-cs-core.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"inputFilePath": "./x-ast/ast-cross-platform.json",
"outputFileDirectory": "./../src/cs/production/Flecs.Core/Generated",
"outputFileDirectory": "./../src/cs/production/Interop.Flecs.Core/Generated",
"namespaceName": "flecs_hub",
"className": "flecs",
"isEnabledGeneratingRuntimeCode": false,
Expand Down
2 changes: 1 addition & 1 deletion bindgen/config-generate-cs-unity.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"inputFilePath": "./x-ast/ast-cross-platform.json",
"outputFileDirectory": "./../src/cs/production/Flecs.Unity/Generated",
"outputFileDirectory": "./../src/cs/production/Interop.Flecs.Unity/Generated",
"namespaceName": "flecs_hub",
"className": "flecs",
"isEnabledGeneratingRuntimeCode": false,
Expand Down
31 changes: 0 additions & 31 deletions src/cs/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<Project>

<!-- Implicit global usings-->
<ItemGroup Condition=" '$(ImplicitUsings)' == 'true' ">
<Using Include="System.Runtime.InteropServices" />
<Using Include="flecs_hub" />
<Using Include="flecs_hub.flecs" Static="true" />
<Using Include="bottlenoselabs.C2CS" />
</ItemGroup>

<!-- .NET8: Use artifacts path for bin/obj output folders -->
<PropertyGroup>
<UseArtifactsOutput>true</UseArtifactsOutput>
Expand All @@ -25,29 +17,6 @@
</PackageReference>
</ItemGroup>

<!-- Dynamic link libraries -->
<PropertyGroup>
<LibraryName>flecs</LibraryName>
<LibraryDirectoryPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),.gitignore))/lib</LibraryDirectoryPath>
</PropertyGroup>
<ItemGroup>
<Content Include="$(LibraryDirectoryPath)/*.dll">
<Link>%(Filename)%(Extension)</Link>
<Pack>false</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(LibraryDirectoryPath)/*.dylib">
<Link>%(Filename)%(Extension)</Link>
<Pack>false</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(LibraryDirectoryPath)/*.so">
<Link>%(Filename)%(Extension)</Link>
<Pack>false</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<!-- bottlenose.Common.Tools project settings -->
<PropertyGroup>
<StyleCopSettingsFilePath>$(MSBuildThisFileDirectory)StyleCop.json</StyleCopSettingsFilePath>
Expand Down
61 changes: 48 additions & 13 deletions flecs.sln → src/cs/Flecs.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,47 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{9E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Production", "Production", "{39423871-7923-4AFB-A756-35E17FCBA274}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Core", "src\cs\production\Flecs.Core\Flecs.Core.csproj", "{5EB4443F-134E-43A0-9607-9F3504671E47}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Core", "production\Flecs.Core\Flecs.Core.csproj", "{5EB4443F-134E-43A0-9607-9F3504671E47}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Entities", "Entities", "{3DA02832-2DA5-49CC-929D-6DB290DA28EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.HelloWorld", "src\cs\examples\Flecs.Examples.HelloWorld\Flecs.Examples.HelloWorld.csproj", "{E5E0E0A5-DF34-403B-A2BD-93EFF21C4825}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.HelloWorld", "examples\Flecs.Examples.HelloWorld\Flecs.Examples.HelloWorld.csproj", "{E5E0E0A5-DF34-403B-A2BD-93EFF21C4825}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Hierarchy", "src\cs\examples\entities\Flecs.Examples.Entities.Hierarchy\Flecs.Examples.Entities.Hierarchy.csproj", "{603A7B38-8FEF-45A6-8EA7-1AE82D9504C4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Hierarchy", "examples\entities\Flecs.Examples.Entities.Hierarchy\Flecs.Examples.Entities.Hierarchy.csproj", "{603A7B38-8FEF-45A6-8EA7-1AE82D9504C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Basics", "src\cs\examples\entities\Flecs.Examples.Entities.Basics\Flecs.Examples.Entities.Basics.csproj", "{5B604D6C-EDC7-4D7F-8CF4-D368CAE30A37}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Basics", "examples\entities\Flecs.Examples.Entities.Basics\Flecs.Examples.Entities.Basics.csproj", "{5B604D6C-EDC7-4D7F-8CF4-D368CAE30A37}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Hooks", "src\cs\examples\entities\Flecs.Examples.Entities.Hooks\Flecs.Examples.Entities.Hooks.csproj", "{CA4D5654-1D45-442E-9C18-F93B1F670263}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Hooks", "examples\entities\Flecs.Examples.Entities.Hooks\Flecs.Examples.Entities.Hooks.csproj", "{CA4D5654-1D45-442E-9C18-F93B1F670263}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.IterateComponents", "src\cs\examples\entities\Flecs.Examples.Entities.IterateComponents\Flecs.Examples.Entities.IterateComponents.csproj", "{449DE999-B69C-43D7-9848-0F4BDE7CCC24}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.IterateComponents", "examples\entities\Flecs.Examples.Entities.IterateComponents\Flecs.Examples.Entities.IterateComponents.csproj", "{449DE999-B69C-43D7-9848-0F4BDE7CCC24}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Prefab", "src\cs\examples\entities\Flecs.Examples.Entities.Prefab\Flecs.Examples.Entities.Prefab.csproj", "{D298B204-9318-44F9-9330-A1EFAADCD205}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.Prefab", "examples\entities\Flecs.Examples.Entities.Prefab\Flecs.Examples.Entities.Prefab.csproj", "{D298B204-9318-44F9-9330-A1EFAADCD205}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.RelationComponents", "src\cs\examples\entities\Flecs.Examples.Entities.RelationComponents\Flecs.Examples.Entities.RelationComponents.csproj", "{63057DDB-7E98-465D-91AE-396037A0B282}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.RelationComponents", "examples\entities\Flecs.Examples.Entities.RelationComponents\Flecs.Examples.Entities.RelationComponents.csproj", "{63057DDB-7E98-465D-91AE-396037A0B282}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.RelationBasic", "src\cs\examples\entities\Flecs.Examples.Entities.RelationBasic\Flecs.Examples.Entities.RelationBasic.csproj", "{EC0A2533-C10C-412F-8D98-7B37AB53FA28}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.RelationBasic", "examples\entities\Flecs.Examples.Entities.RelationBasic\Flecs.Examples.Entities.RelationBasic.csproj", "{EC0A2533-C10C-412F-8D98-7B37AB53FA28}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Queries", "Queries", "{04650426-AD83-4E99-B211-3C70309C6FCF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Queries.OptionalOr", "src\cs\examples\queries\Flecs.Examples.Queries.OptionalOr\Flecs.Examples.Queries.OptionalOr.csproj", "{4A8057DB-51F1-4BDB-B40C-1EAAD4620234}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Queries.OptionalOr", "examples\queries\Flecs.Examples.Queries.OptionalOr\Flecs.Examples.Queries.OptionalOr.csproj", "{4A8057DB-51F1-4BDB-B40C-1EAAD4620234}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.PrefabSlot", "src\cs\examples\entities\Flecs.Examples.Entities.PrefabSlot\Flecs.Examples.Entities.PrefabSlot.csproj", "{B8C4D7B7-45C4-46A8-8C7E-03C36F5949B2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Entities.PrefabSlot", "examples\entities\Flecs.Examples.Entities.PrefabSlot\Flecs.Examples.Entities.PrefabSlot.csproj", "{B8C4D7B7-45C4-46A8-8C7E-03C36F5949B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Systems", "Systems", "{36062DD2-C7DC-4074-B1EC-218636DD4B76}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Systems.CustomPhase", "src\cs\examples\systems\Flecs.Examples.Systems.CustomPhase\Flecs.Examples.Systems.CustomPhase.csproj", "{81CFEB14-4C31-4CEF-BE4B-B281EC42D060}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flecs.Examples.Systems.CustomPhase", "examples\systems\Flecs.Examples.Systems.CustomPhase\Flecs.Examples.Systems.CustomPhase.csproj", "{81CFEB14-4C31-4CEF-BE4B-B281EC42D060}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flecs.Unity", "src\cs\production\Flecs.Unity\Flecs.Unity.csproj", "{45B80105-C0E9-42E0-9D70-D42B65958262}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flecs.Unity", "production\Flecs.Unity\Flecs.Unity.csproj", "{45B80105-C0E9-42E0-9D70-D42B65958262}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.Flecs.Core", "production\Interop.Flecs.Core\Interop.Flecs.Core.csproj", "{1C5CE028-B4F3-4D18-9BF5-8785103B6138}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.Flecs.Unity", "production\Interop.Flecs.Unity\Interop.Flecs.Unity.csproj", "{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.Flecs.runtime.linux-x64", "production\Interop.Flecs.runtime.linux-x64\Interop.Flecs.runtime.linux-x64.csproj", "{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.Flecs.runtime.osx", "production\Interop.Flecs.runtime.osx\Interop.Flecs.runtime.osx.csproj", "{BFC9867A-C542-401D-AF76-7094D3D4261A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop.Flecs.runtime.win-x64", "production\Interop.Flecs.runtime.win-x64\Interop.Flecs.runtime.win-x64.csproj", "{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -97,6 +107,26 @@ Global
{45B80105-C0E9-42E0-9D70-D42B65958262}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45B80105-C0E9-42E0-9D70-D42B65958262}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45B80105-C0E9-42E0-9D70-D42B65958262}.Release|Any CPU.Build.0 = Release|Any CPU
{1C5CE028-B4F3-4D18-9BF5-8785103B6138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C5CE028-B4F3-4D18-9BF5-8785103B6138}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C5CE028-B4F3-4D18-9BF5-8785103B6138}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C5CE028-B4F3-4D18-9BF5-8785103B6138}.Release|Any CPU.Build.0 = Release|Any CPU
{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA}.Release|Any CPU.Build.0 = Release|Any CPU
{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00}.Release|Any CPU.Build.0 = Release|Any CPU
{BFC9867A-C542-401D-AF76-7094D3D4261A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFC9867A-C542-401D-AF76-7094D3D4261A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFC9867A-C542-401D-AF76-7094D3D4261A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFC9867A-C542-401D-AF76-7094D3D4261A}.Release|Any CPU.Build.0 = Release|Any CPU
{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -118,6 +148,11 @@ Global
{36062DD2-C7DC-4074-B1EC-218636DD4B76} = {9E1476CE-E22E-44FD-ABC4-93625DDBBA99}
{81CFEB14-4C31-4CEF-BE4B-B281EC42D060} = {36062DD2-C7DC-4074-B1EC-218636DD4B76}
{45B80105-C0E9-42E0-9D70-D42B65958262} = {39423871-7923-4AFB-A756-35E17FCBA274}
{1C5CE028-B4F3-4D18-9BF5-8785103B6138} = {39423871-7923-4AFB-A756-35E17FCBA274}
{26B6B8F0-2CAE-4DFC-9F79-9313682F10BA} = {39423871-7923-4AFB-A756-35E17FCBA274}
{B6EA6A81-D9D9-4B20-B897-7A8DED05CB00} = {39423871-7923-4AFB-A756-35E17FCBA274}
{BFC9867A-C542-401D-AF76-7094D3D4261A} = {39423871-7923-4AFB-A756-35E17FCBA274}
{F205AFC3-2ED6-4F65-BD63-7077F3CE07C0} = {39423871-7923-4AFB-A756-35E17FCBA274}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C4B6B4B9-1CB6-414C-BF33-521394D6CD71}
Expand Down
2 changes: 0 additions & 2 deletions flecs.sln.DotSettings → src/cs/Flecs.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Bindgen/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Deconstructor/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Flecs/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
3 changes: 3 additions & 0 deletions src/cs/Flecs.sln.DotSettings.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">VISIBLE_FILES</s:String>
</wpf:ResourceDictionary>
11 changes: 11 additions & 0 deletions src/cs/examples/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,15 @@

<Import Project="../Directory.Build.props" />

<!-- Project references -->
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)../production/Flecs.Core/Flecs.Core.csproj" />
<ProjectReference
Include="$(MSBuildThisFileDirectory)../production/Interop.Flecs.runtime.linux-x64/Interop.Flecs.runtime.linux-x64.csproj" />
<ProjectReference
Include="$(MSBuildThisFileDirectory)../production/Interop.Flecs.runtime.osx/Interop.Flecs.runtime.osx.csproj" />
<ProjectReference
Include="$(MSBuildThisFileDirectory)../production/Interop.Flecs.runtime.win-x64/Interop.Flecs.runtime.win-x64.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,4 @@
<ImplicitUsings>true</ImplicitUsings>
</PropertyGroup>

<!-- Project references -->
<ItemGroup>
<ProjectReference Include="..\..\production\Flecs.Core\Flecs.Core.csproj" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions src/cs/examples/Flecs.Examples.HelloWorld/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Flecs Hub (https://github.com/flecs-hub). All rights reserved.
// Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.

using System.Runtime.InteropServices;

namespace Flecs.Examples.HelloWorld;

[StructLayout(LayoutKind.Sequential)]
Expand Down
2 changes: 1 addition & 1 deletion src/cs/examples/entities/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>

<Import Project="$(MSBuildThisFileDirectory)/../Directory.Build.props" />
<Import Project="../Directory.Build.props" />

</Project>
Loading

0 comments on commit 8489ad2

Please sign in to comment.