tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 LazyLoading 在 Net4 环境下的问题；

Browse Source
This commit is contained in:
28810
2019-12-19 10:51:21 +08:00
parent 954a948837
commit e03aaed55b
8 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Extensions/FreeSql.Extensions.BaseEntity/BaseEntity 纯净版源码(.Net 4.0).zip
View File

Binary file not shown.

41
Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs
View File

@ -1,9 +1,7 @@
using Microsoft.CSharp;
using System;
using System;
using System.CodeDom.Compiler;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text;
namespace FreeSql.Extensions.LazyLoading
{
@ -14,7 +12,7 @@ namespace FreeSql.Extensions.LazyLoading
#if ns20
internal static Lazy<CSScriptLib.RoslynEvaluator> _compiler = new Lazy<CSScriptLib.RoslynEvaluator>(() =>
{
//var dlls = Directory.GetFiles(Directory.GetParent(Type.GetType("IFreeSql, FreeSql").Assembly.Location).FullName, "*.dll");
//var dlls = Directory.GetFiles(Directory.GetParent(Type.GetType("IFreeSql, FreeSql").Assembly.Location).FullName, "*.dll;*.exe");
var compiler = new CSScriptLib.RoslynEvaluator();
compiler.DisableReferencingFromCode = false;
//compiler.DebugBuild = true;
@ -36,14 +34,41 @@ namespace FreeSql.Extensions.LazyLoading
#else
public static Assembly CompileCode(string cscode) {
public static Assembly CompileCode(string cscode) {
using (var compiler = CodeDomProvider.CreateProvider("cs")) {
var files = Directory.GetFiles(Directory.GetParent(Type.GetType("IFreeSql, FreeSql").Assembly.Location).FullName);
using (var compiler = CodeDomProvider.CreateProvider("cs")) {
var objCompilerParameters = new CompilerParameters();
objCompilerParameters.ReferencedAssemblies.Add("System.dll");
objCompilerParameters.ReferencedAssemblies.Add("System.Core.dll");
objCompilerParameters.ReferencedAssemblies.Add("FreeSql.dll");
objCompilerParameters.GenerateExecutable = false;
foreach (var dll in files)
{
if (!dll.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) &&
!dll.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) continue;
Console.WriteLine(dll);
var dllName = string.Empty;
var idx = dll.LastIndexOf('/');
if (idx != -1) dllName = dll.Substring(idx + 1);
else
{
idx = dll.LastIndexOf('\\');
if (idx != -1) dllName = dll.Substring(idx + 1);
}
if (string.IsNullOrEmpty(dllName)) continue;
try
{
var ass = Assembly.LoadFile(dll);
objCompilerParameters.ReferencedAssemblies.Add(dllName);
}
catch
{
}
}
objCompilerParameters.GenerateExecutable = false;
objCompilerParameters.GenerateInMemory = true;
CompilerResults cr = compiler.CompileAssemblyFromSource(objCompilerParameters, cscode);