Skip to content

Commit 856ecf2

Browse files
28810992881099
committed
v2.0.0-preview1105 #515 
1 parent 05e164a commit 856ecf2

File tree

24 files changed

+39
-48
lines changed

24 files changed

+39
-48
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用.</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储.</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，可实现【延时加载】属性.</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 扩展包，实现 linq queryable 和 linq to sql 语法进行开发.</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Description>使用 FreeSql 快速生成数据库的实体类，安装：dotnet tool install -g FreeSql.Generator</Description>
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
15-
<Version>2.0.0-preview1102</Version>
15+
<Version>2.0.0-preview1105</Version>
1616
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
1717
</PropertyGroup>
1818

‎FreeSql.All/FreeSql.All.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql 全家桶，懒人专用</Description>

‎FreeSql.DbContext/FreeSql.DbContext.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<Authors>FreeSql;ncc;YeXiangQin</Authors>
88
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, And Access</Description>

‎FreeSql.DbContext/FreeSql.DbContext.xml‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FreeSql.Repository/FreeSql.Repository.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40</TargetFrameworks>
5-
<Version>2.0.0-preview1102</Version>
5+
<Version>2.0.0-preview1105</Version>
66
<Authors>FreeSql;ncc;YeXiangQin</Authors>
77
<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/Access, and read/write separation、and split table.</Description>
88
<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>

‎FreeSql.Tests/FreeSql.Tests/UnitTest4.cs‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,6 @@ namespace FreeSql.Tests
1010
{
1111
public class UnitTest4
1212
{
13-
static Lazy<IFreeSql> sqliteLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
14-
.UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document.db;Attachs=xxxtb.db;")
15-
//.UseConnectionFactory(FreeSql.DataType.Sqlite, () =>
16-
//{
17-
// var conn = new System.Data.SQLite.SQLiteConnection(@"Data Source=|DataDirectory|\document.db;Pooling=true;");
18-
// //conn.Open();
19-
// //var cmd = conn.CreateCommand();
20-
// //cmd.CommandText = $"attach database [xxxtb.db] as [xxxtb];\r\n";
21-
// //cmd.ExecuteNonQuery();
22-
// //cmd.Dispose();
23-
// return conn;
24-
//})
25-
.UseAutoSyncStructure(true)
26-
//.UseGenerateCommandParameterWithLambda(true)
27-
.UseLazyLoading(true)
28-
.UseMonitorCommand(
29-
cmd => Trace.WriteLine("\r\n线程" + Thread.CurrentThread.ManagedThreadId + ": " + cmd.CommandText) //监听SQL命令对象，在执行前
30-
//, (cmd, traceLog) => Console.WriteLine(traceLog)
31-
)
32-
.Build());
33-
public static IFreeSql sqlite => sqliteLazy.Value;
34-
3513

3614
[Fact]
3715
public void TestHzyTuple()
@@ -47,11 +25,8 @@ public void TestHzyTuple()
4725
.Where(w => w.t1.Code == "xxx" && w.t2.OptionsEntity03 == true)
4826
.GroupBy(w => new { w.t1 })
4927
.OrderBy(w => w.Key.t1.AddTime)
50-
.ToSql(w => new { w.Key.t1 });
28+
.ToSql(w => w.Key );
5129

5230
}
53-
54-
55-
5631
}
5732
}

0 commit comments

Comments
 (0)