merging changes from macos branch

Author: agracio

.github/actions/build/action.yml

@@ -18,7 +18,8 @@ runs:
     - name: Build ${{ inputs.arch }}
       shell: pwsh
       run: |
-         node-gyp configure --target=${{ inputs.node }} --runtime=node --release --arch=${{ inputs.arch }}
+          
+          node-gyp configure --target=${{ inputs.node }} --runtime=node --release --arch=${{ inputs.arch }}
 
           if ( '${{ inputs.arch }}' -eq 'arm64' -And '${{ runner.os }}' -eq 'Windows'){
             (Get-Content -Raw build/build_managed.vcxproj) -replace '<FloatingPointModel>Strict</FloatingPointModel>', '<!-- <FloatingPointModel>Strict</FloatingPointModel> -->' | Out-File -Encoding Utf8 build/build_managed.vcxproj
@@ -27,12 +28,17 @@ runs:
           }
 
           node-gyp build
+          
           if ( '${{ runner.os }}' -eq 'Windows'){
             cmd /c copy /y build\Release\edge_*.node release\win32\${{ inputs.arch }}\${{ inputs.node-major }}
             cmd /c rmdir /S /Q build
           }
 
           if ( '${{ runner.os }}' -eq 'macOS'){
+            Get-ChildItem -Path build/Release
             Copy-Item "build/Release/edge_coreclr.node" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"
+            Copy-Item "build/Release/edge_nativeclr.node" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"
+            Copy-Item "build/Release/MonoEmbedding.exe" -Destination "release/darwin/${{ inputs.arch }}/${{ inputs.node-major }}"
+            
             node-gyp clean
           }

.github/actions/setup-env/action.yml

@@ -28,15 +28,14 @@ runs:
         path: ~/.cache/node-gyp
         key: '${{ inputs.os }}-${{ inputs.node}}'
 
-    # - name: Cache node-gyp macOs
-    #   if: runner.os == 'macOS'
-    #   uses: actions/cache@v4
-    #   env:
-    #     cache-name: cache-node-gyp
-    #   with:
-    #     path: ~/Library/Caches/node-gyp
-    #     key: '${{ inputs.os }}-${{ inputs.node}}'
-
+    - name: Cache node-gyp macOs
+      if: runner.os == 'macOS'
+      uses: actions/cache@v4
+      env:
+        cache-name: cache-node-gyp
+      with:
+        path: ~/Library/Caches/node-gyp
+        key: '${{ inputs.os }}-${{ inputs.node}}'
 
     - name: Cache node modules
       id: cache-nodemodules
@@ -52,6 +51,19 @@ runs:
       with:
         dotnet-version: '8.0.x' # SDK Version to use; x will use the latest version of the 8.0 channel
 
+    - name: Setup Mono
+      if: inputs.os == 'macos-14' || inputs.os == 'macos-15'
+      shell: bash
+      run: |
+        brew install mono --overwrite
+        brew reinstall pkg-config
+
+    - name: Setup Mono
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        sudo apt -q install mono-complete pkg-config
+
     - name: Versions
       shell: bash
       run: |

.github/actions/test-build/action.yml

@@ -69,7 +69,11 @@ runs:
           try {
             const fs = require('fs')
               fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/edge_coreclr.node', 'lib/native/darwin/x64/${{ inputs.node }}/edge_coreclr.node');
+              fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/edge_nativeclr.node', 'lib/native/darwin/x64/${{ inputs.node }}/edge_nativeclr.node');
+              fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/x64/${{ inputs.node }}/MonoEmbedding.exe', 'lib/native/darwin/x64/${{ inputs.node }}/MonoEmbedding.exe');
               fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/edge_coreclr.node', 'lib/native/darwin/arm64/${{ inputs.node }}/edge_coreclr.node');
+              fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/edge_nativeclr.node', 'lib/native/darwin/arm64/${{ inputs.node }}/edge_nativeclr.node');
+              fs.copyFileSync('release/darwin-edge-js-${{ inputs.node }}/darwin/arm64/${{ inputs.node }}/MonoEmbedding.exe', 'lib/native/darwin/arm64/${{ inputs.node }}/MonoEmbedding.exe');
           } catch(err) {
             core.error("Error creating release directory")
             core.setFailed(err)
@@ -93,12 +97,12 @@ runs:
       if:  runner.os == 'macOS'
       uses: andstor/file-existence-action@v3
       with:
-        files: "lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_coreclr.node"
+        files: "lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_coreclr.node, lib/native/darwin/${{ runner.arch }}/${{ inputs.node }}/edge_nativeclr.node"
         fail: true
         ignore_case: true
 
     - name: Run .NET 4.5 tests
-      if:  runner.os == 'Windows'
+      if: inputs.os != 'macos-13'
       shell: bash
       run: node tools/test.js CI
 

.github/workflows/main.yml

@@ -98,18 +98,12 @@ jobs:
           node: ${{ matrix.node }}
           os: ${{ matrix.os }}
 
-      # - if: runner.os == 'macOS' && matrix.node == '16.x'
-      #   name: Add missing packages for macOS NodeJs 16 
-      #   run: |
-      #     pip install setuptools
-
-      - if:  runner.os == 'Windows'
-        name: Run .NET 4.5 tests
+      - name: Run .NET 4.5 tests
+        if: matrix.os != 'macos-13'
         shell: bash
         run: node tools/test.js CI
 
-      - if: runner.os == 'macOS' || runner.os == 'Linux'
-        name: "Run .net core tests"
+      - name: "Run .net core tests"
         run: node tools/test.js CI
         env:
           EDGE_USE_CORECLR: 1

binding.gyp

@@ -199,8 +199,51 @@
               'src/common/callbackhelper.cpp',
               'src/common/edge.cpp'
             ]
