Skip to content

Commit 95f65b5

Browse files
28810992881099
committed
v3.5.308 #2223 # 2221 #2217 #2218 #2214 #2204 
1 parent e852aeb commit 95f65b5

37 files changed

Lines changed: 165 additions & 50 deletions

File tree

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!--
1313
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
1414
<PropertyGroup>
15-
<Version>3.5.307</Version>
15+
<Version>3.5.308</Version>
1616
</PropertyGroup>
1717
-->
1818

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.307</Version>
21+
<Version>3.5.308</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.5.307</Version>
22+
<Version>3.5.308</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

‎Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.307</Version>
21+
<Version>3.5.308</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.307</Version>
21+
<Version>3.5.308</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.5.307</Version>
18+
<Version>3.5.308</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
20+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2021
</PropertyGroup>
2122

2223
<ItemGroup>
23-
<None Include="../../readme.md" Pack="true" PackagePath="\"/>
24+
<None Include="../../readme.md" Pack="true" PackagePath="\" />
2425
<None Include="../../logo.png" Pack="true" PackagePath="\" />
2526
</ItemGroup>
2627

‎Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
using Microsoft.CodeAnalysis;
2-
using Microsoft.CodeAnalysis.CSharp;
1+

32
using System;
43
using System.CodeDom.Compiler;
54
using System.Collections.Generic;
65
using System.IO;
76
using System.Linq;
87
using System.Reflection;
8+
#if ns20
9+
using Microsoft.CodeAnalysis;
10+
using Microsoft.CodeAnalysis.CSharp;
911
using System.Reflection.Metadata;
12+
#endif
1013

1114
namespace FreeSql.Extensions.LazyLoading
1215
{
@@ -41,7 +44,7 @@ public static Assembly CompileCode(string cscode)
4144
*/
4245

4346
//2026-3-13：删除CS-Script.Core库，改用官方的库 Microsoft.CodeAnalysis.CSharp。
44-
private static readonly HashSet<MetadataReference> references = new();
47+
private static readonly HashSet<MetadataReference> references = new HashSet<MetadataReference>();
4548
static LazyLoadingComplier()
4649
{
4750
foreach (var eve in AppDomain.CurrentDomain.GetAssemblies().AsParallel())
@@ -59,18 +62,20 @@ static LazyLoadingComplier()
5962
public static Assembly CompileCode(string cscode)
6063
{
6164
var tree = CSharpSyntaxTree.ParseText(cscode);
62-
using var ms = new MemoryStream();
63-
var result = CSharpCompilation.Create("DynamicAssembly")
64-
.WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, optimizationLevel: OptimizationLevel.Release, reportSuppressedDiagnostics: false))
65-
.AddReferences(references)
66-
.AddSyntaxTrees(tree).Emit(ms);
67-
if (result.Success)
65+
using (var ms = new MemoryStream())
6866
{
69-
return Assembly.Load(ms.ToArray());
70-
}
71-
else
72-
{
73-
throw new Exception(string.Join(Environment.NewLine, from eve in result.Diagnostics select eve.ToString()));
67+
var result = CSharpCompilation.Create("DynamicAssembly")
68+
.WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, optimizationLevel: OptimizationLevel.Release, reportSuppressedDiagnostics: false))
69+
.AddReferences(references)
70+
.AddSyntaxTrees(tree).Emit(ms);
71+
if (result.Success)
72+
{
73+
return Assembly.Load(ms.ToArray());
74+
}
75+
else
76+
{
77+
throw new Exception(string.Join(Environment.NewLine, from eve in result.Diagnostics select eve.ToString()));
78+
}
7479
}
7580
}
7681
public static MetadataReference CreateMetadataReference(Assembly assembly)

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.307</Version>
21+
<Version>3.5.308</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.5.307</Version>
21+
<Version>3.5.308</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Generator/FreeSql.Generator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
16-
<Version>3.5.307</Version>
16+
<Version>3.5.308</Version>
1717
<PackageReadmeFile>readme.md</PackageReadmeFile>
1818
</PropertyGroup>
1919

0 commit comments

Comments
 (0)