Merge branch '2.5.0-alpha' into Start-Of-Async

Cooksauce · Aug 27, 2019 · b7916f9 · b7916f9
2 parents 39a7a67 + 7e57ff7
commit b7916f9
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,13 @@
+{
+    "cSpell.words": [
+        "Inet",
+        "Npgsql",
+        "Postgres",
+        "bigint",
+        "bytea",
+        "macaddr",
+        "philipp",
+        "smallint",
+        "ulong"
+    ]
+}
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Philipp Wagner and Contributors
+Copyright (c) Philipp Wagner, Steven Yeh and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/PostgreSQLCopyHelper/NuGet/nupkg/PostgreSQLCopyHelper.2.5.0-preview1.nupkg b/PostgreSQLCopyHelper/NuGet/nupkg/PostgreSQLCopyHelper.2.5.0-preview1.nupkg
diff --git a/PostgreSQLCopyHelper/NuGet/nupkg/PostgreSQLCopyHelper.2.5.0-preview1.symbols.nupkg b/PostgreSQLCopyHelper/NuGet/nupkg/PostgreSQLCopyHelper.2.5.0-preview1.symbols.nupkg
diff --git a/...opyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.Test/PostgreSQLCopyHelper.Test.csproj b/...opyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.Test/PostgreSQLCopyHelper.Test.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Npgsql" Version="4.1.0-ci.1863" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.14.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.csproj b/PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper/PostgreSQLCopyHelper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
-    <Authors>Philipp Wagner</Authors>
+    <Authors>Philipp Wagner;Steven Yeh</Authors>
     <Company />
     <Product />
     <Description>A library for Bulk Copy / Bulk Inserts with PostgreSQL.</Description>
@@ -15,13 +15,13 @@
     <AssemblyVersion>2.5.0.0</AssemblyVersion>
     <FileVersion>2.5.0.0</FileVersion>
     <RepositoryType>git</RepositoryType>
-    <Version>2.5.0-alpha2</Version>
+    <Version>2.5.0-preview1</Version>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="4.1.0-ci.1863" />
+    <PackageReference Include="Npgsql" Version="4.1.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -110,4 +110,4 @@ var copyHelper = new PostgreSQLCopyHelper<MixedCaseEntity>("sample", "MixedCaseE
 
 PostgreSQLCopyHelper is licensed under the MIT License. See [LICENSE](LICENSE) for details.
 
-Copyright (c) Philipp Wagner, Steven Yeh and [Contributors](https://github.com/bytefish/PostgreSQLCopyHelper/graphs/contributors)
+Copyright (c) [Philipp Wagner](https://github.com/bytefish), [Steven Yeh](https://github.com/say25) and [Contributors](https://github.com/bytefish/PostgreSQLCopyHelper/graphs/contributors)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -110,4 +110,4 @@ var copyHelper = new PostgreSQLCopyHelper<MixedCaseEntity>("sample", "MixedCaseE

		PostgreSQLCopyHelper is licensed under the MIT License. See [LICENSE](LICENSE) for details.

		Copyright (c) Philipp Wagner, Steven Yeh and [Contributors](https://github.com/bytefish/PostgreSQLCopyHelper/graphs/contributors)
		Copyright (c) [Philipp Wagner](https://github.com/bytefish), [Steven Yeh](https://github.com/say25) and [Contributors](https://github.com/bytefish/PostgreSQLCopyHelper/graphs/contributors)