+          },
+          {
+            'conditions': [
+              [
+                '"<!((which mono 2>/dev/null) || echo not_found)"!="not_found"',
+                {
+                    'conditions': [
+                        [
+                        '"<!((pkg-config mono-2 --libs 2>/dev/null) || echo not_found)"!="not_found"',
+                          {                  
+                              'sources+': [
+                                'src/mono/clractioncontext.cpp',
+                                'src/mono/clrfunc.cpp',
+                                'src/mono/clrfuncinvokecontext.cpp',
+                                'src/mono/monoembedding.cpp',
+                                'src/mono/task.cpp',
+                                'src/mono/dictionary.cpp',
+                                'src/mono/nodejsfunc.cpp',
+                                'src/mono/nodejsfuncinvokecontext.cpp',
+                                'src/mono/utils.cpp',
+                                'src/common/utils.cpp',
+                                'src/common/v8synchronizationcontext.cpp',
+                                'src/common/callbackhelper.cpp',
+                                'src/common/edge.cpp'
+                              ],
+
+                                'include_dirs': [
+                                  '<!@(pkg-config mono-2 --cflags-only-I | sed s/-I//g)',
+                                  '<!@(pkg-config glib-2.0 --cflags-only-I | sed s/-I//g)',
+                                ],
+                                'link_settings': {
+                                  'libraries': [
+                                    '<!@(pkg-config mono-2 --libs)'
+                                  ]
+                                }
+                          }
+                      ]
+                    ],
+                },
+                {
+                  'type': 'none'
+                }
+              ]
+            ]
           }
-          
         ]
       ],
       'configurations': {
@@ -270,6 +313,30 @@
           },
           {
             'conditions': [
+              [
+                '"<!((which mono 2>/dev/null) || echo not_found)"!="not_found"',
+                {
+                  'actions+': [
+                    {
+                      'action_name': 'compile_mono_embed',
+                      'inputs': [
+                        'src/mono/*.cs'
+                      ],
+                      'outputs': [
+                        'build/$(BUILDTYPE)/monoembedding.exe'
+                      ],
+                      'action': [
+                        'mcs',
+                        '-sdk:4.5',
+                        '-target:exe',
+                        '-out:build/$(BUILDTYPE)/MonoEmbedding.exe',
+                        'src/mono/*.cs',
+                        'src/common/*.cs'
+                      ]
+                    }
+                  ]
+                }
+              ],
               [
                 '"<!((which dotnet 2>/dev/null) || echo not_found)"!="not_found"',
                 {

lib/edge.js

@@ -28,7 +28,7 @@ else if (process.platform === 'win32') {
     edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + determineVersion() + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr' : 'edge_nativeclr'));
 }
 else if(process.platform === 'darwin'){
-    edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
+    edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr.node' : 'edge_nativeclr.node'));
     if(!fs.existsSync(edgeNative)){
         edgeNative = builtEdge;
         if(!fs.existsSync(edgeNative)){

lib/native/darwin/arm64/16/MonoEmbedding.exe

@@ -90,13 +90,12 @@ else {
 	if(process.platform === 'darwin'){
 
 		const nodeVersion = process.versions.node.split(".")[0]
-		const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
+		const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_nativeclr.node');
+		const edjeNativeClr = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
 
-		if(fs.existsSync(edjeNative)){
+		if(fs.existsSync(edjeNative) && fs.existsSync(edjeNativeClr)){
 			spawn('dotnet', ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
-			.on('close', function() {
-				require('./checkplatform');
-			});
+
 		}
 		else{
 			spawn('node-gyp', ['configure', 'build'], { stdio: 'inherit' });

lib/native/darwin/arm64/16/edge_nativeclr.node

@@ -12,8 +12,15 @@ const marge = require('mochawesome-report-generator')
 
 var runner = process.argv[2];
 
-if (process.platform !== 'win32') {
-    process.env.EDGE_USE_CORECLR = 1
+// if (process.platform !== 'win32') {
+//     process.env.EDGE_USE_CORECLR = 1
+// }
+
+if(process.platform === 'linux' && !process.env.EDGE_USE_CORECLR){
+    Object.assign(process.env, {
+        // Work around Mono problem: undefined symbol: mono_add_internal_call_with_flags
+        LD_PRELOAD: 'libmono-2.0.so libmonosgen-2.0.so libstdc++.so.6',
+    });
 }
 
 if(process.argv[3] === 'coreclr'){