From 01b9f8aaa1d9d248e7c2878c8cacbafd52ea46a7 Mon Sep 17 00:00:00 2001
From: Adam Schroder <adamschroder@gmail.com>
Date: Fri, 13 Nov 2020 09:13:28 +1100
Subject: [PATCH] Update to net5.0 and all packages

---
 src/NPoco.JsonNet/NPoco.JsonNet.csproj                 |  2 +-
 src/NPoco.SqlServer/NPoco.SqlServer.csproj             |  2 +-
 src/NPoco/NPoco.csproj                                 |  7 ++++---
 .../FluentTests/QueryTests/QueryProviderTests.cs       |  4 ++--
 test/NPoco.Tests/NPoco.Tests.csproj                    | 10 +++++-----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/NPoco.JsonNet/NPoco.JsonNet.csproj b/src/NPoco.JsonNet/NPoco.JsonNet.csproj
index d10c21d9..429714ea 100644
--- a/src/NPoco.JsonNet/NPoco.JsonNet.csproj
+++ b/src/NPoco.JsonNet/NPoco.JsonNet.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Provides an implementation to use Json.NET as the serializer for serialized columns</Description>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>NPoco.JsonNet</AssemblyName>
     <PackageId>NPoco.JsonNet</PackageId>
     <PackageTags>orm;sql;micro-orm;database;mvc</PackageTags>
diff --git a/src/NPoco.SqlServer/NPoco.SqlServer.csproj b/src/NPoco.SqlServer/NPoco.SqlServer.csproj
index b194eef5..1df466e1 100644
--- a/src/NPoco.SqlServer/NPoco.SqlServer.csproj
+++ b/src/NPoco.SqlServer/NPoco.SqlServer.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
 	<Description>An extremely easy to use Micro-ORM supporting Sql Server.</Description>
 	<VersionPrefix>5.0.0</VersionPrefix>
-	<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+	<TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
 	<AssemblyName>NPoco.SqlServer</AssemblyName>
 	<PackageId>NPoco.SqlServer</PackageId>
 	<Authors>Adam Schröder</Authors>
diff --git a/src/NPoco/NPoco.csproj b/src/NPoco/NPoco.csproj
index 8d197b81..4b5caf72 100644
--- a/src/NPoco/NPoco.csproj
+++ b/src/NPoco/NPoco.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <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>
     <PackageId>NPoco</PackageId>
     <VersionPrefix>5.0.0</VersionPrefix>
@@ -21,8 +21,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Condition=" '$(TargetFramework)' == 'netstandard2.0' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
-    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+	<PackageReference Condition="'$(TargetFramework)' == 'net461' " Include="System.ValueTuple" Version="4.5.0" />
+	<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" />
   </ItemGroup>
 
diff --git a/test/NPoco.Tests/FluentTests/QueryTests/QueryProviderTests.cs b/test/NPoco.Tests/FluentTests/QueryTests/QueryProviderTests.cs
index 1334faa3..82851c68 100644
--- a/test/NPoco.Tests/FluentTests/QueryTests/QueryProviderTests.cs
+++ b/test/NPoco.Tests/FluentTests/QueryTests/QueryProviderTests.cs
@@ -357,7 +357,7 @@ public void QueryWithProjectionAndEnclosedMethod()
                 SetCurrentCulture(new CultureInfo("en-US"));
 
                 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(15, users.Count);
@@ -384,7 +384,7 @@ public void QueryWithProjectionAndEnclosedMethod1()
                 // these arguments are properly supported (ProcessMethodSearchRecursively supports
                 // NewArrayExpression).
                 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) });
 
                 Assert.AreEqual("21.00 21.00 21.00 21.00 21.00 21.00 21.00", users[0].FormattedAge);
diff --git a/test/NPoco.Tests/NPoco.Tests.csproj b/test/NPoco.Tests/NPoco.Tests.csproj
index 7a77c6dc..ecda6821 100644
--- a/test/NPoco.Tests/NPoco.Tests.csproj
+++ b/test/NPoco.Tests/NPoco.Tests.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<Description>NPoco Tests</Description>
 		<VersionPrefix>5.0.0</VersionPrefix>
-		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+		<TargetFrameworks>net5.0</TargetFrameworks>
 		<AssemblyName>NPoco.Tests</AssemblyName>
 		<OutputType>Library</OutputType>
 		<PackageId>NPoco.Tests</PackageId>
@@ -22,12 +22,12 @@
 	</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="NUnit" Version="3.12.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="3.1.8" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.0" />
 		<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.5.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
 	</ItemGroup>