Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Aragas committed Feb 4, 2023
1 parent 4fb2bae commit 9e68bbe
Show file tree
Hide file tree
Showing 53 changed files with 5,664 additions and 4,230 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/publish-native-ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ jobs:
uses: actions/setup-dotnet@master
with:
dotnet-version: 7.x.x
include-prerelease: true

- run: dotnet publish -r win-x64 --self-contained -c Debug src/FetchBannerlordVersion.Native
- run: dotnet publish -r win-x64 --self-contained -c Release src/FetchBannerlordVersion.Native

- run: dotnet test test/FetchBannerlordVersion.Native.Tests -c Debug
- run: dotnet test test/FetchBannerlordVersion.Native.Tests -c Release

- uses: actions/[email protected]
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:

jobs:
publish:
if: false # Something is wrong with IO
name: Publish on NPM and GPR
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,4 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
/src/FetchBannerlordVersion.Native/FetchBannerlordVersion.Native.h
13 changes: 13 additions & 0 deletions src/.idea/.idea.FetchBannerlordVersion/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/.idea/.idea.FetchBannerlordVersion/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/.idea/.idea.FetchBannerlordVersion/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/.idea/.idea.FetchBannerlordVersion/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/.idea/.idea.FetchBannerlordVersion/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 0 additions & 44 deletions src/FetchBannerlordVersion.Native.Tests/BindingsTest.cs

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion src/FetchBannerlordVersion.Native.TypeScript/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ coverage
*.tgz
*.log
FetchBannerlordVersion.Native.*
!FetchBannerlordVersion.Native.TypeScript.esproj
!FetchBannerlordVersion.Native.TypeScript.esproj
Common.Native.*
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/node_modules/node-addon-api",
"~/AppData/Local/node-gyp/Cache/16.16.0/include/node/"
]
}
Expand Down
66 changes: 64 additions & 2 deletions src/FetchBannerlordVersion.Native.TypeScript/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,67 @@
"cSpell.enabled": true,
"editor.formatOnSave": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
}
"typescript.enablePromptUseWorkspaceTsdk": true,
"files.associations": {
"atomic": "cpp",
"bit": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"concepts": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"exception": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"locale": "cpp",
"memory": "cpp",
"new": "cpp",
"ostream": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"utility": "cpp",
"xfacet": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xutility": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"list": "cpp",
"mutex": "cpp",
"ratio": "cpp",
"stop_token": "cpp",
"thread": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"xhash": "cpp"
}
}
13 changes: 8 additions & 5 deletions src/FetchBannerlordVersion.Native.TypeScript/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
"targets": [
{
"target_name": "fetchblversion",
"cflags!": [ "-fno-exceptions" ],
"cflags_cc!": [ "-fno-exceptions" ],
"sources": [
"<(module_root_dir)/src/main.cpp",
],
Expand All @@ -17,16 +15,21 @@
'dependencies': [
"<!(node -p \"require('node-addon-api').gyp\")"
],
'defines': [ 'NAPI_DISABLE_CPP_EXCEPTIONS' ],
'defines': [
'NAPI_CPP_EXCEPTIONS',
'_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING',

],
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': [
'/EHsc',
'/std:c++17',
],
'ExceptionHandling': 0,
'ExceptionHandling': 1,
'EnablePREfast': 'true',
}
},
}
]
}
}
Loading

0 comments on commit 9e68bbe

Please sign in to comment.