提交 01b9f8aa 编写于 作者: A Adam Schroder

Update to net5.0 and all packages

上级 cf50d312
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Provides an implementation to use Json.NET as the serializer for serialized columns</Description> <Description>Provides an implementation to use Json.NET as the serializer for serialized columns</Description>
<VersionPrefix>5.0.0</VersionPrefix> <VersionPrefix>5.0.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyName>NPoco.JsonNet</AssemblyName> <AssemblyName>NPoco.JsonNet</AssemblyName>
<PackageId>NPoco.JsonNet</PackageId> <PackageId>NPoco.JsonNet</PackageId>
<PackageTags>orm;sql;micro-orm;database;mvc</PackageTags> <PackageTags>orm;sql;micro-orm;database;mvc</PackageTags>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Description>An extremely easy to use Micro-ORM supporting Sql Server.</Description> <Description>An extremely easy to use Micro-ORM supporting Sql Server.</Description>
<VersionPrefix>5.0.0</VersionPrefix> <VersionPrefix>5.0.0</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyName>NPoco.SqlServer</AssemblyName> <AssemblyName>NPoco.SqlServer</AssemblyName>
<PackageId>NPoco.SqlServer</PackageId> <PackageId>NPoco.SqlServer</PackageId>
<Authors>Adam Schröder</Authors> <Authors>Adam Schröder</Authors>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>An extremely easy to use Micro-ORM supporting Sql Server, MySQL, PostgreSQL, Oracle, Sqlite, SqlCE.</Description> <Description>An extremely easy to use Micro-ORM supporting Sql Server, MySQL, PostgreSQL, Oracle, Sqlite, SqlCE.</Description>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks> <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyName>NPoco</AssemblyName> <AssemblyName>NPoco</AssemblyName>
<PackageId>NPoco</PackageId> <PackageId>NPoco</PackageId>
<VersionPrefix>5.0.0</VersionPrefix> <VersionPrefix>5.0.0</VersionPrefix>
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Condition=" '$(TargetFramework)' == 'netstandard2.0' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" /> <PackageReference Condition="'$(TargetFramework)' == 'net461' " Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Linq.Async" Version="4.1.1" /> <PackageReference Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netstandard2.0' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
<PackageReference Include="System.Linq.Async" Version="5.0.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" /> <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
</ItemGroup> </ItemGroup>
......
...@@ -357,7 +357,7 @@ public void QueryWithProjectionAndEnclosedMethod() ...@@ -357,7 +357,7 @@ public void QueryWithProjectionAndEnclosedMethod()
SetCurrentCulture(new CultureInfo("en-US")); SetCurrentCulture(new CultureInfo("en-US"));
var users = Database.Query<User>() var users = Database.Query<User>()
.ProjectTo(x => new ProjectUser2 { FormattedAge = string.Format("{0:n}", x.Age) }); .ProjectTo(x => new ProjectUser2 { FormattedAge = x.Age.ToString("n2") });
Assert.AreEqual("21.00", users[0].FormattedAge); Assert.AreEqual("21.00", users[0].FormattedAge);
Assert.AreEqual(15, users.Count); Assert.AreEqual(15, users.Count);
...@@ -384,7 +384,7 @@ public void QueryWithProjectionAndEnclosedMethod1() ...@@ -384,7 +384,7 @@ public void QueryWithProjectionAndEnclosedMethod1()
// these arguments are properly supported (ProcessMethodSearchRecursively supports // these arguments are properly supported (ProcessMethodSearchRecursively supports
// NewArrayExpression). // NewArrayExpression).
var users = Database.Query<User>() var users = Database.Query<User>()
.ProjectTo(x => new ProjectUser2 { FormattedAge = string.Format("{0:n} {1:n} {2:n} {3:n} {4:n} {5:n} {6:n}", .ProjectTo(x => new ProjectUser2 { FormattedAge = string.Format("{0:n2} {1:n2} {2:n2} {3:n2} {4:n2} {5:n2} {6:n2}",
x.Age, x.Age, x.Age, x.Age, x.Age, x.Age, x.Age) }); x.Age, x.Age, x.Age, x.Age, x.Age, x.Age, x.Age) });
Assert.AreEqual("21.00 21.00 21.00 21.00 21.00 21.00 21.00", users[0].FormattedAge); Assert.AreEqual("21.00 21.00 21.00 21.00 21.00 21.00 21.00", users[0].FormattedAge);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<Description>NPoco Tests</Description> <Description>NPoco Tests</Description>
<VersionPrefix>5.0.0</VersionPrefix> <VersionPrefix>5.0.0</VersionPrefix>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks> <TargetFrameworks>net5.0</TargetFrameworks>
<AssemblyName>NPoco.Tests</AssemblyName> <AssemblyName>NPoco.Tests</AssemblyName>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<PackageId>NPoco.Tests</PackageId> <PackageId>NPoco.Tests</PackageId>
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.1.8" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.0" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.5.0" /> <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup> </ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册