From 529be7d9d25c1a6926cc5031a85183aeec0a7ed3 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Sun, 15 Mar 2020 10:53:17 +0800
Subject: [PATCH] Recovery CSScript.Core

---
 .../FreeSql.Extensions.LazyLoading.csproj     | 11 ++++++++-
 .../LazyLoadingComplier.cs                    | 23 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
index e04b645a..cefbb7c0 100644
--- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
+++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
@@ -21,10 +21,19 @@
   <ItemGroup>
     <None Include="../../logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
-
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="CS-Script.Core" Version="1.2.3" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="CS-Script.Core" Version="1.3.1" />
+  </ItemGroup>
+  
+  <!--
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="DotNetCore.Natasha" Version="2.12.0" />
   </ItemGroup>
+  -->
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
     <DefineConstants>ns20;netstandard20</DefineConstants>
diff --git a/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs b/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs
index 4d286aaa..e89f72e0 100644
--- a/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs
+++ b/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs
@@ -10,12 +10,27 @@ namespace FreeSql.Extensions.LazyLoading
     {
 
 #if ns20
+        //public static Assembly CompileCode(string cscode)
+        //{
+        //    Natasha.AssemblyComplier complier = new Natasha.AssemblyComplier();
+        //    //complier.Domain = DomainManagment.Random;
+        //    complier.Add(cscode);
+        //    return complier.GetAssembly();
+        //}
+
+        internal static Lazy<CSScriptLib.RoslynEvaluator> _compiler = new Lazy<CSScriptLib.RoslynEvaluator>(() =>
+        {
+            var compiler = new CSScriptLib.RoslynEvaluator();
+            compiler.DisableReferencingFromCode = false;
+            compiler
+                .ReferenceAssemblyOf<IFreeSql>()
+                .ReferenceDomainAssemblies();
+            return compiler;
+        });
+
         public static Assembly CompileCode(string cscode)
         {
-            Natasha.AssemblyComplier complier = new Natasha.AssemblyComplier();
-            //complier.Domain = DomainManagment.Random;
-            complier.Add(cscode);
-            return complier.GetAssembly();
+            return _compiler.Value.CompileCode(cscode);
         }
 #else