Skip to content

Commit c986cb8

Browse files
committed
merging .NET Core dependency resolution fix from Edge.js
1 parent 059c067 commit c986cb8

File tree

6 files changed

+143
-116
lines changed

6 files changed

+143
-116
lines changed

.github/workflows/build-all.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Electron versions
8080
shell: bash
8181
id: electron-test-versions
82-
run: echo "matrix={'include':[{'electron':'29.4.6', 'os':'windows-2022'},{'electron':'30.5.1', 'os':'windows-2022'},{'electron':'31.7.3', 'os':'windows-2022'},{'electron':'32.2.2', 'os':'windows-2022'},{'electron':'33.1.0', 'os':'windows-2022'}]}" >> $GITHUB_OUTPUT
82+
run: echo "matrix={'include':[{'electron':'29.4.6', 'os':'windows-2022'},{'electron':'30.5.1', 'os':'windows-2022'},{'electron':'31.7.5', 'os':'windows-2022'},{'electron':'32.2.5', 'os':'windows-2022'},{'electron':'33.2.0', 'os':'windows-2022'}]}" >> $GITHUB_OUTPUT
8383

8484
test:
8585
strategy:

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
elif [[ ${{ inputs.build-version }} == '30' ]]; then
5555
echo "test-version=30.5.1" >> $GITHUB_OUTPUT
5656
elif [[ ${{ inputs.build-version }} == '31' ]]; then
57-
echo "test-version=31.7.2" >> $GITHUB_OUTPUT
57+
echo "test-version=31.7.5" >> $GITHUB_OUTPUT
5858
elif [[ ${{ inputs.build-version }} == '32' ]]; then
59-
echo "test-version=32.2.2" >> $GITHUB_OUTPUT
59+
echo "test-version=32.2.5" >> $GITHUB_OUTPUT
6060
elif [[ ${{ inputs.build-version }} == '33' ]]; then
61-
echo "test-version=33.0.2" >> $GITHUB_OUTPUT
61+
echo "test-version=33.2.0" >> $GITHUB_OUTPUT
6262
fi
6363
6464
- name: Setup env

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
os: [macos-13, macos-14, ubuntu-22.04, windows-2022]
8585
# os: [ macos-14, ubuntu-22.04]
8686
# electron: [32.1.2]
87-
electron: [29.4.6, 30.5.1, 31.7.3, 32.2.2, 33.1.0]
87+
electron: [29.4.6, 30.5.1, 31.7.5, 32.2.5, 33.2.0]
8888
# electron: [31.6.0, 32.1.0]
8989

9090
name: test-${{ matrix.os }}-v${{ matrix.electron }}

package-lock.json

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"url": "http://tomasz.janczuk.org",
66
"twitter": "tjanczuk"
77
},
8-
"version": "33.0.2",
8+
"version": "33.0.3",
99
"description": "Edge.js: run .NET and Node.js in-process on Electron",
1010
"tags": [
1111
"owin",
@@ -45,7 +45,7 @@
4545
"nan": "^2.22.0"
4646
},
4747
"devDependencies": {
48-
"electron": "^33.1.0",
48+
"electron": "^33.2.0",
4949
"follow-redirects": "^1.15.9",
5050
"mocha": "10.8.2",
5151
"mochawesome": "^7.1.3",

0 commit comments

Comments
 (0)