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

merging from master #209

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
99c6be0
updating readme, minor cleanup
agracio May 6, 2024
74966b7
Update README
agracio May 6, 2024
1bf65ef
fixing test
agracio May 6, 2024
0b82b14
aligning .NET and CLR code
agracio May 6, 2024
04d0ec5
updating CI runner
agracio May 6, 2024
18a931f
adding macOS M1 action
agracio May 6, 2024
76712f2
adding macOS M1 action
agracio May 6, 2024
44e7042
adding macOS M1 action
agracio May 6, 2024
93a71ba
adding macOS M1 action
agracio May 6, 2024
f0c25c7
adding macOS M1 action
agracio May 6, 2024
218b795
adding macOS M1 action
agracio May 6, 2024
bd2212c
adding macOS M1 action
agracio May 6, 2024
857f6db
adding macOS M1 action
agracio May 6, 2024
d9ec45a
adding macOS M1 action
agracio May 6, 2024
7b8765b
testing Mono Gyp fail
agracio May 7, 2024
f9635bd
testing Mono Gyp fail
agracio May 8, 2024
3c4245d
testing Mono Gyp fail
agracio May 8, 2024
bf4a967
testing Mono Gyp fail
agracio May 8, 2024
621140f
testing Mono Gyp fail
agracio May 8, 2024
0b01c03
testing Mono Gyp fail
agracio May 8, 2024
ddc31f7
fix for macOS Mono failures
agracio May 8, 2024
e3f84a4
reverting accidental edge.js script commit, updating readme
agracio May 8, 2024
21e4542
reverting accidental edge.js script commit
agracio May 8, 2024
cc16919
updating readme
agracio May 8, 2024
b2a8220
updating package-lock.json
agracio May 8, 2024
ce567af
updating package.json
agracio May 8, 2024
1925210
updating gitignore
agracio May 8, 2024
183d045
updating readme
agracio May 9, 2024
75e20b6
updating readme
agracio May 13, 2024
dd4123c
minor improvements to debug messages, cleanup
agracio May 18, 2024
505fa9a
updating edge-cs version
agracio May 21, 2024
22aab6b
updating architecture detection
agracio May 31, 2024
6983039
adding windows arm64, modifying native library resolution logic
Jun 1, 2024
ffce2b5
testing CI
Jun 1, 2024
76c6a3c
testing CI
Jun 1, 2024
cc4163f
testing CI
Jun 1, 2024
0e19cfb
Merge branch 'circleci' into master
agracio Jun 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/edge.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var fs = require('fs')
, builtEdge = path.resolve(__dirname, '../build/Release/' + (process.env.EDGE_USE_CORECLR || !fs.existsSync(path.resolve(__dirname, '../build/Release/edge_nativeclr.node')) ? 'edge_coreclr.node' : 'edge_nativeclr.node'))
, edge;


function determineVersion() {
var source = path.resolve(__dirname, `native/${process.platform}/${process.arch}`)
const version = `${process.versions.node.split(".")[0]}`;
Expand Down
Binary file removed lib/native/win32/ia32/20.11.1/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/20.11.1/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/22.1.0/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/ia32/22.1.0/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/20.11.1/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/20.11.1/edge_nativeclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/22.1.0/edge_coreclr.node
Binary file not shown.
Binary file removed lib/native/win32/x64/22.1.0/edge_nativeclr.node
Binary file not shown.
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"license": "MIT",
"dependencies": {
"edge-cs": "npm:@agracio/edge-cs@^1.3.5",
"edge-cs": "npm:@agracio/edge-cs@^1.3.6",
"nan": "^2.19.0"
},
"devDependencies": {
Expand Down