Peachpie.Library.Scripting for net461

fixes #286

Author: jakubmisek

src/Peachpie.Library.Scripting/Peachpie.Library.Scripting.csproj

@@ -2,7 +2,7 @@
 
   <Import Project="..\..\build\Targets\Settings.props" />
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);1591;1574</NoWarn>
     <AssemblyName>Peachpie.Library.Scripting</AssemblyName>
     <PackageId>Peachpie.Library.Scripting</PackageId>
@@ -14,7 +14,11 @@
   <ItemGroup>
     <PackageReference Include="Devsense.Php.Parser" Version="1.4.51" />
     <PackageReference Include="Peachpie.Microsoft.CodeAnalysis" Version="0.9.1" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <!--
+      System.Runtime.Loader.AssemblyLoadContext cannot be loaded from System.Runtime.Loader 4.0.0 which is hard referenced on full .NET Framework,
+      you may remove this workaround once it will work using netstandard2.0 well.
+    -->
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" Condition=" '$(TargetFramework)'=='netstandard2.0' " />
   </ItemGroup>
 
   <ItemGroup>

src/Peachpie.Library.Scripting/PhpCompilationFactory.cs

@@ -8,9 +8,45 @@
 
 namespace Peachpie.Library.Scripting
 {
-    class PhpCompilationFactory : System.Runtime.Loader.AssemblyLoadContext
+#if NETSTANDARD
+
+    sealed class PhpCompilationFactory : PhpCompilationFactoryBase
+    {
+        System.Runtime.Loader.AssemblyLoadContext AssemblyLoadContext => System.Runtime.Loader.AssemblyLoadContext.Default;
+
+        public PhpCompilationFactory()
+        {
+            //AssemblyLoadContext.Resolving += AssemblyLoadContext_Resolving;
+        }
+
+        //private Assembly AssemblyLoadContext_Resolving(System.Runtime.Loader.AssemblyLoadContext assCtx, AssemblyName assName)
+        //    => TryGetSubmissionAssembly(assName);
+
+        protected override Assembly LoadFromStream(MemoryStream peStream, MemoryStream pdbStream)
+            => AssemblyLoadContext.LoadFromStream(peStream, pdbStream);
+    }
+
+#else // NET461, does not have AssemblyLoadContext in System.Runtime.Loader 4.0.0 (we need >= 4.0.1)
+
+    sealed class PhpCompilationFactory : PhpCompilationFactoryBase
     {
         public PhpCompilationFactory()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+        }
+
+        private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+            => TryGetSubmissionAssembly(new AssemblyName(args.Name));
+
+        protected override Assembly LoadFromStream(MemoryStream peStream, MemoryStream pdbStream)
+            => Assembly.Load(peStream.ToArray(), pdbStream?.ToArray());
+    }
+
+#endif
+
+    abstract class PhpCompilationFactoryBase
+    {
+        public PhpCompilationFactoryBase()
         {
             _compilation = PhpCompilation.Create("project",
                 references: MetadataReferences().Select(CreateMetadataReference),
@@ -89,6 +125,8 @@ public Assembly TryGetSubmissionAssembly(AssemblyName assemblyName)
             }
         }
 
+        protected abstract Assembly LoadFromStream(MemoryStream peStream, MemoryStream pdbStream);
+
         public Assembly LoadFromStream(AssemblyName assemblyName, MemoryStream peStream, MemoryStream pdbStream)
         {
             var assembly = LoadFromStream(peStream, pdbStream);
@@ -100,8 +138,6 @@ public Assembly LoadFromStream(AssemblyName assemblyName, MemoryStream peStream,
             return assembly;
         }
 
-        protected override Assembly Load(AssemblyName assemblyName) => TryGetSubmissionAssembly(assemblyName);
-
         static int _counter = 0;
 
         const string s_submissionAssemblyNamePrefix = "<submission>`";