Merge pull request #164 from agracio/standalone-fix

Standalone fix

Author: agracio

.github/workflows/build.yml

@@ -6,14 +6,13 @@ on:
       build-version:
         description: 'Electron version to build'
         required: true
-        default: '30.0.0'
+        default: '30'
         type: choice
         options:
-        - 29.0.0
-        - 30.0.0
-        - 31.0.0
-        - 32.0.0
-        - 33.0.0
+        - 29
+        - 30
+        - 31
+        - 32
       # test-version:
       #   description: 'Electron version to test build'
       #   required: true
@@ -51,20 +50,22 @@ jobs:
         id: electron-test-version
         shell: bash
         run: |
-           if [[ ${{ inputs.build-version }} == '29.0.0' ]]; then
+           if [[ ${{ inputs.build-version }} == '29' ]]; then
              echo "test-version=29.4.6" >> $GITHUB_OUTPUT
-           elif [[ ${{ inputs.build-version }} == '30.0.0' ]]; then
+           elif [[ ${{ inputs.build-version }} == '30' ]]; then
              echo "test-version=30.5.1" >> $GITHUB_OUTPUT
-           elif [[ ${{ inputs.build-version }} == '31.0.0' ]]; then
+           elif [[ ${{ inputs.build-version }} == '31' ]]; then
              echo "test-version=31.6.0" >> $GITHUB_OUTPUT
-           elif [[ ${{ inputs.build-version }} == '32.0.0' ]]; then
-             echo "test-version=32.1.2" >> $GITHUB_OUTPUT
+           elif [[ ${{ inputs.build-version }} == '32' ]]; then
+             echo "test-version=32.2.0" >> $GITHUB_OUTPUT
+           elif [[ ${{ inputs.build-version }} == '33' ]]; then
+             echo "test-version=33.0.0" >> $GITHUB_OUTPUT
            fi 
 
       - name: Setup env
         uses: ./.github/actions/setup-env
         with:
-          electron: ${{ inputs.build-version }}
+          electron: '${{ inputs.build-version }}.0.0'
           os: ${{ matrix.os }}
 
       - name: install node-gyp
@@ -73,68 +74,68 @@ jobs:
 
       - name: Create release folder
         run: |
-            mkdir "release\ia32\${{ inputs.build-version }}"
-            mkdir "release\x64\${{ inputs.build-version }}"
-            mkdir "release\arm64\${{ inputs.build-version }}"
+            mkdir "release\ia32\${{ inputs.build-version }}.0.0"
+            mkdir "release\x64\${{ inputs.build-version }}.0.0"
+            mkdir "release\arm64\${{ inputs.build-version }}.0.0"
 
       - name: Build ia32
         timeout-minutes: 30
         shell: pwsh
         run: |
-            node-gyp configure --target=${{ inputs.build-version }} --disturl=https://electronjs.org/headers --runtime=electron --release --arch=ia32
+            node-gyp configure --target=${{ inputs.build-version }}.0.0 --disturl=https://electronjs.org/headers --runtime=electron --release --arch=ia32
 
