From c8d9b5cc70619f2edb8998f0f451f79b503c44f6 Mon Sep 17 00:00:00 2001
From: XUMUMI <xumumi@outlook.com>
Date: Wed, 11 Dec 2024 23:24:56 +0800
Subject: [PATCH 1/3] Fixed the issue that when coreclr references a dll in a
 path containing special symbols, the path is garbled and causes reading
 failure.

---
 src/double/Edge.js/dotnetcore/coreclrembedding.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/double/Edge.js/dotnetcore/coreclrembedding.cs b/src/double/Edge.js/dotnetcore/coreclrembedding.cs
index c3ac81c..bba16af 100644
--- a/src/double/Edge.js/dotnetcore/coreclrembedding.cs
+++ b/src/double/Edge.js/dotnetcore/coreclrembedding.cs
@@ -667,7 +667,7 @@ private static Assembly Assembly_Resolving(AssemblyLoadContext arg1, AssemblyNam
     }
 
     [SecurityCritical]
-    public static IntPtr GetFunc(string assemblyFile, string typeName, string methodName, IntPtr exception)
+    public static IntPtr GetFunc([MarshalAs(UnmanagedType.LPUTF8Str)]string assemblyFile, string typeName, string methodName, IntPtr exception)
     {
         try
         {

From d6aac722a8ca6d280d591b4fb490ee8ed1329c93 Mon Sep 17 00:00:00 2001
From: XUMUMI <xumumi@outlook.com>
Date: Wed, 11 Dec 2024 23:54:10 +0800
Subject: [PATCH 2/3] Package coreclr dependencies together to reduce
 dependence on the production environment

---
 lib/bootstrap/bootstrap.csproj    | 3 +++
 src/double/Edge.js/Edge.js.csproj | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/bootstrap/bootstrap.csproj b/lib/bootstrap/bootstrap.csproj
index 3c60fdb..0268ed1 100644
--- a/lib/bootstrap/bootstrap.csproj
+++ b/lib/bootstrap/bootstrap.csproj
@@ -7,6 +7,9 @@
     <PackageId>bootstrap</PackageId>
     <LangVersion>default</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup >
diff --git a/src/double/Edge.js/Edge.js.csproj b/src/double/Edge.js/Edge.js.csproj
index 748b21f..c017d0d 100644
--- a/src/double/Edge.js/Edge.js.csproj
+++ b/src/double/Edge.js/Edge.js.csproj
@@ -36,6 +36,9 @@
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PublishSingleFile>true</PublishSingleFile>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <Compile Remove="dotnet\*.cs" />

From 5353b27712bdb394b968a416c3af4ba02fde5531 Mon Sep 17 00:00:00 2001
From: XUMUMI <xumumi@outlook.com>
Date: Thu, 12 Dec 2024 09:59:12 +0800
Subject: [PATCH 3/3] Revert "Package coreclr dependencies together to reduce
 dependence on the production environment"

This reverts commit d6aac722a8ca6d280d591b4fb490ee8ed1329c93.
---
 lib/bootstrap/bootstrap.csproj    | 3 ---
 src/double/Edge.js/Edge.js.csproj | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/lib/bootstrap/bootstrap.csproj b/lib/bootstrap/bootstrap.csproj
index 0268ed1..3c60fdb 100644
--- a/lib/bootstrap/bootstrap.csproj
+++ b/lib/bootstrap/bootstrap.csproj
@@ -7,9 +7,6 @@
     <PackageId>bootstrap</PackageId>
     <LangVersion>default</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <PublishSingleFile>true</PublishSingleFile>
-    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup >
diff --git a/src/double/Edge.js/Edge.js.csproj b/src/double/Edge.js/Edge.js.csproj
index c017d0d..748b21f 100644
--- a/src/double/Edge.js/Edge.js.csproj
+++ b/src/double/Edge.js/Edge.js.csproj
@@ -36,9 +36,6 @@
   </ItemGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <PublishSingleFile>true</PublishSingleFile>
-    <SelfContained>true</SelfContained>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <Compile Remove="dotnet\*.cs" />