merging .NET Core dependency resolution fix from Edge.js

agracio · Nov 22, 2024 · c986cb8 · c986cb8
1 parent 059c067
commit c986cb8
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 116 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Electron versions
         shell: bash
         id: electron-test-versions
-        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
+        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
 
   test:
     strategy:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,11 +54,11 @@ jobs:
             elif [[ ${{ inputs.build-version }} == '30' ]]; then
               echo "test-version=30.5.1" >> $GITHUB_OUTPUT
             elif [[ ${{ inputs.build-version }} == '31' ]]; then
-              echo "test-version=31.7.2" >> $GITHUB_OUTPUT
+              echo "test-version=31.7.5" >> $GITHUB_OUTPUT
             elif [[ ${{ inputs.build-version }} == '32' ]]; then
-              echo "test-version=32.2.2" >> $GITHUB_OUTPUT
+              echo "test-version=32.2.5" >> $GITHUB_OUTPUT
             elif [[ ${{ inputs.build-version }} == '33' ]]; then
-              echo "test-version=33.0.2" >> $GITHUB_OUTPUT
+              echo "test-version=33.2.0" >> $GITHUB_OUTPUT
             fi 
 
       - name: Setup env

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -84,7 +84,7 @@ jobs:
         os: [macos-13, macos-14, ubuntu-22.04, windows-2022]
         # os: [ macos-14,  ubuntu-22.04]
         # electron: [32.1.2]
-        electron: [29.4.6, 30.5.1, 31.7.3, 32.2.2, 33.1.0]
+        electron: [29.4.6, 30.5.1, 31.7.5, 32.2.5, 33.2.0]
         # electron: [31.6.0, 32.1.0]
 
     name: test-${{ matrix.os }}-v${{ matrix.electron }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "url": "http://tomasz.janczuk.org",
     "twitter": "tjanczuk"
   },
-  "version": "33.0.2",
+  "version": "33.0.3",
   "description": "Edge.js: run .NET and Node.js in-process on Electron",
   "tags": [
     "owin",
@@ -45,7 +45,7 @@
     "nan": "^2.22.0"
   },
   "devDependencies": {
-    "electron": "^33.1.0",
+    "electron": "^33.2.0",
     "follow-redirects": "^1.15.9",
     "mocha": "10.8.2",
     "mochawesome": "^7.1.3",