diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1abb4681..6a68defb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,7 @@ on: - 18 - 20 - 22 + - 23 env: DOTNET_CLI_TELEMETRY_OPTOUT: 1 @@ -62,7 +63,9 @@ jobs: script: | try { const fs = require('fs') - fs.writeFileSync('release/ia32/${{ inputs.build-version }}/node.version', '${{ steps.node-test-version.outputs.node-version }}'); + if(${{ inputs.build-version }} <23){ + fs.writeFileSync('release/ia32/${{ inputs.build-version }}/node.version', '${{ steps.node-test-version.outputs.node-version }}'); + } fs.writeFileSync('release/x64/${{ inputs.build-version }}/node.version', '${{ steps.node-test-version.outputs.node-version }}'); if(${{ inputs.build-version }} >=20){ fs.writeFileSync('release/arm64/${{ inputs.build-version }}/node.version', '${{ steps.node-test-version.outputs.node-version }}'); @@ -74,6 +77,7 @@ jobs: - name: Build ia32 timeout-minutes: 30 + if: ${{ inputs.build-version <23 }} run: | node-gyp configure build --target=${{ steps.node-test-version.outputs.node-version }} --runtime=node --release --arch=ia32 cmd /c copy /y build\Release\edge_*.node release\ia32\${{ inputs.build-version }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4394fe6e..14bcf051 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: matrix: os: [macos-13, macos-14, ubuntu-22.04, windows-2022] # os: [macos-14, windows-2022] - node: [18, 20, 22] + node: [18, 20, 22, 23] steps: diff --git a/.npmignore b/.npmignore index 38928cd6..a5a3c8d3 100644 --- a/.npmignore +++ b/.npmignore @@ -103,4 +103,7 @@ tools/download*.js test/mochawesome-report mochawesome-report mochawesome.json -.circleci \ No newline at end of file +.circleci +*.sln +xunit*.* +getVersion*.js \ No newline at end of file diff --git a/README.md b/README.md index f5e6f145..8cd54e71 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,14 @@ [![Build status][appveyor-image]][appveyor-url] [![CircleCI](https://dl.circleci.com/status-badge/img/gh/agracio/edge-js.svg?style=shield )](https://dl.circleci.com/status-badge/redirect/gh/agracio/edge-js/tree/master) -[![Actions Status](https://github.com/agracio/edge-js/workflows/Test/badge.svg)](https://github.com/agracio/edge-js/actions) -[![NPM Downloads][downloads-image]][downloads-url] - +[![Actions Status][github-img]][github-url] [![Git Issues][issues-img]][issues-url] [![Closed Issues][closed-issues-img]][closed-issues-url] + + ----- ### This library is based on https://github.com/tjanczuk/edge all credit for original work goes to Tomasz Janczuk. @@ -74,25 +74,26 @@ https://github.com/agracio/edge-js-quick-start ### Windows -| Version | x86/x64 | arm64 | -| ------- | ------------------ | ------------------ | -| 16.x | :heavy_check_mark: | :x: | -| 18.x | :heavy_check_mark: | :x: | -| 20.x | :heavy_check_mark: | :heavy_check_mark: | -| 22.x | :heavy_check_mark: | :heavy_check_mark: | +| Version | x86 | x64 | arm64 | +| ------- | ------------------ | ------------------ | ------------------ | +| 16.x | :heavy_check_mark: | :heavy_check_mark: | :x: | +| 18.x | :heavy_check_mark: | :heavy_check_mark: | :x: | +| 20.x | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| 22.x | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| 23.x | :x: | :heavy_check_mark: | :heavy_check_mark: | ### macOS | Version | x64 | arm64 (M1+) | | -------------- | ------------------ | ------------------ | -| 16.x - 22.x | :heavy_check_mark: | :heavy_check_mark: | +| 16.x - 23.x | :heavy_check_mark: | :heavy_check_mark: | ### Linux | Version | x64 | arm64 | | -------------- | ------------------ | ------------------ | -| 14.x - 22.x | :heavy_check_mark: | :heavy_check_mark: | +| 14.x - 23.x | :heavy_check_mark: | :heavy_check_mark: | ## Scripting CLR from Node.js and Node.js from CRL @@ -2014,7 +2015,7 @@ Issues? Feedback? You [know what to do](https://github.com/agracio/edge-js/issue [dependencies-url]: https://www.npmjs.com/package/edge-js?activeTab=dependencies [dependencies-img]: https://img.shields.io/librariesio/release/npm/edge-js.svg?style=flat-square -[downloads-image]: https://img.shields.io/npm/dw/edge-js.svg?style=flat-square +[downloads-img]: https://img.shields.io/npm/dw/edge-js.svg?style=flat-square [downloads-url]: https://img.shields.io/npm/dw/edge-js.svg [appveyor-image]:https://ci.appveyor.com/api/projects/status/3hs8xq7jieufw507/branch/master?svg=true @@ -2031,4 +2032,7 @@ Issues? Feedback? You [know what to do](https://github.com/agracio/edge-js/issue [codacy-img]: https://app.codacy.com/project/badge/Grade/3833e15b273d4add8d2030764e8977d9 [codacy-url]: https://app.codacy.com/gh/agracio/edge-js/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade +[github-img]: https://github.com/agracio/edge-js/workflows/Test/badge.svg +[github-url]: https://github.com/agracio/edge-js/actions/workflows/main.yml + diff --git a/lib/native/win32/arm64/22/edge_coreclr.node b/lib/native/win32/arm64/22/edge_coreclr.node index e4213923..eb5e1acd 100644 Binary files a/lib/native/win32/arm64/22/edge_coreclr.node and b/lib/native/win32/arm64/22/edge_coreclr.node differ diff --git a/lib/native/win32/arm64/22/edge_nativeclr.node b/lib/native/win32/arm64/22/edge_nativeclr.node index 8b5ea2c1..12c8a9a6 100644 Binary files a/lib/native/win32/arm64/22/edge_nativeclr.node and b/lib/native/win32/arm64/22/edge_nativeclr.node differ diff --git a/lib/native/win32/arm64/22/node.version b/lib/native/win32/arm64/22/node.version index ee57e7f6..2fdffdec 100644 --- a/lib/native/win32/arm64/22/node.version +++ b/lib/native/win32/arm64/22/node.version @@ -1 +1 @@ -22.9.0 \ No newline at end of file +22.10.0 \ No newline at end of file diff --git a/lib/native/win32/arm64/23/edge_coreclr.node b/lib/native/win32/arm64/23/edge_coreclr.node new file mode 100644 index 00000000..f8b4d95c Binary files /dev/null and b/lib/native/win32/arm64/23/edge_coreclr.node differ diff --git a/lib/native/win32/arm64/23/edge_nativeclr.node b/lib/native/win32/arm64/23/edge_nativeclr.node new file mode 100644 index 00000000..6a8352f3 Binary files /dev/null and b/lib/native/win32/arm64/23/edge_nativeclr.node differ diff --git a/lib/native/win32/arm64/23/node.version b/lib/native/win32/arm64/23/node.version new file mode 100644 index 00000000..f842f93a --- /dev/null +++ b/lib/native/win32/arm64/23/node.version @@ -0,0 +1 @@ +23.0.0 \ No newline at end of file diff --git a/lib/native/win32/ia32/22/edge_coreclr.node b/lib/native/win32/ia32/22/edge_coreclr.node index c9d23542..bc07dcee 100644 Binary files a/lib/native/win32/ia32/22/edge_coreclr.node and b/lib/native/win32/ia32/22/edge_coreclr.node differ diff --git a/lib/native/win32/ia32/22/edge_nativeclr.node b/lib/native/win32/ia32/22/edge_nativeclr.node index 1afab427..7d45404d 100644 Binary files a/lib/native/win32/ia32/22/edge_nativeclr.node and b/lib/native/win32/ia32/22/edge_nativeclr.node differ diff --git a/lib/native/win32/ia32/22/node.version b/lib/native/win32/ia32/22/node.version index ee57e7f6..2fdffdec 100644 --- a/lib/native/win32/ia32/22/node.version +++ b/lib/native/win32/ia32/22/node.version @@ -1 +1 @@ -22.9.0 \ No newline at end of file +22.10.0 \ No newline at end of file diff --git a/lib/native/win32/x64/22/edge_coreclr.node b/lib/native/win32/x64/22/edge_coreclr.node index a8b6ff35..9c825f13 100644 Binary files a/lib/native/win32/x64/22/edge_coreclr.node and b/lib/native/win32/x64/22/edge_coreclr.node differ diff --git a/lib/native/win32/x64/22/edge_nativeclr.node b/lib/native/win32/x64/22/edge_nativeclr.node index e8fb663d..a155d7bc 100644 Binary files a/lib/native/win32/x64/22/edge_nativeclr.node and b/lib/native/win32/x64/22/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/22/node.version b/lib/native/win32/x64/22/node.version index ee57e7f6..2fdffdec 100644 --- a/lib/native/win32/x64/22/node.version +++ b/lib/native/win32/x64/22/node.version @@ -1 +1 @@ -22.9.0 \ No newline at end of file +22.10.0 \ No newline at end of file diff --git a/lib/native/win32/x64/23/edge_coreclr.node b/lib/native/win32/x64/23/edge_coreclr.node new file mode 100644 index 00000000..38d204bb Binary files /dev/null and b/lib/native/win32/x64/23/edge_coreclr.node differ diff --git a/lib/native/win32/x64/23/edge_nativeclr.node b/lib/native/win32/x64/23/edge_nativeclr.node new file mode 100644 index 00000000..7da282a7 Binary files /dev/null and b/lib/native/win32/x64/23/edge_nativeclr.node differ diff --git a/lib/native/win32/x64/23/node.version b/lib/native/win32/x64/23/node.version new file mode 100644 index 00000000..f842f93a --- /dev/null +++ b/lib/native/win32/x64/23/node.version @@ -0,0 +1 @@ +23.0.0 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 15f8f860..167a6ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "edge-js", - "version": "22.7.0", + "version": "23.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "edge-js", - "version": "22.7.0", + "version": "23.0.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a97a95ee..e679c523 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "http://tomasz.janczuk.org", "twitter": "tjanczuk" }, - "version": "22.7.0", + "version": "23.0.0", "description": "Edge.js: run .NET and Node.js in-process on Windows, Mac OS, and Linux", "tags": [ "owin",