-            if ( '${{ inputs.build-version }}' -eq '32.0.0'){
+            if ( '${{ inputs.build-version }}' -ge 32){
                 (Get-Content -Raw build/build_managed.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/build_managed.vcxproj
                 (Get-Content -Raw build/edge_coreclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj
                 (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj
             }
 
             node-gyp build
-            cmd /c copy /y build\Release\edge_*.node release\ia32\${{ inputs.build-version }}
+            cmd /c copy /y build\Release\edge_*.node release\ia32\${{ inputs.build-version }}.0.0
             cmd /c rmdir /S /Q build
 
       - name: Build x64
         timeout-minutes: 30
         shell: pwsh
         run: |
-            node-gyp configure --target=${{ inputs.build-version }} --disturl=https://electronjs.org/headers --runtime=electron --release --arch=x64
+            node-gyp configure --target=${{ inputs.build-version }}.0.0 --disturl=https://electronjs.org/headers --runtime=electron --release --arch=x64
 
-            if ( '${{ inputs.build-version }}' -eq '32.0.0'){
+            if ( '${{ inputs.build-version }}' -ge 32){
                 (Get-Content -Raw build/build_managed.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/build_managed.vcxproj
                 (Get-Content -Raw build/edge_coreclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj
                 (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj
             }
 
             node-gyp build
-            cmd /c copy /y build\Release\edge_*.node release\x64\${{ inputs.build-version }}
+            cmd /c copy /y build\Release\edge_*.node release\x64\${{ inputs.build-version }}.0.0
             cmd /c rmdir /S /Q build
 
       - name: Build arm64
         timeout-minutes: 30
         shell: pwsh
         run: |
-            node-gyp configure --target=${{ inputs.build-version }} --disturl=https://electronjs.org/headers --runtime=electron --release --arch=arm64
+            node-gyp configure --target=${{ inputs.build-version }}.0.0 --disturl=https://electronjs.org/headers --runtime=electron --release --arch=arm64
 
             (Get-Content -Raw build/build_managed.vcxproj) -replace '<FloatingPointModel>Strict</FloatingPointModel>', '<!-- <FloatingPointModel>Strict</FloatingPointModel> -->' | Out-File -Encoding Utf8 build/build_managed.vcxproj
             (Get-Content -Raw build/edge_coreclr.vcxproj) -replace '<FloatingPointModel>Strict</FloatingPointModel>', '<!-- <FloatingPointModel>Strict</FloatingPointModel> -->' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj
             (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace '<FloatingPointModel>Strict</FloatingPointModel>', '<!-- <FloatingPointModel>Strict</FloatingPointModel> -->' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj
 
-            if ( '${{ inputs.build-version }}' -eq '32.0.0'){
+            if ( '${{ inputs.build-version }}' -ge 32){
                 (Get-Content -Raw build/build_managed.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/build_managed.vcxproj
                 (Get-Content -Raw build/edge_coreclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_coreclr.vcxproj
                 (Get-Content -Raw build/edge_nativeclr.vcxproj) -replace 'std:c\+\+17', 'std:c++20' | Out-File -Encoding Utf8 build/edge_nativeclr.vcxproj
             }
 
             node-gyp build
-            cmd /c copy /y build\Release\edge_*.node release\arm64\${{ inputs.build-version }}
+            cmd /c copy /y build\Release\edge_*.node release\arm64\${{ inputs.build-version }}.0.0
             cmd /c rmdir /S /Q build
 
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         if: success()
         with:
-          name: electron-edge-js-${{ inputs.build-version }}
+          name: electron-edge-js-${{ inputs.build-version }}.0.0
           path: |
             release
 

.github/workflows/main.yml

@@ -45,7 +45,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.6.0, 32.1.2]
+        electron: [29.4.6, 30.5.1, 31.6.0, 32.2.0]
         # electron: [31.6.0, 32.1.0]
 
     name: test-${{ matrix.os }}-v${{ matrix.electron }}

lib/native/win32/arm64/29.0.0/edge_coreclr.node

@@ -43,7 +43,7 @@
   "dependencies": {
     "edge-cs": "npm:@agracio/edge-cs@^1.3.7",
     "follow-redirects": "^1.15.9",
-    "nan": "git://github.com/oc-soft/npm-nan"
+    "nan": "^2.22.0"
   },
   "devDependencies": {
     "electron": "^32.0.0",

lib/native/win32/arm64/29.0.0/edge_nativeclr.node

@@ -31,6 +31,12 @@
 #include <libproc.h>
 #endif
 
+// Special entry for coreclr path
+pal::string_t m_coreclr_standalone_path;
+
+// Special entry for JIT path
+pal::string_t m_clrjit_standalone_path;
+
 GetFuncFunction getFunc;
 CallFuncFunction callFunc;
 ContinueTaskFunction continueTask;
@@ -177,6 +183,25 @@ pal::string_t GetOSVersion()
 #endif
 }
 
+void init_known_entry_path(const pal::string_t& edgeAppDir)
+{
+	trace::info(_X("CoreClrEmbedding::Initialize - Resolving CoreCLR and CLRJit for standalone"));
+	pal::string_t coreclr(edgeAppDir);
+	append_path(&coreclr, LIBCORECLR_NAME);
+	if(pal::file_exists(coreclr))
+	{
+		trace::info(_X("CoreClrEmbedding::Initialize - Resolved CoreCLR to %s"), coreclr.c_str());
+		m_coreclr_standalone_path = coreclr;
+	}
+	pal::string_t clrjit(edgeAppDir);
+	append_path(&clrjit, LIBCLRJIT_NAME);
+	if(pal::file_exists(clrjit))
+	{
+		trace::info(_X("CoreClrEmbedding::Initialize - Resolved CLRJit to %s"), clrjit.c_str());
+		m_clrjit_standalone_path = clrjit;
+	}
+}
+
 HRESULT CoreClrEmbedding::Initialize(BOOL debugMode)
 {
 	trace::setup();
@@ -338,13 +363,14 @@ HRESULT CoreClrEmbedding::Initialize(BOOL debugMode)
 
 	if (mode != host_mode_t::standalone && dotnetExecutablePath.empty())
 	{
-		throwV8Exception("This is not a published, standalone application and we are unable to locate the .NET Core SDK.  Please make sure that it is installed; see http://microsoft.com/net/core for more details.");
+		throwV8Exception("This is not a published, standalone application and we are unable to locate the .NET Core SDK. Please make sure that it is installed; see https://microsoft.com/net/core for more details.");
 	}
 
 	pal::string_t configFile, devConfigFile, sdkPath;
 
 	if (mode != host_mode_t::standalone)
 	{
+		trace::verbose(_X("CoreClrEmbedding::Initialize - host mode: muxer"));
 		pal::string_t sdkDirectory;
 
 		fx_muxer_t::resolve_sdk_dotnet_path(dotnetDirectory, &sdkDirectory);
@@ -357,6 +383,8 @@ HRESULT CoreClrEmbedding::Initialize(BOOL debugMode)
 
 	else
 	{
+		trace::verbose(_X("CoreClrEmbedding::Initialize - host mode: standalone"));
+		init_known_entry_path(edgeAppDir);
 		get_runtime_config_paths_from_app(entryPointAssembly, &configFile, &devConfigFile);
 	}
 
@@ -446,14 +474,26 @@ HRESULT CoreClrEmbedding::Initialize(BOOL debugMode)
 		return StatusCode::ResolverResolveFailure;
 	}
 
-	pal::string_t clr_path = probe_paths.coreclr;
+	pal::string_t clr_path;
+	pal::string_t clrjit_path;
+
+	if (mode != host_mode_t::standalone)
+	{
+		clr_path = probe_paths.coreclr;
+		clrjit_path = probe_paths.clrjit;
+	}
+	else
+	{
+		clr_path = m_coreclr_standalone_path;
+		clrjit_path = m_clrjit_standalone_path;
+	}
+	
 	if (clr_path.empty() || !pal::realpath(&clr_path))
 	{
-		trace::error(_X("CoreClrEmbedding::Initialize - Could not resolve CoreCLR path. For more details, enable tracing by setting COREHOST_TRACE environment variable to 1"));;
+		trace::error(_X("CoreClrEmbedding::Initialize - Could not resolve CoreCLR path. For more details, enable tracing by setting COREHOST_TRACE environment variable to 1"));
 		return StatusCode::CoreClrResolveFailure;
 	}
 
-	pal::string_t clrjit_path = probe_paths.clrjit;
 	if (clrjit_path.empty())
 	{
 		trace::warning(_X("CoreClrEmbedding::Initialize - Could not resolve CLRJit path"));